Changeset 3cfa760 in sasview for calculatorview/src/sans/perspectives/calculator

Timestamp:

Jan 4, 2013 3:34:17 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:

d5df537

Parents:

4726f7c

Message:

minor bg unit correction for pdb data

File:

• calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py (modified) (3 diffs)

calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py

@@ -509 +509 @@
         self.browse_button.SetLabel('Load')
         try:
+            is_pdbdata = False
             filename = data.filename
             self.data_name_tcl.SetValue(str(filename))
@@ -521 +522 @@
             elif self.ext in self.pdbreader.ext:
                 self.sld_data = data
+                is_pdbdata = True
                 #omf_data = None
             else:
                 raise
+            for name, _, unit in  self.parameters:
+                if name.GetLabelText() == 'background':
+                    if is_pdbdata:
+                        unit.SetLabel('[A^(2)]')
+                    else:
+                        unit.SetLabel('[1/cm]')
+                    break
             self._set_sld_data_helper(True)
         except:
@@ -547 +556 @@
         self.model.set_sld_data(self.sld_data)
         self.draw_button.Enable(self.sld_data!=None)
-        #self.parent.set_omfdata(self.sld_data)#omf_data)
-        self.model.set_sld_data(self.sld_data) 
         wx.CallAfter(self.parent.set_sld_data, self.sld_data)
         if is_draw: