Changeset 2bd55e8 in sasview for calculatorview/src/sans

Timestamp:

Jun 13, 2012 5:43:24 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:

9ab366a

Parents:

6f65614

Message:

fixed numbering problem

File:

• calculatorview/src/sans/perspectives/calculator/data_operator.py (modified) (2 diffs)

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

@@ -431 +431 @@
             self.data2_cbox.SetClientData(pos2, None)
             pos3 = self.data2_cbox.Append("Number")
-            self.data2_cbox.SetClientData(pos3, None)
+            val = None
+            if self.numberctr.IsShown():
+                try:
+                    val = float(self.numberctr.GetLabel())
+                except:
+                    val = None
+            self.data2_cbox.SetClientData(pos3, vale)
             return
         pos1 = self.data1_cbox.Append('Select Data')
@@ -440 +446 @@
         self.data2_cbox.SetClientData(pos2, None)
         pos3 = self.data2_cbox.Append("Number")
-        self.data2_cbox.SetClientData(pos3, None)
+        val = None
+        if self.numberctr.IsShown():
+            try:
+                val = float(self.numberctr.GetLabel())
+            except:
+                val = None
+        self.data2_cbox.SetClientData(pos3, val)
         dnames = [dstate.data.name for dstate in self._data.values()]
         ind = numpy.argsort(dnames)