Changes in src/sas/sasgui/perspectives/fitting/basepage.py [b4398819:1f4d708] in sasview

File:

• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (7 diffs)

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

@@ -641 +641 @@
         # get the strings for report
         report_str, text_str = self.state.report(fig_urls=refs)
+
         # Show the dialog
         report_list = [report_str, text_str, images]
-        dialog = ReportDialog(report_list, imgRAM, refs, None, wx.ID_ANY, "")
+        dialog = ReportDialog(report_list, None, wx.ID_ANY, "")
         dialog.Show()
 
@@ -676 +677 @@
             refs.append('memory:' + name)
             imgRAM.AddFile(name, canvas.bitmap, wx.BITMAP_TYPE_PNG)
+
             # append figs
             images.append(fig)
@@ -1470 +1472 @@
             # we need to check here ourselves.
             if not is_modified:
-                is_modified = self._check_value_enter(self.fittable_param)
-                is_modified = self._check_value_enter(
-                    self.fixed_param) or is_modified
-                is_modified = self._check_value_enter(
-                    self.parameters) or is_modified
+                is_modified = (self._check_value_enter(self.fittable_param)
+                               or self._check_value_enter(self.fixed_param)
+                               or self._check_value_enter(self.parameters))
 
             # Here we should check whether the boundaries have been modified.
@@ -1536 +1536 @@
                         data=[self.data])
             # Check the values
-            is_modified = self._check_value_enter(self.fittable_param)
-            is_modified = self._check_value_enter(self.fixed_param) or is_modified
-            is_modified = self._check_value_enter(self.parameters) or is_modified
+            is_modified = (self._check_value_enter(self.fittable_param)
+                           or self._check_value_enter(self.fixed_param)
+                           or self._check_value_enter(self.parameters))
 
             # If qmin and qmax have been modified, update qmin and qmax and
@@ -2324 +2324 @@
 
             # Update value in model if it has changed
-            if (value != self.model.getParam(name) or
-                    (np.isnan(value) and np.isnan(self.model.getParam(name)))):
+            if value != self.model.getParam(name):
                 self.model.setParam(name, value)
                 is_modified = True
@@ -2552 +2551 @@
             # draw
             self._draw_model()
-            self.Layout()
             self.Refresh()
         except Exception:
@@ -2801 +2799 @@
         Function called when 'Help' button is pressed next to model
         of interest.  This calls DocumentationWindow from
-        documentation_window.py. It will load the top level of the html model
-        help documenation sphinx generated if either a plugin model (which
-        normally does not have an html help help file) is selected or if no
-        model is selected. Otherwise, if a regula model is selected, the
-        documention for that model will be sent to a browser window.
-
-        :todo the quick fix for no documentation in plugins is the if statment.
-        However, the right way to do this would be to check whether the hmtl
-        file exists and load the model docs if it does and the general docs if
-        it doesn't - this will become important if we ever figure out how to
-        build docs for plugins on the fly.  Sep 9, 2018 -PDB
+        documentation_window.py. It will load the top level of the model
+        help documenation sphinx generated html if no model is presented.
+        If a model IS present then if documention for that model exists
+        it will load to that  point otherwise again it will go to the top.
+        For Wx2.8 and below is used (i.e. non-released through installer)
+        a browser is loaded and the top of the model documentation only is
+        accessible because webbrowser module does not pass anything after
+        the # to the browser.
 
         :param event: on Help Button pressed event
         """
 
-        if (self.model is not None) and (self.categorybox.GetValue()
-                                         != "Plugin Models"):
+        if self.model is not None:
             name = self.formfactorbox.GetValue()
             _TreeLocation = 'user/models/%s.html' % name