Changeset 6813da7d in sasview for invariantview/src/sans/perspectives
- Timestamp:
- Oct 21, 2011 2:21:06 PM (13 years ago)
- 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
- Location:
- invariantview/src/sans/perspectives/invariant
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
invariantview/src/sans/perspectives/invariant/invariant.py
r18476d6 r6813da7d 180 180 msg += "Invariant panel does not allow multiple data!\n" 181 181 msg += "Please select one.\n" 182 from invariant_widgets import DataDialog 183 dlg = DataDialog(data_list=data_1d_list, text=msg) 184 if dlg.ShowModal() == wx.ID_OK: 185 data = dlg.get_data() 186 dlg.Destroy() 182 if len(data_list) > 1: 183 from invariant_widgets import DataDialog 184 dlg = DataDialog(data_list=data_1d_list, text=msg) 185 if dlg.ShowModal() == wx.ID_OK: 186 data = dlg.get_data() 187 else: 188 data = None 189 dlg.Destroy() 190 187 191 if data is None: 188 192 msg += "invariant receives no data. \n" -
invariantview/src/sans/perspectives/invariant/invariant_widgets.py
r9cec2dd r6813da7d 105 105 wx.Dialog.__init__(self, parent, *args, **kwds) 106 106 self.list_of_ctrl = [] 107 if not data_list:108 return109 107 self._sizer_main = wx.BoxSizer(wx.VERTICAL) 110 108 self._sizer_txt = wx.BoxSizer(wx.VERTICAL) … … 121 119 layout the dialog 122 120 """ 123 if not data_list or len(data_list) <= 1:124 return125 121 #add text 126 122 if text.strip() == "":
Note: See TracChangeset
for help on using the changeset viewer.