Changes in / [ae08f14:e925f61] in sasview

Location:

src/sas/sasgui

Files:

• guiframe/utils.py (modified) (1 diff)
• perspectives/fitting/basepage.py (modified) (6 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
 
-from sasmodels.weights import MODELS as POLYDISPERSITY_MODELS
-
+import sasmodels.sasview_model
 from sas.sasgui.guiframe.panel_base import PanelBase
-from sas.sasgui.guiframe.utils import format_number, check_float, IdList, check_int
+from sas.sasgui.guiframe.utils import format_number, check_float, IdList
 from sas.sasgui.guiframe.events import PanelOnFocusEvent
 from sas.sasgui.guiframe.events import StatusEvent
@@ -627 +626 @@
         self.disp_help_bt.Bind(wx.EVT_BUTTON, self.on_pd_help_clicked,
                                id=self.disp_help_bt.GetId())
-        self.disp_help_bt.SetToolTipString("Help for polydispersion.")
+        self.disp_help_bt.SetToolTipString("Helps for Polydispersion.")
 
         self.Bind(wx.EVT_RADIOBUTTON, self._set_dipers_Param,
@@ -1124 +1123 @@
                                                     state.disp_cb_dict[item])
                         # Create the dispersion objects
-                        disp_model = POLYDISPERSITY_MODELS['array']()
+                        from sas.models.dispersion_models import ArrayDispersion
+                        disp_model = ArrayDispersion()
                         if hasattr(state, "values") and \
                                  self.disp_cb_dict[item].GetValue() == True:
@@ -2281 +2281 @@
                 continue
 
-            value_ctrl = item[2]
-            if not value_ctrl.IsEnabled():
-                # ArrayDispersion disables PD, Min, Max, Npts, Nsigs
+            name = str(item[1])
+            if name.endswith(".npts") or name.endswith(".nsigmas"):
                 continue
 
-            name = item[1]
+            # 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()
             value_str = value_ctrl.GetValue().strip()
-            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
+            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))
 
             # Update value in model if it has changed
@@ -2348 +2323 @@
                 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
@@ -2703 +2687 @@
         :param disp_function: dispersion distr. function
         """
+        # List of the poly_model name in the combobox
+        list = ["RectangleDispersion", "ArrayDispersion",
+                "LogNormalDispersion", "GaussianDispersion",
+                "SchulzDispersion"]
+
         # Find the selection
-        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')
+        try:
+            selection = list.index(disp_func.__class__.__name__)
+            return selection
+        except:
+            return 3
 
     def on_reset_clicked(self, event):