Changeset d15c0202 in sasview for sansview/perspectives/fitting/fitpage2D.py

Timestamp:

Jan 13, 2009 5:52:02 PM (15 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:

e8d1066

Parents:

e4032d64

Message:

model page change on interface

File:

• sansview/perspectives/fitting/fitpage2D.py (modified) (2 diffs)

sansview/perspectives/fitting/fitpage2D.py

@@ -72 +72 @@
         self.vbox.Add(self.sizer4)
         self.vbox.Add(self.sizer1)
+        ## Q range
+        self.qmin= 0.001
+        self.qmax= 0.1
         
         id = wx.NewId()
@@ -496 +499 @@
             and the reset model according to paramaters changes
         """
+        print "went here",len(self.parameters) ,self.model
         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:
-                
-                is_modified = False
-                if self.xmin.IsModified():
-                    is_modified = True
-                if self.xmax.IsModified():
-                    is_modified = True
-                
-                try: 
-                    
-                    if item[1].IsModified() or is_modified:
-                        print str(item[0].GetLabelText()),item[1].IsModified()
-                        item[1].SetModified(False)
-                        name=str(item[0].GetLabelText())
-                        value= float(item[1].GetValue())
+                try:
+                    item[2].Hide()
+                    item[3].Clear()
+                    item[3].Hide()
+                    name=str(item[0].GetLabelText())
+                    value= float(item[1].GetValue())
+                    # 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)
-                        self.xmin.SetModified(False)
-                        self.xmax.SetModified(False)
-                        is_modified=False
-                        
-                        self.manager.redraw_model(
-                        float(self.xmin.GetValue()),
-                        float(self.xmax.GetValue())  )    
-            
+                        is_modified = True 
                 except:
                      wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
-                            "Model Drawing  Error:wrong value entered : %s"% sys.exc_value))
+                            "Drawing  Error:wrong value entered : %s"% sys.exc_value))
+            # 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.redraw_model( 
+                                        qmin=self.qmin, qmax=self.qmax,
+                                        )
+                #self.manager.draw_model(self,model,description=None,
+                # enable1D=True,qmin=None,qmax=None, qstep=None)
            
     def select_all_param(self,event):