Changeset 9cec2dd in sasview for invariantview/src/sans/perspectives/invariant/invariant.py

Timestamp:

Oct 21, 2011 2:17:13 PM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

3ecaa2b

Parents:

054f004

Message:

working on layout mac

File:

• invariantview/src/sans/perspectives/invariant/invariant.py (modified) (4 diffs)

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

@@ -20 +20 @@
 from sans.guiframe.dataFitting import Data1D
 from sans.guiframe.events import NewPlotEvent
+from sans.guiframe.events import StatusEvent
 from sans.guiframe.gui_style import GUIFRAME_ID
 from .invariant_state import Reader as reader
@@ -150 +151 @@
         receive a list of data and compute invariant
         """
+        msg = ""
         data = None
         if data_list is None:
@@ -157 +159 @@
                 data = data_list[0]
             else:
-                msg = "invariant panel does not allow multiple data!\n"
+                data_1d_list = []
+                data_2d_list = []
+                error_msg = ""
+                # separate data into data1d and data2d list
+                for data in data_list:
+                    if data is not None:
+                        if issubclass(data.__class__, Data1D):
+                            data_1d_list.append(data)
+                        else:
+                            error_msg += " %s  type %s \n" % (str(data.name),
+                                             str(data.__class__.__name__))
+                            data_2d_list.append(data)
+                if len(data_2d_list) > 0:
+                    msg = "Invariant does not support the following data types:\n"
+                    msg += error_msg
+                if len(data_1d_list) == 0:
+                    wx.PostEvent(self.parent, 
+                    StatusEvent(status=msg, info='error'))
+                    return
+                msg += "Invariant panel does not allow multiple data!\n"
                 msg += "Please select one.\n"
                 from invariant_widgets import DataDialog
-                dlg = DataDialog(data_list=data_list, text=msg)
+                dlg = DataDialog(data_list=data_1d_list, text=msg)
                 if dlg.ShowModal() == wx.ID_OK:
                     data = dlg.get_data()
             if data is None:
+                msg += "invariant receives no data. \n"
+                wx.PostEvent(self.parent, 
+                     StatusEvent(status=msg, info='error'))
                 return
-            if issubclass(data.__class__, Data1D):
+            if not issubclass(data.__class__, Data1D):
+                 msg += "invariant cannot be computed for data of "
+                 msg += "type %s\n" % (data.__class__.__name__)
+                 wx.PostEvent(self.parent, 
+                     StatusEvent(status=msg, info='error'))
+                 return
+            else:
                 wx.PostEvent(self.parent, NewPlotEvent(plot=data,
                                            title=data.title))
@@ -171 +201 @@
                     self.compute_helper(data)
                 except:
-                    msg = "Prview Set_data: " + str(sys.exc_value)
+                    msg = "Invariant Set_data: " + str(sys.exc_value)
                     wx.PostEvent(self.parent, StatusEvent(status=msg,
                                                                 info="error"))