Changeset f95301b in sasview for sansview/perspectives/fitting

Timestamp:

Mar 16, 2011 6:33:57 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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

Children:

02775ab8

Parents:

c8afcb7

Message:

work on saving state

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (8 diffs)
• fitpage.py (modified) (5 diffs)
• fitpanel.py (modified) (1 diff)
• fitting.py (modified) (1 diff)

sansview/perspectives/fitting/basepage.py

@@ -67 +67 @@
         self.id = None
         ## Q range
+        self.qmin = None
+        self.qmax = None
         self.qmax_x = _QMAX_DEFAULT
         self.qmin_x = _QMIN_DEFAULT
@@ -1351 +1353 @@
         # if self.check_invalid_panel():
         #    return
-        self.qmin_tctrl.SetValue(str(state.qmin))
+        self.qmin.SetValue(str(state.qmin))
         self.qmax.SetValue(str(state.qmax)) 
 
@@ -1406 +1408 @@
             # If qmin and qmax have been modified, update qmin and qmax and 
             # set the is_modified flag to True
-            if self._validate_qrange(self.qmin_tcrl, self.qmax):
-                tempmin = float(self.qmin_tcrl.GetValue())
+            if self._validate_qrange(self.qmin, self.qmax):
+                tempmin = float(self.qmin.GetValue())
                 if tempmin != self.qmin_x:
                     self.qmin_x = tempmin
@@ -1461 +1463 @@
             # If qmin and qmax have been modified, update qmin and qmax and 
             # set the is_modified flag to True
-            self.fitrange = self._validate_qrange(self.qmin_tcrl, self.qmax)
+            self.fitrange = self._validate_qrange(self.qmin, self.qmax)
             if self.fitrange:
-                tempmin = float(self.qmin_tcrl.GetValue())
+                tempmin = float(self.qmin.GetValue())
                 if tempmin != self.qmin_x:
                     self.qmin_x = tempmin
@@ -1892 +1894 @@
                 tcrtl.SetBackgroundColour(wx.WHITE)
                 # If qmin and qmax have been modified, update qmin and qmax
-                if self._validate_qrange(self.qmin_tcrl, self.qmax):
-                    tempmin = float(self.qmin_tcrl.GetValue())
+                if self._validate_qrange(self.qmin, self.qmax):
+                    tempmin = float(self.qmin.GetValue())
                     if tempmin != self.qmin_x:
                         self.qmin_x = tempmin
@@ -2127 +2129 @@
                             self.data.qy_data * self.data.qy_data )
         #get unmasked index
-        index_data = (float(self.qmin_tcrl.GetValue()) <= radius) & \
+        index_data = (float(self.qmin.GetValue()) <= radius) & \
                         (radius <= float(self.qmax.GetValue()))
         index_data = (index_data) & (self.data.mask) 
@@ -2134 +2136 @@
         if len(index_data[index_data]) < 10:
             # change the color pink.
-            self.qmin_tcrl.SetBackgroundColour("pink")
-            self.qmin_tcrl.Refresh()
+            self.qmin.SetBackgroundColour("pink")
+            self.qmin.Refresh()
             self.qmax.SetBackgroundColour("pink")
             self.qmax.Refresh()
@@ -2539 +2541 @@
         else:
             # set relative text ctrs.
-            self.qmin_tcrl.SetValue(str(self.qmin_x))
+            self.qmin.SetValue(str(self.qmin_x))
             self.qmax.SetValue(str(self.qmax_x))
             self.set_npts2fit()

sansview/perspectives/fitting/fitpage.py

@@ -361 +361 @@
         self.sizer5.Clear(True)
      
-        self.qmin_tcrl  = self.ModelTextCtrl(self, -1,size=(_BOX_WIDTH,20),
+        self.qmin  = self.ModelTextCtrl(self, -1,size=(_BOX_WIDTH,20),
                                           style=wx.TE_PROCESS_ENTER,
                                     text_enter_callback = self._onQrangeEnter)
-        self.qmin_tcrl.SetValue(str(self.qmin_x))
-        self.qmin_tcrl.SetToolTipString("Minimun value of Q in linear scale.")
+        self.qmin.SetValue(str(self.qmin_x))
+        self.qmin.SetToolTipString("Minimun value of Q in linear scale.")
      
         self.qmax  = self.ModelTextCtrl(self, -1,size=(_BOX_WIDTH,20),
@@ -398 +398 @@
         sizer.Add(self.EditMask_title)
         sizer.Add(self.reset_qrange)   
-        sizer.Add(self.qmin_tcrl)
+        sizer.Add(self.qmin)
         sizer.Add(self.qmax)
         sizer.Add(self.theory_npts_tcrtl)
@@ -963 +963 @@
         # Remove or do not allow fitting on the Q=0 point, especially 
         # when y(q=0)=None at x[0].         
-        self.qmin_x = float(self.qmin_tcrl.GetValue())
+        self.qmin_x = float(self.qmin.GetValue())
         self.qmax_x = float( self.qmax.GetValue())
         self._manager._reset_schedule_problem(id=self.id, value=0)
@@ -1174 +1174 @@
 
                 # If qmin and qmax have been modified, update qmin and qmax
-                if self._validate_qrange( self.qmin_tcrl, self.qmax):
-                    tempmin = float(self.qmin_tcrl.GetValue())
+                if self._validate_qrange( self.qmin, self.qmax):
+                    tempmin = float(self.qmin.GetValue())
                     if tempmin != self.qmin_x:
                         self.qmin_x = tempmin
@@ -1589 +1589 @@
         self.minimum_q.SetValue(str(data_min))
         self.maximum_q.SetValue(str(data_max))
-        self.qmin_tcrl.SetValue(str(data_min))
+        self.qmin.SetValue(str(data_min))
         self.qmax.SetValue(str(data_max))
-        self.qmin_tcrl.SetBackgroundColour("white")
+        self.qmin.SetBackgroundColour("white")
         self.qmax.SetBackgroundColour("white")
         self.state.data = data

sansview/perspectives/fitting/fitpanel.py

@@ -157 +157 @@
         page_is_opened = False
         if state is not None:
-            for id, panel in self.opened_pages.values():
+            for id, panel in self.opened_pages.iteritems():
                 #Don't return any panel is the exact same page is created
                 if id == panel.id:

sansview/perspectives/fitting/fitting.py

@@ -337 +337 @@
                 
                 data.group_id = state.data.group_id
-                self.parent.add_data(data_list=[data])
+                self.parent.add_data(data_list={data.id:data})
                 wx.PostEvent(self.parent, NewPlotEvent(plot=data,
                                         title=data.title))
+                #need to be fix later make sure we are sendind guiframe.data
+                #to panel
+                state.data = data
                 page = self.fit_panel.set_state(state)   
             else:
-                self.parent.add_data(data_list=[data])
-                wx.PostEvent(self.parent, NewPlotEvent(plot=data,
-                                        title=data.title))
                 #just set data because set_state won't work
                 data = self.parent.create_gui_data(state.data)
                 data.group_id = state.data.group_id
+                self.parent.add_data(data_list={data.id:data})
+                wx.PostEvent(self.parent, NewPlotEvent(plot=data,
+                                        title=data.title))
                 self.add_fit_page(data)
                 caption = panel.window_name