Changeset aa4b4f05 in sasview

Timestamp:

Nov 23, 2016 4:58:18 AM (8 years ago)

Author:

wojciech

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:

b61bd57

Parents:

cf2e6b4 (diff), e42c8e9d (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:

Merged with master

Files:

• sasview/sasview.spec (added)
• sasview/version.txt (added)
• src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) (1 diff)
• src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (2 diffs)
• src/sas/sasgui/perspectives/calculator/model_editor.py (modified) (4 diffs)
• src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified) (1 diff)
• src/sas/sasgui/plottools/PlotPanel.py (modified) (1 diff)
• src/sas/sasgui/plottools/plottables.py (modified) (1 diff)
• test/sasdataloader/test/utest_ascii.py (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (3 diffs)
• src/sas/sasgui/perspectives/fitting/fitpage.py (modified) (6 diffs)
• src/sas/sasgui/perspectives/fitting/fitting.py (modified) (2 diffs)

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/perspectives/invariant/media/invariant_help.rst

@@ -116 +116 @@
 Academic Press, New York, 1982
 
-http://physchem.kfunigraz.ac.at/sm/
+http://web.archive.org/web/20110824105537/http://physchem.kfunigraz.ac.at/sm/Service/Glatter_Kratky_SAXS_1982.zip
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ

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):

test/sasdataloader/test/utest_ascii.py

@@ -92 +92 @@
         """
         # Test .ABS file loaded as ascii
-        f = self.loader.load("ascii_test_6.txt")
+        f = None
+        try:
+            f = self.loader.load("ascii_test_6.txt")
         # The length of the data is 5
-        self.assertEqual(f, None)
+        except:
+            self.assertEqual(f, None)
         
 if __name__ == '__main__':

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

@@ -52 +52 @@
     FONT_VARIANT = 1
     ON_MAC = True
-
 
 class BasicPage(ScrolledPanel, PanelBase):
@@ -1457 +1456 @@
                 self.state_change = True
                 self._draw_model()
+                # Time delay has been introduced to prevent _handle error
+                # on Windows
+                # This part of code is executed when model is selected and
+                # it's parameters are changed (with respect to previously
+                # selected model). There are two Iq evaluations occuring one
+                # after another and therefore there may be compilation error
+                # if model is calculated for the first time.
+                # This seems to be Windows only issue - haven't tested on Linux
+                # though.The proper solution (other than time delay) requires
+                # more fundemental code refatoring
+                # Wojtek P. Nov 7, 2016
+                if not ON_MAC:
+                    time.sleep(0.1)
                 self.Refresh()
 
@@ -2391 +2403 @@
 
         # Redraw the model
-        self._draw_model()
+        #  Wojtek P. Nov 7, 2016: Redrawing seems to be unnecessary here
+        # self._draw_model()
         # self._undo.Enable(True)
         event = PageInfoEvent(page=self)

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

@@ -81 +81 @@
         flag = check_data_validity(self.data) & (self.model is not None)
         self.btFit.Enable(flag)
-        
+
     def on_set_focus(self, event):
         """
-        Override the basepage focus method to ensure the save flag is set 
+        Override the basepage focus method to ensure the save flag is set
         properly when focusing on the fit page.
         """
@@ -238 +238 @@
 
         weighting_set_box = wx.StaticBox(self, wx.ID_ANY,
-                                'Set Weighting by Selecting dI Source')
+                                         'Set Weighting by Selecting dI Source')
         weighting_box = wx.StaticBoxSizer(weighting_set_box, wx.HORIZONTAL)
         sizer_weighting = wx.BoxSizer(wx.HORIZONTAL)
@@ -1164 +1164 @@
         if event is not None:
             if (event.GetEventObject() == self.formfactorbox
-                        and self.structurebox.GetLabel() != 'None')\
-                        or event.GetEventObject() == self.structurebox\
-                        or event.GetEventObject() == self.multifactorbox:
+                    and self.structurebox.GetLabel() != 'None')\
+                    or event.GetEventObject() == self.structurebox\
+                    or event.GetEventObject() == self.multifactorbox:
                 copy_flag = self.get_copy_params()
                 is_poly_enabled = self.enable_disp.GetValue()
@@ -1205 +1205 @@
                     self._keep.Enable(not self.batch_on)
                     self._set_save_flag(True)
-                    self._set_smear(self.data)
+            #Setting smearing for cases with and without data.
+            self._set_smear(self.data)
 
             # more disables for 2D
@@ -1212 +1213 @@
             try:
                 # update smearer sizer
-                self.onSmear(None)
+                #This call for smearing set up caused double evaluation of
+                #I(q) and double compilation as results
+                #self.onSmear(None)
                 temp_smear = None
                 if not self.disable_smearer.GetValue():
@@ -1226 +1229 @@
             # set smearing value whether or not data contain the smearing info
             evt = ModelEventbox(model=self.model,
-                            smearer=temp_smear,
-                            enable_smearer=not self.disable_smearer.GetValue(),
-                            qmin=float(self.qmin_x),
-                            uid=self.uid,
-                            caption=self.window_caption,
-                            qmax=float(self.qmax_x))
+                                smearer=temp_smear,
+                                enable_smearer=not self.disable_smearer.GetValue(),
+                                qmin=float(self.qmin_x),
+                                uid=self.uid,
+                                caption=self.window_caption,
+                                qmax=float(self.qmax_x))
 
             self._manager._on_model_panel(evt=evt)

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

@@ -864 +864 @@
                 enable1D=enable1D, enable2D=enable2D,
                 qmin=qmin, qmax=qmax, weight=weight)
-            self._mac_sleep(0.2)
 
     def _mac_sleep(self, sec=0.2):
@@ -1966 +1965 @@
                 ## May need rethinking  
                 ##
-                ##    -PDB August 12, 2014                  
+                ##    -PDB August 12, 2014
                 while self.calc_1D.isrunning():
                     time.sleep(0.1)