Changeset ae08f14 in sasview for src/sas/sasgui

Timestamp:

Sep 27, 2016 10:30:51 AM (8 years ago)

Author:

smk78

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6c382da

Parents:

e925f61 (diff), a0373d5 (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.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview

Location:

src/sas/sasgui

Files:

• guiframe/utils.py (modified) (1 diff)
• perspectives/fitting/basepage.py (modified) (6 diffs)
• perspectives/fitting/media/plugin.rst (modified) (4 diffs)

src/sas/sasgui/guiframe/utils.py

@@ -46 +46 @@
     return flag
 
-    
+
+def check_int(item):
+    """
+    :param item: txtcrtl containing a value
+    """
+    flag = True
+    try:
+        mini = int(item.GetValue())
+        item.SetBackgroundColour(wx.WHITE)
+        item.Refresh()
+    except:
+        flag = False
+        item.SetBackgroundColour("pink")
+        item.Refresh()
+    return flag
+
+
 class PanelMenu(wx.Menu):
     """

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

@@ -17 +17 @@
 from wx.lib.scrolledpanel import ScrolledPanel
 
-import sasmodels.sasview_model
+from sasmodels.weights import MODELS as POLYDISPERSITY_MODELS
+
 from sas.sasgui.guiframe.panel_base import PanelBase
-from sas.sasgui.guiframe.utils import format_number, check_float, IdList
+from sas.sasgui.guiframe.utils import format_number, check_float, IdList, check_int
 from sas.sasgui.guiframe.events import PanelOnFocusEvent
 from sas.sasgui.guiframe.events import StatusEvent
@@ -626 +627 @@
         self.disp_help_bt.Bind(wx.EVT_BUTTON, self.on_pd_help_clicked,
                                id=self.disp_help_bt.GetId())
-        self.disp_help_bt.SetToolTipString("Helps for Polydispersion.")
+        self.disp_help_bt.SetToolTipString("Help for polydispersion.")
 
         self.Bind(wx.EVT_RADIOBUTTON, self._set_dipers_Param,
@@ -1123 +1124 @@
                                                     state.disp_cb_dict[item])
                         # Create the dispersion objects
-                        from sas.models.dispersion_models import ArrayDispersion
-                        disp_model = ArrayDispersion()
+                        disp_model = POLYDISPERSITY_MODELS['array']()
                         if hasattr(state, "values") and \
                                  self.disp_cb_dict[item].GetValue() == True:
@@ -2281 +2281 @@
                 continue
 
-            name = str(item[1])
-            if name.endswith(".npts") or name.endswith(".nsigmas"):
+            value_ctrl = item[2]
+            if not value_ctrl.IsEnabled():
+                # ArrayDispersion disables PD, Min, Max, Npts, Nsigs
                 continue
 
-            # Check that min, max and value are floats
-            value_ctrl, min_ctrl, max_ctrl = item[2], item[5], item[6]
-            min_str = min_ctrl.GetValue().strip()
-            max_str = max_ctrl.GetValue().strip()
+            name = item[1]
             value_str = value_ctrl.GetValue().strip()
-            validity = check_float(value_ctrl)
-            if min_str != "":
-                validity = validity and check_float(min_ctrl)
-            if max_str != "":
-                validity = validity and check_float(max_ctrl)
-            if not validity:
-                continue
-
-            # Check that min is less than max
-            low = -numpy.inf if min_str == "" else float(min_str)
-            high = numpy.inf if max_str == "" else float(max_str)
-            if high < low:
-                min_ctrl.SetBackgroundColour("pink")
-                min_ctrl.Refresh()
-                max_ctrl.SetBackgroundColour("pink")
-                max_ctrl.Refresh()
-                #msg = "Invalid fit range for %s: min must be smaller than max"%name
-                #wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
-                continue
-
-            # Force value between min and max
-            value = float(value_str)
-            if value < low:
-                value = low
-                value_ctrl.SetValue(format_number(value))
-            elif value > high:
-                value = high
-                value_ctrl.SetValue(format_number(value))
+            if name.endswith(".npts"):
+                validity = check_int(value_ctrl)
+                if not validity:
+                    continue
+                value = int(value_str)
+
+            elif name.endswith(".nsigmas"):
+                validity = check_float(value_ctrl)
+                if not validity:
+                    continue
+                value = float(value_str)
+
+            else:  # value or polydispersity
+
+                # Check that min, max and value are floats
+                min_ctrl, max_ctrl = item[5], item[6]
+                min_str = min_ctrl.GetValue().strip()
+                max_str = max_ctrl.GetValue().strip()
+                validity = check_float(value_ctrl)
+                if min_str != "":
+                    validity = validity and check_float(min_ctrl)
+                if max_str != "":
+                    validity = validity and check_float(max_ctrl)
+                if not validity:
+                    continue
+
+                # Check that min is less than max
+                low = -numpy.inf if min_str == "" else float(min_str)
+                high = numpy.inf if max_str == "" else float(max_str)
+                if high < low:
+                    min_ctrl.SetBackgroundColour("pink")
+                    min_ctrl.Refresh()
+                    max_ctrl.SetBackgroundColour("pink")
+                    max_ctrl.Refresh()
+                    #msg = "Invalid fit range for %s: min must be smaller than max"%name
+                    #wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
+                    continue
+
+                # Force value between min and max
+                value = float(value_str)
+                if value < low:
+                    value = low
+                    value_ctrl.SetValue(format_number(value))
+                elif value > high:
+                    value = high
+                    value_ctrl.SetValue(format_number(value))
+
+                if name not in self.model.details.keys():
+                    self.model.details[name] = ["", None, None]
+                old_low, old_high = self.model.details[name][1:3]
+                if old_low != low or old_high != high:
+                    # The configuration has changed but it won't change the
+                    # computed curve so no need to set is_modified to True
+                    #is_modified = True
+                    self.model.details[name][1:3] = low, high
 
             # Update value in model if it has changed
@@ -2323 +2348 @@
                 self.model.setParam(name, value)
                 is_modified = True
-
-            if name not in self.model.details.keys():
-                self.model.details[name] = ["", None, None]
-            old_low, old_high = self.model.details[name][1:3]
-            if old_low != low or old_high != high:
-                # The configuration has changed but it won't change the
-                # computed curve so no need to set is_modified to True
-                #is_modified = True
-                self.model.details[name][1:3] = low, high
 
         return is_modified
@@ -2687 +2703 @@
         :param disp_function: dispersion distr. function
         """
-        # List of the poly_model name in the combobox
-        list = ["RectangleDispersion", "ArrayDispersion",
-                "LogNormalDispersion", "GaussianDispersion",
-                "SchulzDispersion"]
-
         # Find the selection
-        try:
-            selection = list.index(disp_func.__class__.__name__)
-            return selection
-        except:
-            return 3
+        if disp_func is not None:
+            try:
+                return POLYDISPERSITY_MODELS.values().index(disp_func.__class__)
+            except ValueError:
+                pass  # Fall through to default class
+        return POLYDISPERSITY_MODELS.keys().index('gaussian')
 
     def on_reset_clicked(self, event):

src/sas/sasgui/perspectives/fitting/media/plugin.rst

@@ -660 +660 @@
 ^^^^^^^^^^^^^^^^^^^
 
+Installed SasView
+.................
+
 If you are editing your model from the SasView GUI, you can test it
 by selecting *Run > Compile* from the *Model Editor* menu bar. An
 *Info* box will appear with the results of the compilation and a
 check that the model runs.
+
+
+Built SasView
+.............
 
 If the model compiles and runs, you can next run the unit tests that
@@ -721 +728 @@
 
 
-Clean Lint
-^^^^^^^^^^
-
-**NB: For now we are not providing pylint with SasView; so unless you have a
-SasView development environment available, you can ignore this section!**
+Clean Lint - (Developer Version Only)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**NB: For now we are not providing pylint with the installer version of SasView; 
+so unless you have a SasView build environment available, you can ignore this section!**
 
 Run the lint check with::
@@ -758 +765 @@
 Don't put in too many pylint statements, though, since they make the code ugly.
 
-Check The Docs
-^^^^^^^^^^^^^^
+Check The Docs - (Developer Version Only)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 You can get a rough idea of how the documentation will look using the
@@ -778 +785 @@
 There is also a neat online WYSIWYG ReStructuredText editor at http://rst.ninjs.org\ .
 
-Finally
-^^^^^^^
+Share Your Model!
+^^^^^^^^^^^^^^^^^
 
 Once compare and the unit test(s) pass properly and everything is done,
 consider adding your model to the
-`Model Marketplace <http://marketplace.sasview.org/>`_.
+`Model Marketplace <http://marketplace.sasview.org/>`_ so that others may use it!