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

Timestamp:

Oct 24, 2008 5:05:33 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:

922b0d1

Parents:

b24bf4e

Message:

replot 2 d model with data bugging…not replotting all the time you seledct model

File:

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

sansview/perspectives/fitting/fitpage2D.py

@@ -279 +279 @@
             post an event to its owner to draw an appropriate theory
         """
-        
+        self.btFit.SetFocus()
         for item in self.model_list_box.itervalues():
             name = item.__name__
@@ -364 +364 @@
     
         self.sizer2.Clear(True)
+        self.sizer5.Clear(True)
         self.parameters = []
         self.param_toFit=[]
@@ -429 +430 @@
         iy+=1
         self.sizer2.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix= 0
-        iy=1
+        
         if len(disp_list)>0:
+            ix= 0
+            iy=1
             disp = wx.StaticText(self, -1, 'Dispersion')
             self.sizer5.Add(disp,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
@@ -443 +445 @@
             #npts = wx.StaticText(self, -1, 'npts')
             #self.sizer5.Add(npts,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-            iy+=1
+            iy +=1
             
-        for item in disp_list:
-            ix = 0
-            cb2 = wx.CheckBox(self, -1, item, (10, 10))
-            cb2.SetValue(False)
-            self.sizer5.Add( cb2,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-            wx.EVT_CHECKBOX(self, cb2.GetId(), self.select_param)
-            
-            ix += 1
-            value= self.model.getParam(item)
-            ctl2 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,20), style=wx.TE_PROCESS_ENTER)
-            ctl2.SetValue(str (format_number(value)))
-            ctl2.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
-            ctl2.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
-            self.sizer5.Add(ctl2, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-            iy += 1
+            for item in disp_list:
+                ix = 0
+                cb2 = wx.CheckBox(self, -1, item, (10, 10))
+                cb2.SetValue(False)
+                self.sizer5.Add( cb2,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+                wx.EVT_CHECKBOX(self, cb2.GetId(), self.select_param)
+                
+                ix += 1
+                value= self.model.getParam(item)
+                ctl2 = wx.TextCtrl(self, -1, size=(_BOX_WIDTH,20), style=wx.TE_PROCESS_ENTER)
+                ctl2.SetValue(str (format_number(value)))
+                ctl2.Bind(wx.EVT_KILL_FOCUS, self._onparamEnter)
+                ctl2.Bind(wx.EVT_TEXT_ENTER,self._onparamEnter)
+                self.sizer5.Add(ctl2, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                iy += 1
         #Display units text on panel
         for item in keys: