Changeset e5af88b in sasview

Timestamp:

Feb 3, 2009 1:36:22 PM (16 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:

80f3169

Parents:

0690e1d

Message:

small bug fixed

Location:

sansview/perspectives/fitting

Files:

• fitpage1D.py (modified) (1 diff)
• fitpage2D.py (deleted)
• fitting.py (modified) (1 diff)
• modelpage.py (modified) (11 diffs)
• old_fitpage1D.py (deleted)
• old_fitpanel.py (deleted)
• old_fitting.py (deleted)
• old_modelpage.py (deleted)

sansview/perspectives/fitting/fitpage1D.py

@@ -231 +231 @@
         ix = 0
         iy += 1
-        self.sizer9.Add(wx.StaticText(self, -1, 'x range'),(iy, ix),(1,1),\
+        self.sizer9.Add(wx.StaticText(self, -1, 'Q range'),(iy, ix),(1,1),\
                             wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix += 1

sansview/perspectives/fitting/fitting.py

@@ -69 +69 @@
         id3 = wx.NewId()
         self.menu1.AppendCheckItem(id3, "park") 
+    
         wx.EVT_MENU(owner, id3, self._onset_engine)
         

sansview/perspectives/fitting/modelpage.py

@@ -128 +128 @@
         self.qmin    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
         self.qmin.SetValue(format_number(self.qmin_x))
-        self.qmin.SetToolTipString("Minimun value of x in linear scale.")
+        self.qmin.SetToolTipString("Minimun value of Q in linear scale.")
         self.qmin.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
         self.qmin.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
@@ -134 +134 @@
         self.qmax    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
         self.qmax.SetValue(format_number(self.qmax_x))
-        self.qmax.SetToolTipString("Maximum value of x in linear scale.")
+        self.qmax.SetToolTipString("Maximum value of Q in linear scale.")
         self.qmax.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
         self.qmax.Bind(wx.EVT_TEXT_ENTER, self._onparamEnter)
@@ -160 +160 @@
         ix = 0
         iy += 1
-        self.sizer9.Add(wx.StaticText(self, -1, 'x range'),(iy, ix),(1,1),\
+        self.sizer9.Add(wx.StaticText(self, -1, 'Q range'),(iy, ix),(1,1),\
                             wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix += 1
@@ -267 +267 @@
                     self.cb1.SetValue(False)
                     self.select_all_param_helper()
-                self.fittable_param=[]
-                self.fixed_param=[]
-                self.sizer8.Clear(True)
+                
                 self.populate_disp_box()
                 self.set_panel_dispers(self.disp_list)
-                self.vbox.Layout()
-                self.SetScrollbars(20,20,55,40)
-                self.Layout()
-                self.parent.GetSizer().Layout()   
+                
         else:
             if self.data !=None:
@@ -304 +299 @@
             wx.EVT_COMBOBOX(self.disp_box,-1, self._on_select_Disp) 
             self.sizer7.Add(self.disp_box,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-       
+            self.vbox.Layout()
+            self.SetScrollbars(20,20,55,40)
+            self.Layout()
+            self.parent.GetSizer().Layout()  
+            
+            
     def set_range(self, qmin_x, qmax_x, npts):
         """
@@ -367 +367 @@
             self.enable2D=True
             self._draw_model()
-            
-        else:
-            print "enable is true:",self.enable2D
-            #self.manager.parent. show_panel(147)
-            self.manager.show_panel2D( id=None )
-            #self.manager.menu1.Append(event_id, new_panel.window_caption, 
-            #             "Show %s plot panel" % new_panel.window_caption)
+            self.model_view.Disable()
             
     
@@ -427 +421 @@
                 #self.manager.draw_model(model, name)
                 self.enable2D=False
+                self.model_view.Enable()
                 self._draw_model(name)
             
@@ -562 +557 @@
     def  set_panel_dispers(self, disp_list, type="Gaussian" ):
         
-        
-       
+        self.fittable_param=[]
+        self.fixed_param=[]
+                
         ix=0
         iy=1
         ### this will become a separate method
         if type== "Gaussian" :
-           
+            print "went here"
+            self.sizer8.Clear(True)
             disp = wx.StaticText(self, -1, 'Dispersion')
             self.sizer8.Add(disp,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
@@ -643 +640 @@
                             self.sizer8.Add(Tctl, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
                             self.fixed_param.append([name3, Tctl])
-                            
-           
+                    
+            ix =0
+            iy +=1 
+            self.sizer8.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)        
+            self.vbox.Layout()
+            self.SetScrollbars(20,20,55,40)
+            self.Layout()
+            self.parent.GetSizer().Layout()  
          
            
@@ -658 +661 @@
             # Flag to register when a parameter has changed.
             is_modified = False
+            for item in self.fittable_param:
+                try:
+                     name=str(item[0].GetLabelText())
+                     value= float(item[1].GetValue())
+                     #print "model para", 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):
+                         #print "went hereee"
+                         self.model.setParam(name,value)
+                         is_modified = True
+                         
+                except:
+                    raise
+                    wx.PostEvent(self.parent.parent, StatusEvent(status=\
+                            "Model Drawing  Error:wrong value entered : %s"% sys.exc_value))
+                
             for item in self.fixed_param:
                 try:
@@ -671 +691 @@
                          
                 except:
-                     wx.PostEvent(self.parent.parent, StatusEvent(status=\
+                    raise
+                    wx.PostEvent(self.parent.parent, StatusEvent(status=\
                             "Model Drawing  Error:wrong value entered : %s"% sys.exc_value))