Changeset 4efefc6 in sasview for sansview/perspectives/fitting

Timestamp:

May 23, 2011 10:53:26 AM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

1c6389c

Parents:

022af4d

Message:

removed Qrange display in data sizer

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpage.py (modified) (5 diffs)

sansview/perspectives/fitting/basepage.py

@@ -959 +959 @@
             self.qmin_x = data_min
             self.qmax_x = data_max
-            self.minimum_q.SetValue(str(data_min))
-            self.maximum_q.SetValue(str(data_max))
+            #self.minimum_q.SetValue(str(data_min))
+            #self.maximum_q.SetValue(str(data_max))
             self.qmin.SetValue(str(data_min))
             self.qmax.SetValue(str(data_max))

sansview/perspectives/fitting/fitpage.py

@@ -391 +391 @@
             data_min = ""
             data_max = ""
-            data_name = ""
+            data_name = " None"
         else:
             data_name = self.data.name
@@ -410 +410 @@
             self.qmin_x = data_min
             self.qmax_x = data_max
-        box_description= wx.StaticBox(self, -1, 'Data')
+        box_description= wx.StaticBox(self, -1, 'I(q) Data Source')
         boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
         #----------------------------------------------------------
@@ -420 +420 @@
         #self.dataSource.SetEditable(False)
         self.dataSource.SetMinSize((_DATA_BOX_WIDTH, -1))
-        sizer_data.Add(wx.StaticText(self, -1, 'Source Name : '))
+        sizer_data.Add(wx.StaticText(self, -1, 'Data : '))
         sizer_data.Add(self.dataSource )
         sizer_data.Add( (0,5) )
-        
+        """
         #---------sizer 2 draw--------------------------------
         text4_3 = wx.StaticText(self, -1, 'Total Q Range (1/A)',
@@ -437 +437 @@
         sizer_range.Add(wx.StaticText(self, -1, "Max: "),0, wx.LEFT, 10)
         sizer_range.Add(self.maximum_q,0, wx.LEFT, 10)
+        """
         boxsizer1.Add(sizer_data,0, wx.ALL, 10)
-        boxsizer1.Add(sizer_range, 0 , wx.LEFT, 10)
+        #boxsizer1.Add(sizer_range, 0 , wx.LEFT, 10)
         #------------------------------------------------------------
+        
         self.sizer0.Add(boxsizer1,0, wx.EXPAND | wx.ALL, 10)
         self.sizer0.Layout()
@@ -1653 +1655 @@
         self.qmin_x = data_min
         self.qmax_x = data_max
-        self.minimum_q.SetValue(str(data_min))
-        self.maximum_q.SetValue(str(data_max))
+        #self.minimum_q.SetValue(str(data_min))
+        #self.maximum_q.SetValue(str(data_max))
         self.qmin.SetValue(str(data_min))
         self.qmax.SetValue(str(data_max))