Changeset 44bbf6a in sasview for sansview/perspectives/fitting/fitpage1D.py

Timestamp:

Oct 22, 2008 12:35:02 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:

c0d9981

Parents:

978967c

Message:

panel 2d changed for dispersion display

File:

• sansview/perspectives/fitting/fitpage1D.py (modified) (8 diffs)

sansview/perspectives/fitting/fitpage1D.py

@@ -54 +54 @@
         self.sizer2 = wx.GridBagSizer(5,5)
         self.sizer1 = wx.GridBagSizer(5,5)
-        self.DataSource      = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
-        self.DataSource.SetToolTipString("name of data to fit")
-        self.DataSource.SetValue(str(data.name))
+        #self.DataSource      = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
+        #self.DataSource.SetToolTipString("name of data to fit")
+        #self.DataSource.SetValue(str(data.name))
+        #self.DataSource.Disable()
+        self.DataSource  =wx.StaticText(self, -1,str(data.name))
+        
         self.modelbox = wx.ComboBox(self, -1)
         id = wx.NewId()
@@ -64 +67 @@
         self.static_line_1 = wx.StaticLine(self, -1)
        
-        
-       
         self.vbox.Add(self.sizer3)
         self.vbox.Add(self.sizer2)
         self.vbox.Add(self.static_line_1, 0, wx.EXPAND, 0)
         self.vbox.Add(self.sizer5)
-        
         self.vbox.Add(self.sizer4)
         self.vbox.Add(self.sizer1)
-        
-        
         
         id = wx.NewId()
@@ -82 +80 @@
         ix = 0
         iy = 1
-        self.sizer3.Add(wx.StaticText(self, -1, 'Data Source'),(iy,ix),\
+        self.sizer3.Add(wx.StaticText(self, -1, 'Data Source Name : '),(iy,ix),\
                  (1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix += 1
@@ -120 +118 @@
         self.xmin.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
         self.xmin.Bind(wx.EVT_TEXT_ENTER, self._onTextEnter)
+        self.xmin.Disable()
         ix += 2
         self.xmax    = wx.TextCtrl(self, -1,size=(_BOX_WIDTH,20))
@@ -127 +126 @@
         self.xmax.Bind(wx.EVT_KILL_FOCUS, self._onTextEnter)
         self.xmax.Bind(wx.EVT_TEXT_ENTER, self._onTextEnter)
+        self.xmax.Disable()
         #Set chisqr  result into TextCtrl
         ix = 0
@@ -252 +252 @@
             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__
@@ -342 +342 @@
         self.model = model
         keys = self.model.getParamList()
-        print "fitpage1D : dispersion list",self.model.getDispParamList()
+        #print "fitpage1D : dispersion list",self.model.getDispParamList()
         keys.sort()
         disp_list=self.model.getDispParamList()
@@ -407 +407 @@
         ix= 0
         iy=1
-        self.disp = wx.StaticText(self, -1, 'Dispersion')
-        self.sizer5.Add(self.disp,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        iy+=1
+        if len(disp_list)>0:
+            disp = wx.StaticText(self, -1, 'Dispersion')
+            self.sizer5.Add(disp,( iy, ix),(1,1),  wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+            ix += 1 
+            values = wx.StaticText(self, -1, 'Values')
+            self.sizer5.Add(values,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+            #ix += 1 
+            #disps = wx.StaticText(self, -1, 'Disp')
+            #self.sizer5.Add(disps,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+            #ix += 1 
+            #npts = wx.StaticText(self, -1, 'npts')
+            #self.sizer5.Add(npts,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+            iy+=1
+            
         for item in disp_list:
             ix = 0