Changeset 3df5ecf in sasview

Timestamp:

Jul 19, 2012 12:41:56 PM (12 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:

a8d3b4f

Parents:

07eb396

Message:

added units

Location:

invariantview/src/sans/perspectives/invariant

Files:

• invariant_details.py (modified) (1 diff)
• invariant_panel.py (modified) (8 diffs)

invariantview/src/sans/perspectives/invariant/invariant_details.py

@@ -257 +257 @@
         """
         uncertainty = "+/-" 
-        unit_invariant = '[1/(cm * A)]'
+        unit_invariant = '[1/(cm * A^3)]'
      
         invariant_txt = wx.StaticText(self, -1, 'Q* from Data ')

invariantview/src/sans/perspectives/invariant/invariant_panel.py

@@ -1314 +1314 @@
         self.data_range_sizer = wx.BoxSizer(wx.HORIZONTAL)
         #Sizer related to inputs
-        self.sizer_input =  wx.FlexGridSizer(2, 5, 0, 0)
+        self.sizer_input =  wx.FlexGridSizer(2, 6, 0, 0)
         #Sizer related to inputs
         inputs_box = wx.StaticBox(self, -1, "Customized Inputs")
@@ -1686 +1686 @@
         """
         unit_volume = ''
-        unit_surface = ''
+        unit_surface = '[1/A]'
         uncertainty = "+/-" 
         volume_txt = wx.StaticText(self, -1, 'Volume Fraction')
@@ -1752 +1752 @@
         """
         uncertainty = "+/-" 
-        unit_invariant = '[1/(cm * A)]'
+        unit_invariant = '[1/(cm * A^3)]'
         invariant_total_txt = wx.StaticText(self, -1, 'Invariant Total [Q*]')
         self.invariant_total_tcl = OutputTextCtrl(self, -1,
@@ -1788 +1788 @@
         Draw widgets related to inputs
         """
-        contrast_txt = wx.StaticText(self, -1, 'Contrast :')  
+        contrast_txt = wx.StaticText(self, -1, 'Contrast:')  
         self.contrast_tcl = InvTextCtrl(self, -1, size=(_BOX_WIDTH, 20),
                                         style=0, name='contrast_tcl')
@@ -1794 +1794 @@
         contrast_hint_txt = "Contrast"
         self.contrast_tcl.SetToolTipString(contrast_hint_txt)
-        contrast_unit_txt = wx.StaticText(self, -1, '[1/A^(2)]')  
+        contrast_unit_txt = wx.StaticText(self, -1, '[1/A^2]')  
         porod_const_txt = wx.StaticText(self, -1, 
-                                        'Porod Constant:\n(optional)\n')  
+                                        'Porod\nConstant:\n(optional)\n')  
+        porod_unit_txt = wx.StaticText(self, -1, '[1/(cm*A^4)]') 
         self.porod_constant_tcl = InvTextCtrl(self, -1, 
                                               size=(_BOX_WIDTH, 20), style=0,
@@ -1804 +1805 @@
         self.porod_constant_tcl.SetToolTipString(porod_const_hint_txt)
         
-        background_txt = wx.StaticText(self, -1, 'Background : ')  
+        background_txt = wx.StaticText(self, -1, 'Background:')  
         self.background_tcl = InvTextCtrl(self, -1, size=(_BOX_WIDTH, 20),
                                           style=0, name='background_tcl') 
@@ -1811 +1812 @@
         self.background_tcl.SetToolTipString(background_hint_txt)
         background_unit_txt = wx.StaticText(self, -1, '[1/cm]')  
-        scale_txt = wx.StaticText(self, -1, 'Scale : ')  
+        scale_txt = wx.StaticText(self, -1, 'Scale:')  
         self.scale_tcl = InvTextCtrl(self, -1, size=(_BOX_WIDTH, 20), style=0,
                                      name='scale_tcl')
@@ -1820 +1821 @@
                             (self.background_tcl, 0, wx.LEFT|wx.BOTTOM, 5),
                             (background_unit_txt, 0, wx.LEFT|wx.BOTTOM, 5),
-                            (scale_txt, 0, wx.LEFT|wx.BOTTOM, 20),
+                            (scale_txt, 0, wx.LEFT|wx.BOTTOM, 10),
                             (self.scale_tcl, 0, wx.LEFT|wx.BOTTOM|wx.RIGHT, 5),
+                            (10, 10),
                             (contrast_txt, 0, wx.LEFT|wx.BOTTOM, 5),
                             (self.contrast_tcl, 0, wx.LEFT|wx.BOTTOM, 5),
                             (contrast_unit_txt, 0, wx.LEFT|wx.BOTTOM, 5),
-                            (porod_const_txt, 0, wx.LEFT, 20),
-                (self.porod_constant_tcl, 0, wx.LEFT|wx.BOTTOM|wx.RIGHT, 5)])
+                            (porod_const_txt, 0, wx.LEFT, 10),
+                (self.porod_constant_tcl, 0, wx.LEFT|wx.BOTTOM|wx.RIGHT, 5),
+                (porod_unit_txt, 0, wx.LEFT|wx.BOTTOM, 5)])
         self.inputs_sizer.Add(self.sizer_input)