Changeset 6c88acd in sasview

Timestamp:

Jun 13, 2012 7:13:06 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:

6f65614

Parents:

e6f0020

Message:

added error msg

Files:

• calculatorview/src/sans/perspectives/calculator/data_operator.py (modified) (2 diffs)
• sansguiframe/src/sans/guiframe/dataFitting.py (modified) (1 diff)

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

@@ -300 +300 @@
             try:
                 float(data2)
+                if self.operator_cbox.GetLabel().strip() == '|':
+                    msg = "DataOperation: This operation can not accept "
+                    msg += "a float number."
+                    self.send_warnings(msg, 'error')
+                    self.numberctr.SetBackgroundColour('pink')
+                    self.output = None
+                    return flag
             except:
                 msg = "DataOperation: Number requires a float number."
@@ -519 +526 @@
         """
     
-    def send_warnings(self, msg='', info=''):
+    def send_warnings(self, msg='', info='info'):
         """
         Send warning to status bar

sansguiframe/src/sans/guiframe/dataFitting.py

@@ -376 +376 @@
                          q_data=None, err_image=None, xmin=None, xmax=None,
                          ymin=None, ymax=None, zmin=None, zmax=None)
-        result.clone_without_data(len(self.data), self)
+        result.clone_without_data(self)
         result.copy_from_datainfo(data2d=self)
         result.xmin = self.xmin