Changeset 4ec7089 in sasview for src

Timestamp:

Nov 9, 2016 8:57:37 AM (8 years ago)

Author:

krzywon

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

64c7f39

Parents:

3d8c49a (diff), 61a2a0c (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' into ticket-795

Location:

src/sas

Files:

• sascalc/dataloader/readers/ascii_reader.py (modified) (1 diff)
• sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (2 diffs)
• sasgui/perspectives/calculator/model_editor.py (modified) (4 diffs)
• sasgui/plottools/PlotPanel.py (modified) (1 diff)
• sasgui/plottools/plottables.py (modified) (1 diff)
• sasgui/perspectives/fitting/basepage.py (modified) (2 diffs)
• sasgui/perspectives/fitting/pagestate.py (modified) (1 diff)

src/sas/sascalc/dataloader/readers/ascii_reader.py

@@ -172 +172 @@
                 input_f.close()
                 if not is_data:
-                    return None
+                    msg = "ascii_reader: x has no data"
+                    raise RuntimeError, msg
                 # Sanity check
                 if has_error_dy == True and not len(ty) == len(tdy):

src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -65 +65 @@
         # context menu
         self._slicerpop = None
-
         self._available_data = []
         self._symbol_labels = self.get_symbol_label()
@@ -732 +731 @@
                 self.subplot.set_ylim(y_range)
                 self.subplot.figure.canvas.draw_idle()
+                self.is_zoomed = True
         d.Destroy()
 

src/sas/sasgui/perspectives/calculator/model_editor.py

@@ -632 +632 @@
         self.reader = None
         self.name = 'untitled'
-        self.overwrite_name = True
+        self.overwrite_name = False
         self.is_2d = False
         self.fname = None
@@ -684 +684 @@
         name_txt = wx.StaticText(self, -1, 'Function Name : ')
         overwrite_cb = wx.CheckBox(self, -1, "Overwrite existing plugin model of this name?", (10, 10))
-        overwrite_cb.SetValue(True)
+        overwrite_cb.SetValue(False)
         overwrite_cb.SetToolTipString("Overwrite it if already exists?")
         wx.EVT_CHECKBOX(self, overwrite_cb.GetId(), self.on_over_cb)
-        #overwrite_cb.Show(False)
         self.name_tcl = wx.TextCtrl(self, -1, size=(PANEL_WIDTH * 3 / 5, -1))
         self.name_tcl.Bind(wx.EVT_TEXT_ENTER, self.on_change_name)
-        self.name_tcl.SetValue('MyFunction')
+        self.name_tcl.SetValue('')
         self.name_tcl.SetFont(self.font)
         hint_name = "Unique Model Function Name."
@@ -947 +946 @@
         # First check for valid python name then if the name already exists
         if not name or not bool(re.match('^[A-Za-z0-9_]*$', name)):
-            msg = "is not a valid python name. Name must not be empty and \n"
+            msg = '"%s" '%name
+            msg += "is not a valid model name. Name must not be empty and \n"
             msg += "may include only alpha numeric or underline characters \n"
             msg += "and no spaces"
@@ -1152 +1152 @@
 
         _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html"
-        _PageAnchor = "#New_Plugin_Model"
+        _PageAnchor = "#new-plugin-model"
         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, _PageAnchor,
                                           "Plugin Model Editor Help")

src/sas/sasgui/plottools/PlotPanel.py

@@ -452 +452 @@
         """
         self.cusor_line(event)
-        if self.gotLegend == 1:
+        if self.gotLegend == 1 and self.leftdown:
             self._on_legend_motion(event)
             return

src/sas/sasgui/plottools/plottables.py

@@ -212 +212 @@
                 self.color += plottable.colors()
                 self.plottables[plottable] = self.color
+                plottable.custom_color = self.color
 
     def changed(self):

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

@@ -1157 +1157 @@
             category_pos = int(state.categorycombobox)
         except:
-            state.formfactorcombobox = state.formfactorcombobox.lower()
-            state.formfactorcombobox = \
-                state.formfactorcombobox.replace('model', '')
-            state.formfactorcombobox = unicode(state.formfactorcombobox)
+            if state.formfactorcombobox is not None:
+                state._convert_to_sasmodels()
             state.categorycombobox = unicode(state.categorycombobox)
             if state.categorycombobox in self.categorybox.Items:
@@ -1528 +1526 @@
                         index_data = ((self.qmin_x <= self.data.x) &
                                       (self.data.x <= self.qmax_x))
-                        val = str(len(self.data.x[index_data is True]))
+                        val = str(len([index_data is True]))
                         self.Npts_fit.SetValue(val)
                     else:

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

@@ -355 +355 @@
             obj.saved_states[copy_name] = copy_state
         return obj
+
+    def _convert_to_sasmodels(self):
+        """
+        Convert parameters to a form usable by sasmodels converter
+
+        :return: None
+        """
+        from sasmodels import convert
+        # Create conversion dictionary to send to sasmodels
+        p = dict()
+        for fittable, name, value, _, uncert, lower, upper, units in \
+                self.parameters:
+            if not value:
+                value = numpy.nan
+            if not uncert or uncert[1] == '':
+                uncert[0] = False
+                uncert[1] = numpy.nan
+            if not upper or upper[1] == '':
+                upper[0] = False
+                upper[1] = numpy.nan
+            if not lower or lower[1] == '':
+                lower[0] = False
+                lower[1] = numpy.nan
+            p[name] = {
+                "fittable" : bool(fittable),
+                "value" : float(value),
+                "std" : float(uncert[1]),
+                "upper" : float(upper[1]),
+                "lower" : float(lower[1]),
+                "units" : units,
+            }
+        name, params = convert.convert_model(self.formfactorcombobox, p)
+
+        # Only convert if old != new, otherwise all the same
+        if name != self.formfactorcombobox:
+            self.formfactorcombobox = name
+            self.parameters = []
+            for name, info in params.iteritems():
+                if info.get("std") is not numpy.nan:
+                    std = ['True', str(info.get("std"))]
+                else:
+                    std = ['False', '']
+                if info.get("lower") is not numpy.nan:
+                    lower = ['True', str(info.get("lower"))]
+                else:
+                    lower = ['False', '']
+                if info.get("upper") is not numpy.nan:
+                    upper = ['True', str(info.get("upper"))]
+                else:
+                    upper = ['False', '']
+                param_list = [info.get("fittable"), name, info.get("value"),
+                              "+/-", std, lower, upper]
+                self.parameters.append(param_list)
+
 
     def _repr_helper(self, list, rep):