Changeset a5aaec9 in sasview for sansview/perspectives/fitting/modelpage.py

Timestamp:

Jan 13, 2009 8:12:56 AM (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:

b783024

Parents:

92c2345

Message:

reverse set_model_paramater_ to the version on Mathieu

File:

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

sansview/perspectives/fitting/modelpage.py

@@ -366 +366 @@
             # 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())
+                     # 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))
+            
+            # 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())
@@ -372 +388 @@
                 self.qmax = float(self.xmax.GetValue())
                 is_modified = True
-            for item in self.parameters:
-                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())
-                        self.model.setParam(name,value)
-
-                        is_modified=False
-                        print "self.enable2d",self.enable2D
-                        self.manager.draw_model(self.model, self.model.name, 
+            
+            if is_modified:
+                self.manager.draw_model(self.model, self.model.name, 
                                         qmin=self.qmin, qmax=self.qmax,
                                         enable2D=self.enable2D)
-                
-                    
-                except:
-                     wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
-                            "Model 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
-          
+            #self.manager.draw_model(self,model,description=None,
             # enable1D=True,qmin=None,qmax=None, qstep=None)
             
-            self.model_view.SetFocus()
-            
-            
-            
+            
+            
+            
+