Changeset 55bc5a7f in sasview for src/sas/sasgui

Timestamp:

Dec 19, 2016 4:40:37 AM (7 years ago)

Author:

jhbakker

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:

e1e41de (diff), 67b0a99 (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 Jurtest2

Location:

src/sas/sasgui

Files:

• guiframe/gui_manager.py (modified) (3 diffs)
• perspectives/fitting/basepage.py (modified) (1 diff)
• perspectives/fitting/fitpanel.py (modified) (2 diffs)
• guiframe/dataFitting.py (modified) (7 diffs)
• guiframe/data_manager.py (modified) (1 diff)
• perspectives/fitting/fitpage.py (modified) (8 diffs)
• plottools/plottables.py (modified) (2 diffs)

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..."))
@@ -1963 +1962 @@
                 # 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)
@@ -2456 +2456 @@
                                                 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/perspectives/fitting/basepage.py

@@ -1540 +1540 @@
                         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/fitpanel.py

@@ -189 +189 @@
         # use while-loop, for-loop will not do the job well.
         while (self.GetPageCount() > 0):
-            # delete the first page until no page exists
-            page = self.GetPage(0)
+            page = self.GetPage(self.GetPageCount() - 1)
             if self._manager.parent.panel_on_focus == page:
                 self._manager.parent.panel_on_focus = None
             self._close_helper(selected_page=page)
-            self.DeletePage(0)
+            self.DeletePage(self.GetPageCount() - 1)
         # Clear list of names
         self.fit_page_name = {}
@@ -400 +399 @@
                     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/guiframe/dataFitting.py

@@ -17 +17 @@
     """
     """
-    def __init__(self, x=None, y=None, dx=None, dy=None):
+    def __init__(self, x=None, y=None, dx=None, dy=None, lam=None, dlam=None, isSesans=False):
         """
         """
@@ -24 +24 @@
         if y is None:
             y = []
-        PlotData1D.__init__(self, x, y, dx, dy)
-        LoadData1D.__init__(self, x, y, dx, dy)
+        self.isSesans = isSesans
+        PlotData1D.__init__(self, x, y, dx, dy, lam, dlam)
+        LoadData1D.__init__(self, x, y, dx, dy, lam, dlam, isSesans)
         self.id = None
         self.list_group_id = []
@@ -68 +69 @@
         # First, check the data compatibility
         dy, dy_other = self._validity_check(other)
-        result = Data1D(x=[], y=[], dx=None, dy=None)
+        result = Data1D(x=[], y=[], lam=[], dx=None, dy=None, dlam=None)
         result.clone_without_data(length=len(self.x), clone=self)
         result.copy_from_datainfo(data1d=self)
@@ -115 +116 @@
         # First, check the data compatibility
         self._validity_check_union(other)
-        result = Data1D(x=[], y=[], dx=None, dy=None)
+        result = Data1D(x=[], y=[], lam=[], dx=None, dy=None, dlam=None)
         tot_length = len(self.x) + len(other.x)
         result = self.clone_without_data(length=tot_length, clone=result)
+        if self.dlam == None or other.dlam is None:
+            result.dlam = None
+        else:
+            result.dlam = numpy.zeros(tot_length)
         if self.dy == None or other.dy is None:
             result.dy = None
@@ -141 +146 @@
         result.y = numpy.append(self.y, other.y)
         result.y = result.y[ind]
+        result.lam = numpy.append(self.lam, other.lam)
+        result.lam = result.lam[ind]
+        if result.dlam != None:
+            result.dlam = numpy.append(self.dlam, other.dlam)
+            result.dlam = result.dlam[ind]
         if result.dy != None:
             result.dy = numpy.append(self.dy, other.dy)
@@ -260 +270 @@
         # First, check the data compatibility
         self._validity_check_union(other)
-        result = Data1D(x=[], y=[], dx=None, dy=None)
+        result = Data1D(x=[], y=[], lam=[], dx=None, dy=None, dlam=[])
         tot_length = len(self.x)+len(other.x)
         result.clone_without_data(length=tot_length, clone=self)
+        if self.dlam == None or other.dlam is None:
+            result.dlam = None
+        else:
+            result.dlam = numpy.zeros(tot_length)
         if self.dy == None or other.dy is None:
             result.dy = None
@@ -285 +299 @@
         result.y = numpy.append(self.y, other.y)
         result.y = result.y[ind]
+        result.lam = numpy.append(self.lam, other.lam)
+        result.lam = result.lam[ind]
         if result.dy != None:
             result.dy = numpy.append(self.dy, other.dy)

src/sas/sasgui/guiframe/data_manager.py

@@ -62 +62 @@
         if issubclass(Data2D, data.__class__):
             new_plot = Data2D(image=None, err_image=None) 
-        else: 
-            new_plot = Data1D(x=[], y=[], dx=None, dy=None)
+        elif data.meta_data['loader'] == 'SESANS':
+            new_plot = Data1D(x=[], y=[], dx=None, dy=None, lam=None, dlam=None, isSesans=True)
+        else:
+            new_plot = Data1D(x=[], y=[], dx=None, dy=None, lam=None, dlam=None) #SESANS check???
            
         new_plot.copy_from_datainfo(data)

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

@@ -168 +168 @@
             self.set_data(data)
         elif self.dataSource.GetCount() > 0:
+
             pos = self.dataSource.GetSelection()
             data = self.dataSource.GetClientData(pos)
@@ -617 +618 @@
         # fill a sizer with the combobox to select dispersion type
         model_disp = wx.StaticText(self, wx.ID_ANY, 'Function')
-        CHECK_STATE = False
+        CHECK_STATE = self.cb1.GetValue()
 
         ix = 0
@@ -961 +962 @@
 
         self.state.model = self.model.clone()
+
         # save state into
         self._copy_parameters_state(self.parameters, self.state.parameters)
@@ -971 +973 @@
         wx.PostEvent(self.parent,
                      StatusEvent(status=" Selected Distribution: Gaussian"))
+
         # Fill the list of fittable parameters
         self.get_all_checked_params()
@@ -2682 +2685 @@
         self._manager.set_param2fit(self.uid, param2fit)
 
+
     def select_param(self, event=None):
         """
@@ -2728 +2732 @@
         if len(self.fittable_param) > 0:
             len_orient_para *= 2
+        #Set the value of checkbox that selected every checkbox or not
+        if len(self.parameters) + len(self.fittable_param) - len_orient_para \
+            == len(self.param_toFit):
+            self.cb1.SetValue(True)
+        else:
+            self.cb1.SetValue(False)
 
         self.save_current_state_fit()
@@ -2829 +2839 @@
         iy = 0
         ix = 0
-        sizer.Add(wx.StaticText(self, wx.ID_ANY, 'Parameter'),
-                  (iy, ix), (1, 1), wx.EXPAND | wx.ADJUST_MINSIZE, 0)
+        select_text = "Select All"
+        self.cb1 = wx.CheckBox(self, wx.ID_ANY, str(select_text), (10, 10))
+        wx.EVT_CHECKBOX(self, self.cb1.GetId(), self.select_all_param)
+        self.cb1.SetToolTipString("To check/uncheck all the boxes below.")
+        self.cb1.SetValue(True)
+
+        sizer.Add(self.cb1, (iy, ix), (1, 1), \
+                             wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 5)
         ix += 1
         self.text2_2 = wx.StaticText(self, wx.ID_ANY, 'Value')
@@ -2857 +2873 @@
         self.text2_4.Hide()
 
-        CHECK_STATE = False
+        CHECK_STATE = self.cb1.GetValue()
         for item in keys:
 

src/sas/sasgui/plottools/plottables.py

@@ -1023 +1023 @@
     """
 
-    def __init__(self, x, y, dx=None, dy=None):
+    def __init__(self, x, y, dx=None, dy=None, lam=None, dlam=None):
         """
         Draw points specified by x[i],y[i] in the current color/symbol.
@@ -1037 +1037 @@
         self.x = x
         self.y = y
+        self.lam = lam
         self.dx = dx
         self.dy = dy
+        self.dlam = dlam
         self.source = None
         self.detector = None