Changeset db24ec1 in sasview for src/sas/sasgui

Timestamp:

Oct 3, 2018 8:21:44 AM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

e66f9c1, 0863065, cf1be88, b9cc210, 5ae083b

Parents:

9849f8a (diff), aba4559 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Tim Snow <tim.snow@…> (10/03/18 08:21:44)

git-committer:

GitHub <noreply@…> (10/03/18 08:21:44)

Message:

Merge pull request #185 from SasView?/ticket-1183-parameter-reset

Ticket 1183: Don't clear parameters on structure box content reset

Location:

src/sas/sasgui

Files:

• perspectives/fitting/fitpage.py (modified) (2 diffs)
• perspectives/fitting/fitting.py (modified) (2 diffs)
• guiframe/aboutbox.py (modified) (6 diffs)
• guiframe/config.py (modified) (2 diffs)
• guiframe/local_perspectives/data_loader/data_loader.py (modified) (4 diffs)
• perspectives/corfunc/media/corfunc_help.rst (modified) (9 diffs)
• perspectives/invariant/invariant_state.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -3 +3 @@
     fitting  a model and one data
 """
+from __future__ import print_function
+
 import sys
 import wx
@@ -1255 +1257 @@
         if saved_pars:
             self.get_paste_params(saved_pars)
+
+        # Make sure the model parameters correspond to the fit parameters
+        self._update_paramv_on_fit()
 
         if event is not None:

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -339 +339 @@
         Update custom model list in the fitpage combo box
         """
-        custom_model = 'Plugin Models'
         try:
             # Update edit menus
@@ -347 +346 @@
             if not new_pmodel_list:
                 return
-            # Set the new plugin model list for all fit pages
+
+            # Redraws to a page not in focus are showing up as if they are
+            # in the current page tab.
+            current_page_index = self.fit_panel.GetSelection()
+            current_page = self.fit_panel.GetCurrentPage()
+            last_drawn_page = current_page
+
+            # Set the new plugin model list for all fit pages; anticipating
+            # categories, the updated plugin may be in either the form factor
+            # or the structure factor combo boxes
             for uid, page in self.fit_panel.opened_pages.iteritems():
-                if hasattr(page, "formfactorbox"):
-                    page.model_list_box = new_pmodel_list
-                    mod_cat = page.categorybox.GetStringSelection()
-                    if mod_cat == custom_model:
-                        box = page.formfactorbox
-                        model_name = box.GetValue()
-                        model = (box.GetClientData(box.GetCurrentSelection())
-                                 if model_name else None)
-                        page._show_combox_helper()
-                        new_index = box.FindString(model_name)
-                        new_model = (box.GetClientData(new_index)
-                                     if new_index >= 0 else None)
-                        if new_index >= 0:
-                            box.SetStringSelection(model_name)
-                        else:
-                            box.SetStringSelection('')
-                        if model and new_model != model:
-                            page._on_select_model(keep_pars=True)
-                    if hasattr(page, "structurebox"):
-                        selected_name = page.structurebox.GetStringSelection()
-
-                        page.structurebox.Clear()
-                        page.initialize_combox()
-
-                        index = page.structurebox.FindString(selected_name)
-                        if index == -1:
-                            index = 0
-                        page.structurebox.SetSelection(index)
-                        page._on_select_model()
+                pbox = getattr(page, "formfactorbox", None)
+                sbox = getattr(page, "structurebox", None)
+                if pbox is None:
+                    continue
+
+                # Set the new model list for the page
+                page.model_list_box = new_pmodel_list
+
+                # Grab names of the P and S models from the page.  Need to do
+                # this before resetting the form factor box since that clears
+                # the structure factor box.
+                old_struct = old_form = None
+                form_name = pbox.GetValue()
+                struct_name = sbox.GetStringSelection()
+                if form_name:
+                    old_form = pbox.GetClientData(pbox.GetCurrentSelection())
+                if struct_name:
+                    old_struct = sbox.GetClientData(sbox.GetCurrentSelection())
+
+                # Reset form factor combo box.  We are doing this for all
+                # categories not just plugins since eventually the category
+                # manager will allow plugin models to be anywhere.
+                page._show_combox_helper()
+                form_index = pbox.FindString(form_name)
+                pbox.SetSelection(form_index)
+                new_form = (pbox.GetClientData(form_index)
+                            if form_index != wx.NOT_FOUND else None)
+                #print("form: %r"%form_name, old_form, new_form)
+
+                # Reset structure factor combo box; even if the model list
+                # hasn't changed, the model may have.  Show the structure
+                # factor combobox if the selected model is a form factor.
+                sbox.Clear()
+                page.initialize_combox()
+                if new_form is not None and getattr(new_form, 'is_form_factor', False):
+                    sbox.Show()
+                    sbox.Enable()
+                    page.text2.Show()
+                    page.text2.Enable()
+                struct_index = sbox.FindString(struct_name)
+                sbox.SetSelection(struct_index)
+                new_struct = (sbox.GetClientData(struct_index)
+                              if struct_index != wx.NOT_FOUND else None)
+                #print("struct: %r"%struct_name, old_struct, new_struct)
+
+                # Update the page if P or S has changed
+                if old_form != new_form or old_struct != new_struct:
+                    #print("triggering model update")
+                    page._on_select_model(keep_pars=True)
+                    last_drawn_page = page
+
+            # If last drawn is not the current, then switch the current to the
+            # last drawn then switch back.  Very ugly.
+            if last_drawn_page != current_page:
+                for page_index in range(self.fit_panel.PageCount):
+                    if self.fit_panel.GetPage(page_index) == last_drawn_page:
+                        self.fit_panel.SetSelection(page_index)
+                        break
+                self.fit_panel.SetSelection(current_page_index)
+
         except Exception:
             logger.error("update_custom_combo: %s", sys.exc_value)

src/sas/sasgui/guiframe/aboutbox.py

@@ -108 +108 @@
         self.bitmap_button_tudelft = wx.BitmapButton(self, -1, wx.NullBitmap)
         self.bitmap_button_dls = wx.BitmapButton(self, -1, wx.NullBitmap)
+        self.bitmap_button_bam = wx.BitmapButton(self, -1, wx.NullBitmap)
 
         self.static_line_3 = wx.StaticLine(self, -1)
@@ -128 +129 @@
         self.Bind(wx.EVT_BUTTON, self.onTudelftLogo, self.bitmap_button_tudelft)
         self.Bind(wx.EVT_BUTTON, self.onDlsLogo, self.bitmap_button_dls)
+        self.Bind(wx.EVT_BUTTON, self.onBamLogo, self.bitmap_button_bam)
         # end wxGlade
         # fill in acknowledgements
@@ -226 +228 @@
         logo = wx.Bitmap(image)
         self.bitmap_button_dls.SetBitmapLabel(logo)
+
+        image = file_dir + "/images/bam_logo.png"
+        if os.path.isfile(config._bam_logo):
+            image = config._bam_logo
+        logo = wx.Bitmap(image)
+        self.bitmap_button_bam.SetBitmapLabel(logo)
 
         # resize dialog window to fit version number nicely
@@ -258 +266 @@
         self.bitmap_button_tudelft.SetSize(self.bitmap_button_tudelft.GetBestSize())
         self.bitmap_button_dls.SetSize(self.bitmap_button_dls.GetBestSize())
+        self.bitmap_button_bam.SetSize(self.bitmap_button_bam.GetBestSize())
         # end wxGlade
 
@@ -325 +334 @@
         sizer_logos.Add(self.bitmap_button_dls, 0,
                         wx.LEFT|wx.ADJUST_MINSIZE, 2)
+        sizer_logos.Add(self.bitmap_button_bam, 0,
+                        wx.LEFT|wx.ADJUST_MINSIZE, 2)
 
         sizer_logos.Add((10, 50), 0, wx.ADJUST_MINSIZE, 0)
@@ -430 +441 @@
         event.Skip()
 
+    def onBamLogo(self, event):
+        """
+        """
+        # wxGlade: DialogAbout.<event_handler>
+        launchBrowser(config._bam_url)
+        event.Skip()
+
 # end of class DialogAbout
 

src/sas/sasgui/guiframe/config.py

@@ -51 +51 @@
 '''M. Doucet et al. SasView Version 4.1.2, Zenodo, 10.5281/zenodo.825675'''
 _acknowledgement =  \
-'''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS, and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: http://www.sasview.org/contact.html
+'''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS, BAM and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: http://www.sasview.org/contact.html
 '''
 
@@ -90 +90 @@
 _tudelft_url = "http://www.tnw.tudelft.nl/en/cooperation/facilities/reactor-instituut-delft/"
 _dls_url = "http://www.diamond.ac.uk/"
+_bam_url = "http://www.bam.de/"
 _danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html"
 _inst_url = "http://www.utk.edu"
 _corner_image = os.path.join(icon_path, "angles_flat.png")
 _welcome_image = os.path.join(icon_path, "SVwelcome.png")
-_copyright = "(c) 2009 - 2018, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, and DLS"
+_copyright = "(c) 2009 - 2018, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS and BAM"
 marketplace_url = "http://marketplace.sasview.org/"
 

src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py

@@ -182 +182 @@
                 file_errors[basename] = [log_msg]
                 continue
-
             try:
                 message = "Loading {}...\n".format(p_file)
@@ -204 +203 @@
                 self.load_update(message="Loaded {}\n".format(p_file),
                                  info="info")
-
             except NoKnownLoaderException as e:
                 exception_occurred = True
-                error_message = "Loading data failed!\n" + e.message
-                self.load_complete(output=None,
-                                   message=error_message,
-                                   info="warning")
-
+                error_message = "Loading data failed!" + e.message
+                file_errors[basename] = [error_message]
             except Exception as e:
                 exception_occurred = True
@@ -220 +215 @@
                 file_err += " following:\n"
                 file_err += e.message
-                self.load_complete(output=None,
-                                   message=file_err,
-                                   info="error")
+                file_errors[basename] = [file_err]
 
         if len(file_errors) > 0:
@@ -231 +224 @@
                 for message in error_array:
                     error_message += message + "\n"
-                error_message = error_message[:-1]
             self.load_complete(output=output,
                                message=error_message,

src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst

@@ -33 +33 @@
 Both analyses are performed in 3 stages:
 
-*  Extrapolation of the scattering curve to :math:`Q = 0` and toward 
-   :math:`Q = \infty`
+*  Extrapolation of the scattering curve to :math:`q = 0` and toward 
+   :math:`q = \infty`
 *  Smoothed merging of the two extrapolations into the original data
 *  Fourier / Hilbert Transform of the smoothed data to give the correlation
@@ -47 +47 @@
 -------------
 
-To :math:`Q = 0`
+To :math:`q = 0`
 ................
 
@@ -67 +67 @@
 the impact on any extrapolated parameters will be least significant.
 
-To :math:`Q = \infty`
+To :math:`q = \infty`
 .....................
 
@@ -145 +145 @@
         - do they smoothly curve onto the ordinate at x = 0? (if not check the value 
           of :math:`\sigma` is sensible)
-        - are there ripples at x values corresponding to (2 :math:`pi` over) the two 
+        - are there ripples at x values corresponding to (2 :math:`\pi` over) the two 
           q values at which the extrapolated and experimental data are merged?
-        - are there any artefacts at x values corresponding to 2 :math:`pi` / q\ :sub:`max` in 
+        - are there any artefacts at x values corresponding to 2 :math:`\pi` / q\ :sub:`max` in 
           the experimental data? 
         - and lastly, do the significant features/peaks in the correlation functions 
@@ -158 +158 @@
     -q^{4} I(q)
 
-The IDF is proportional to the second derivative of Γ\ :sub:`1`\ (x).
+The IDF is proportional to the second derivative of Γ\ :sub:`1`\ (x) and represents a 
+superposition of thickness distributions from all the contributing lamellae. 
 
 Hilbert
@@ -192 +193 @@
 *   Local Crystallinity :math:`= L_c/L_p`
 
+.. warning:: If the sample does not possess lamellar morphology then "Compute 
+    Parameters" will return garbage!
+        
+
 Volume Fraction Profile
 .......................
@@ -213 +218 @@
 
 The reader is directed to the references for information on these parameters.
+
 
 References
@@ -263 +269 @@
 Once the Q ranges have been set, click the "Calculate Bg" button to determine the 
 background level. Alternatively, enter your own value into the box. If the box turns 
-yellow this indicates that background subtraction has created some negative intensities.
+yellow this indicates that background subtraction has created some negative intensities. 
+This may still be fine provided the peak intensity is very much greater than the 
+background level. The important point is that the extrapolated dataset must approach 
+zero at high-q.
 
 Now click the "Extrapolate" button to extrapolate the data. The graph window will update 
@@ -296 +305 @@
 
 .. note::
-    This help document was last changed by Steve King, 26Sep2017
+    This help document was last changed by Steve King, 28Sep2017

src/sas/sasgui/perspectives/invariant/invariant_state.py

@@ -130 +130 @@
         my_time, date = self.timestamp
         file_name = self.file
+        from sas.sasview.__init__ import __version__ as sasview_version
 
         state_num = int(self.saved_state['state_num'])
         state = "\n[Invariant computation for %s: " % file_name
-        state += "performed at %s on %s] \n" % (my_time, date)
+        state += "performed at %s on %s] " % (my_time, date)
+        state += "[SasView v%s]\n" % (sasview_version)
         state += "State No.: %d \n" % state_num
         state += "\n=== Inputs ===\n"