Changeset 24ea33c in sasview for sansview/perspectives/fitting/modelpage.py

Timestamp:

Jan 10, 2009 12:08:54 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

20be946

Parents:

4b91fd1

Message:

Fixed 1D and 2D model update problem. 2D models will no longer be recalculated when the "View 2D" button is clicked twice in a row and no parameter has changed.

File:

• sansview/perspectives/fitting/modelpage.py (modified) (4 diffs)

sansview/perspectives/fitting/modelpage.py

@@ -80 +80 @@
         self.sizer4.Add(wx.StaticText(self, -1, 'x range'),(iy, ix),(1,1),\
                             wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-       
-        qmin= 0.001
-        qmax= 1.0
+        ## Q range
+        self.qmin= 0.001
+        self.qmax= 0.1
+        
         ix += 1
         self.xmin    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        self.xmin.SetValue(format_number(qmin))
+        self.xmin.SetValue(format_number(self.qmin))
         self.xmin.SetToolTipString("Minimun value of x in linear scale.")
         self.xmin.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
@@ -94 +95 @@
         ix += 2
         self.xmax    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        self.xmax.SetValue(format_number(qmax))
+        self.xmax.SetValue(format_number(self.qmax))
         self.xmax.SetToolTipString("Maximum value of x in linear scale.")
         self.xmax.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
@@ -174 +175 @@
          call manager to plot model in 2D
         """
-        self.enable2D=True
-        print "modelpage name", self.prevmodel_name
-        self.manager.draw_model(model=self.model,name=self.prevmodel_name,
+        # If the 2D display is not currently enabled, plot the model in 2D 
+        # and set the enable2D flag.
+        if self.enable2D==False:
+            self.enable2D=True
+            self.manager.draw_model(model=self.model,name=self.prevmodel_name,
                                     description=None,
                                      enable2D=self.enable2D,
-                                     qmin=float(self.xmin.GetValue()),
-                                    qmax=float(self.xmax.GetValue()))
+                                     qmin=float(self.qmin),
+                                    qmax=float(self.qmax))
+            
     def populate_box(self, dict):
         """
@@ -358 +362 @@
     def set_model_parameter(self):
         if len(self.parameters) !=0 and self.model !=None:
+            # Flag to register when a parameter has changed.
+            is_modified = False
             for item in self.parameters:
                 try:
                      name=str(item[0].GetLabelText())
                      value= float(item[1].GetValue())
-                     self.model.setParam(name,value)
+                     # If the value of the parameter has changed,
+                     # update the model and set the is_modified flag
+                     if value != self.model.getParam(name):
+                         self.model.setParam(name,value)
+                         is_modified = True
                 except:
                      wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
                             "Model Drawing  Error:wrong value entered : %s"% sys.exc_value))
             
-            print self.enable2D
-            self.manager.draw_model(self.model,qmin=float(self.xmin.GetValue()),
-                                    qmax=float(self.xmax.GetValue()),
-                                    enable2D=self.enable2D)
+            # Here we should check whether the boundaries have been modified.
+            # If qmin and qmax have been modified, update qmin and qmax and 
+            # set the is_modified flag to True
+            if float(self.xmin.GetValue()) != self.qmin:
+                self.qmin = float(self.xmin.GetValue())
+                is_modified = True
+            if float(self.xmax.GetValue()) != self.qmax:
+                self.qmax = float(self.xmax.GetValue())
+                is_modified = True
+            
+            if is_modified:
+                self.manager.draw_model(self.model, self.model.name, 
+                                        qmin=self.qmin, qmax=self.qmax,
+                                        enable2D=self.enable2D)
             #self.manager.draw_model(self,model,description=None,
             # enable1D=True,qmin=None,qmax=None, qstep=None)