Changes in / [505706a:d3911e3] in sasview

Files:

• build_tools/jenkins_linux_build.sh (modified) (1 diff)
• build_tools/jenkins_osx_build.sh (modified) (1 diff)
• build_tools/jenkins_win64_build.bat (modified) (1 diff)
• build_tools/jenkins_win_build.bat (modified) (1 diff)
• sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (deleted)
• src/sas/sascalc/dataloader/manipulations.py (modified) (2 diffs)
• src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (1 diff)
• src/sas/sasgui/guiframe/gui_manager.py (modified) (3 diffs)
• src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (7 diffs)
• src/sas/sasgui/perspectives/fitting/fitpage.py (modified) (6 diffs)
• src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) (2 diffs)
• src/sas/sasgui/perspectives/fitting/fitting.py (modified) (2 diffs)

build_tools/jenkins_linux_build.sh

@@ -37 +37 @@
 cd sasmodels
 $PYTHON setup.py bdist_egg
-$PYTHON -m sasmodels.model_test all
+
 
 # SASVIEW

build_tools/jenkins_osx_build.sh

@@ -37 +37 @@
 make html
 
-#SASMODELS - BUILDING AND TESTING
 cd $WORKSPACE
 cd sasmodels
 $PYTHON setup.py bdist_egg
-$PYTHON -m sasmodels.model_test all
+
 
 # SASVIEW

build_tools/jenkins_win64_build.bat

@@ -47 +47 @@
 cd sasmodels
 %PYTHON% setup.py bdist_egg
-%PYTHON% -m sasmodels.model_test all
 
 :: SASMODELS install egg ##############################################

build_tools/jenkins_win_build.bat

@@ -48 +48 @@
 cd sasmodels
 %PYTHON% setup.py bdist_egg
-%PYTHON% -m sasmodels.model_test all
+
 
 :: SASMODELS install egg ##############################################

src/sas/sascalc/dataloader/manipulations.py

@@ -143 +143 @@
         :return: Data1D object
         """
-        if len(data2D.detector) > 1:
+        if len(data2D.detector) != 1:
             msg = "_Slab._avg: invalid number of "
             msg += " detectors: %g" % len(data2D.detector)
@@ -299 +299 @@
             error on number of counts, number of entries summed
         """
-        if len(data2D.detector) > 1:
+        if len(data2D.detector) != 1:
             msg = "Circular averaging: invalid number "
             msg += "of detectors: %g" % len(data2D.detector)

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

@@ -162 +162 @@
                     else:
                         self.current_dataset.x = data_set.flatten()
-                    continue
-                elif key == u'Qdev':
-                    self.current_dataset.dx = data_set.flatten()
                     continue
                 elif key == u'Qy':

src/sas/sasgui/guiframe/gui_manager.py

@@ -1950 +1950 @@
                     item, _, _ = value
                     item.Check(True)
+            self._data_panel.on_remove(None, False)
 
             wx.PostEvent(self, StatusEvent(status="Loading Project file..."))
@@ -1962 +1963 @@
                 # Reset to a base state
                 self._on_reset_state()
-                self._data_panel.on_remove(None, False)
                 # Load the project file
                 self.load_state(path=path, is_project=True)
@@ -2458 +2458 @@
                                                 group_id=group_id,
                                                 action='remove'))
+                # remove res plot: Todo: improve
                 wx.CallAfter(self._remove_res_plot, new_plot.id)
         self._data_manager.delete_data(data_id=data_id,

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

@@ -316 +316 @@
 
         slicerpop.AppendSeparator()
-        if len(self.data2D.detector) <= 1:
+        if len(self.data2D.detector) == 1:
             item_list = self.parent.get_current_context_menu(self)
             if (not item_list == None) and (not len(item_list) == 0) and\

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

@@ -52 +52 @@
     FONT_VARIANT = 1
     ON_MAC = True
+
 
 class BasicPage(ScrolledPanel, PanelBase):
@@ -1041 +1042 @@
                         disp_model = POLYDISPERSITY_MODELS['array']()
                         if hasattr(state, "values") and \
-                                 self.disp_cb_dict[item].GetValue():
+                                 self.disp_cb_dict[item].GetValue() is True:
                             if len(state.values) > 0:
                                 self.values = state.values
@@ -1434 +1435 @@
                     self.qmax_x = tempmax
                     is_modified = True
+
                 if is_2Ddata:
+                    # set mask
                     is_modified = self._validate_Npts()
-                else:
-                    is_modified = self._validate_Npts_1D()
+
             else:
                 self.fitrange = False
@@ -1452 +1454 @@
                 # Theory case: need to get npts value to draw
                 self.npts_x = float(self.Npts_total.GetValue())
-                self.Npts_fit.SetValue(str(self.Npts_total.GetValue()))
-                self._save_plotting_range()
                 self.create_default_data()
                 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()
 
@@ -2180 +2167 @@
                 flag = False
             else:
-                self.Npts_fit.SetValue(str(len(index_data[index_data])))
+                self.Npts_fit.SetValue(str(len(index_data[index_data is True])))
                 self.fitrange = True
 
@@ -2404 +2391 @@
 
         # Redraw the model
-        #  Wojtek P. Nov 7, 2016: Redrawing seems to be unnecessary here
-        # self._draw_model()
+        self._draw_model()
         # self._undo.Enable(True)
         event = PageInfoEvent(page=self)
@@ -2624 +2610 @@
             Layout after self._draw_model
         """
-        if ON_MAC:
+        if ON_MAC is True:
             time.sleep(1)
 

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)
-            #Setting smearing for cases with and without data.
-            self._set_smear(self.data)
+                    self._set_smear(self.data)
 
             # more disables for 2D
@@ -1213 +1212 @@
             try:
                 # update smearer sizer
-                #This call for smearing set up caused double evaluation of
-                #I(q) and double compilation as results
-                #self.onSmear(None)
+                self.onSmear(None)
                 temp_smear = None
                 if not self.disable_smearer.GetValue():
@@ -1229 +1226 @@
             # 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/fitpanel.py

@@ -189 +189 @@
         # use while-loop, for-loop will not do the job well.
         while (self.GetPageCount() > 0):
-            page = self.GetPage(self.GetPageCount() - 1)
+            # delete the first page until no page exists
+            page = self.GetPage(0)
             if self._manager.parent.panel_on_focus == page:
                 self._manager.parent.panel_on_focus = None
             self._close_helper(selected_page=page)
-            self.DeletePage(self.GetPageCount() - 1)
+            self.DeletePage(0)
         # Clear list of names
         self.fit_page_name = {}
@@ -399 +400 @@
                     temp = self.GetSelection()
                     self.DeletePage(temp)
-            if self.sim_page is not None:
-                if len(self.sim_page.model_list) == 0:
-                    pos = self.GetPageIndex(self.sim_page)
-                    self.SetSelection(pos)
-                    self.on_close_page(event=None)
-                    temp = self.GetSelection()
-                    self.DeletePage(temp)
-                    self.sim_page = None
-                    self.batch_on = False
             if self.GetPageCount() == 0:
                 self._manager.on_add_new_page(event=None)

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):
@@ -1963 +1964 @@
                 ## May need rethinking  
                 ##
-                ##    -PDB August 12, 2014
+                ##    -PDB August 12, 2014                  
                 while self.calc_1D.isrunning():
                     time.sleep(0.1)