Changeset 6813da7d in sasview for invariantview/src/sans/perspectives

Timestamp:

Oct 21, 2011 4:21:06 PM (13 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:

727a710

Parents:

43ede45

Message:

dialog fixes

Location:

invariantview/src/sans/perspectives/invariant

Files:

• invariant.py (modified) (1 diff)
• invariant_widgets.py (modified) (2 diffs)

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

@@ -180 +180 @@
                 msg += "Invariant panel does not allow multiple data!\n"
                 msg += "Please select one.\n"
-                from invariant_widgets import DataDialog
-                dlg = DataDialog(data_list=data_1d_list, text=msg)
-                if dlg.ShowModal() == wx.ID_OK:
-                    data = dlg.get_data()
-                dlg.Destroy()
+                if len(data_list) > 1:
+                    from invariant_widgets import DataDialog
+                    dlg = DataDialog(data_list=data_1d_list, text=msg)
+                    if dlg.ShowModal() == wx.ID_OK:
+                        data = dlg.get_data()
+                    else:
+                        data = None
+                    dlg.Destroy()
+
             if data is None:
                 msg += "invariant receives no data. \n"

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

@@ -105 +105 @@
         wx.Dialog.__init__(self, parent, *args, **kwds)
         self.list_of_ctrl = []
-        if not data_list:
-            return 
         self._sizer_main = wx.BoxSizer(wx.VERTICAL)
         self._sizer_txt = wx.BoxSizer(wx.VERTICAL)
@@ -121 +119 @@
         layout the dialog
         """
-        if not data_list or len(data_list) <= 1:
-            return 
         #add text
         if text.strip() == "":