Changeset e88ebfd in sasview for invariantview

Timestamp:

Mar 11, 2011 2:39:00 PM (14 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:

ee2b492

Parents:

14cd91b1

Message:

working on guiframe

File:

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

invariantview/perspectives/invariant/invariant.py

@@ -144 +144 @@
         self.compute_helper(data=data)
                 
-    def set_data(self, data_list=None, theory_list=None):
+    def set_data(self, data_list=None):
         """
         receive a list of data and compute invariant
@@ -151 +151 @@
         if data_list is None:
             data_list = []
-        if len(data_list) > 1:
-            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)
-            if dlg.ShowModal() == wx.ID_OK:
-                data = dlg.get_data()
-        elif len(data_list) == 1:
-            data = data_list[0]
-        if data is None:
-            return
-        if issubclass(data.__class__, Data1D):
-            wx.PostEvent(self.parent, NewPlotEvent(plot=data,
-                                       title=data.title))
-            self.compute_helper(data)
+        if len(data_list) >= 1:
+            if len(data_list) == 1:
+                data = data_list[0]
+            else:
+                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)
+                if dlg.ShowModal() == wx.ID_OK:
+                    data = dlg.get_data()
+            if data is None:
+                return
+            if issubclass(data.__class__, Data1D):
+                wx.PostEvent(self.parent, NewPlotEvent(plot=data,
+                                           title=data.title))
+                try:
+                    self.compute_helper(data)
+                except:
+                    msg = "Prview Set_data: " + str(sys.exc_value)
+                    wx.PostEvent(self.parent, StatusEvent(status=msg,
+                                                                info="error"))
         else:    
             msg = "invariant cannot be computed for data of "
@@ -230 +236 @@
             data.filename = name
             data = self.parent.create_gui_data(data,None)
-            #self.__data = datainfo
-            #self.__data.group_id = data.filename
-            #self.__data.id = datainfo.filename
             self.__data = data
             wx.PostEvent(self.parent, NewPlotEvent(plot=self.__data,
@@ -271 +274 @@
         if data is None:
             id = str(self.__data.id) + name
-            self.__data.group_id
+            group_id = self.__data.group_id
             wx.PostEvent(self.parent, NewPlotEvent(id=id,
                                                group_id=group_id,