Changeset 61780e3 in sasview for src/sas/sasgui/perspectives/calculator

Timestamp:

Oct 7, 2016 9:24:12 AM (8 years ago)

Author:

mathieu <m2d@…>

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

286c757

Parents:

ee563d5

Message:

Make sure the right error message shows up

File:

• src/sas/sasgui/perspectives/calculator/data_operator.py (modified) (1 diff)

src/sas/sasgui/perspectives/calculator/data_operator.py

@@ -397 +397 @@
             self._set_textctrl_color(self.data1_cbox, 'pink')
             self._set_textctrl_color(self.data2_cbox, 'pink')
-            msg = "DataOperation: Data types must be same."
+            msg = "DataOperation: %s" % sys.exc_value
             self.send_warnings(msg, 'error')
             self.output = None