Changeset d171299 in sasview

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

Location:

sansview

Files:

• bugs.txt (modified) (1 diff)
• perspectives/fitting/fitpage1D.py (modified) (4 diffs)
• perspectives/fitting/fitpage2D.py (modified) (4 diffs)
• perspectives/fitting/modelpage.py (modified) (2 diffs)

sansview/bugs.txt

@@ -6 +6 @@
 4-select a model from the model menu , hit close , select it again from the model menu :
 the parameters don't appear
+
+------>bugs [1,2,3,4] fixed---9.46 am 10/22/2008
+
+5- plot data2D theory not working for all models
+---->bugs[5] fixed

sansview/perspectives/fitting/fitpage1D.py

@@ -54 +54 @@
         self.sizer2 = wx.GridBagSizer(5,5)
         self.sizer1 = wx.GridBagSizer(5,5)
+        #self.sizer1 =wx.BoxSizer(wx.HORIZONTAL)
         #self.DataSource      = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
         #self.DataSource.SetToolTipString("name of data to fit")
@@ -127 +128 @@
         self.xmax.Bind(wx.EVT_TEXT_ENTER, self._onTextEnter)
         self.xmax.Disable()
+        iy+=1
+        self.sizer4.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         #Set chisqr  result into TextCtrl
         ix = 0
         iy = 1
+        
         self.text1_1 = wx.StaticText(self, -1, 'Chi2/dof', style=wx.ALIGN_LEFT)
+        #self.sizer1.Add(self.text1_1,1)
         self.sizer1.Add(self.text1_1,(iy,ix),(1,1),\
                    wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
@@ -136 +141 @@
         self.tcChi    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
         self.tcChi.SetToolTipString("Chi^2 over degrees of freedom.")
+        #self.sizer1.Add(self.tcChi, 1, wx.R | wx.BOTTOM , 5)
         self.sizer1.Add(self.tcChi,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         ix +=2
+        #self.sizer1.Add(self.btFit, 1, wx.LEFT | wx.BOTTOM , 5)
         self.sizer1.Add(self.btFit,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         ix+= 1
         self.sizer1.Add( self.btClose,(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        #self.sizer1.Add( self.btClose,1, wx.LEFT | wx.BOTTOM , 5)
+
         ix= 1
         iy+=1
         self.sizer1.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        #self.sizer1.Add((20,20), 0)
         # contains link between  model ,all its parameters, and panel organization
         self.parameters=[]
@@ -166 +176 @@
             @param owner: the class responsible of plotting
         """
-        self.event_owner=owner    
+        self.event_owner = owner    
    
   

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:   

sansview/perspectives/fitting/modelpage.py

@@ -216 +216 @@
         if hasattr(self.model,'description'):
             description =model.description
+        
+
         print "went here",self.model.name,model.description
         iy = 1
@@ -222 +224 @@
         self.sizer1.Add(self.cb0,(iy, ix),(1,1),\
                           wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        self.cb01 = wx.StaticText(self, -1,str(description))
+        iy += 1
+        
+        self.cb01 = wx.StaticText(self, -1,str(description),style=wx.ALIGN_LEFT)
+        self.cb01.Wrap(400) 
+        #self.cb01 = wx.StaticText(self, -1,str(description),(45, 25),style=wx.ALIGN_LEFT)
+        
         self.sizer1.Add(self.cb01,(iy, ix),(1,1),\
                           wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)