Changeset 75a7ece in sasview

Timestamp:

Jan 21, 2011 3:06:10 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:

cacbd7d

Parents:

b5181f6

Message:

allow selection of multiple file for prview at laoding time

Location:

prview/perspectives/pr

Files:

• pr.py (modified) (2 diffs)
• pr_widgets.py (modified) (2 diffs)

prview/perspectives/pr/pr.py

@@ -1311 +1311 @@
         """
         if len(data_list) > 1:
-            msg = "Pr panel does not allow more than one value"
-            msg += " at this time"
-            raise ValueError, msg
+            msg = "Pr panel does not allow multiple Data.\n"
+            msg += "Please select one!\n"
+            from pr_widgets import DataDialog
+            dlg = DataDialog(data_list=data_list, text=msg)
+            if dlg.ShowModal() == wx.ID_OK:
+                data = dlg.get_data()
+                if issubclass(data.__class__, LoaderData1D):
+                    self.control_panel._change_file(evt=None, data=data)
+                else:    
+                    msg = "Pr cannot be computed for data of "
+                    msg += "type %s" % (data_list[0].__class__.__name__)
+                    wx.PostEvent(self.parent, 
+                             StatusEvent(status=msg, info='error'))
         elif len(data_list) == 1:
             if issubclass(data_list[0].__class__, LoaderData1D):
@@ -1320 +1330 @@
                 msg = "Pr cannot be computed for"
                 msg += " data of type %s" % (data_list[0].__class__.__name__)
-                raise ValueError, msg
+                wx.PostEvent(self.parent, 
+                             StatusEvent(status=msg, info='error'))
+        else:
+            msg = "Pr contain no data"
+            wx.PostEvent(self.parent, StatusEvent(status=msg, info='warning'))
             
     def post_init(self):

prview/perspectives/pr/pr_widgets.py

@@ -16 +16 @@
 import wx
 import os
-
+from wx.lib.scrolledpanel import ScrolledPanel
 class PrTextCtrl(wx.TextCtrl):
     """
@@ -119 +119 @@
         """
         return self._complete_path
+    
+class DataDialog(wx.Dialog):
+    """
+    Allow file selection at loading time
+    """
+    def __init__(self, data_list, parent=None, text='', *args, **kwds):
+        wx.Dialog.__init__(self, parent, *args, **kwds)
+        self.list_of_ctrl = []
+        self._do_layout(data_list, text=text)
+        
+    def _do_layout(self, data_list, text=''):
+        """
+        layout the dialog
+        """
+        if not data_list or len(data_list) <= 1:
+            return 
+        # Dialog box properties
+        self.SetTitle("Data Selection")
+        w = 400
+        h = 200
+        self.SetSize((w, h))
+        sizer_main = wx.BoxSizer(wx.VERTICAL)
+        sizer_txt = wx.BoxSizer(wx.VERTICAL)
+        sizer_button = wx.BoxSizer(wx.HORIZONTAL)
+        choice_sizer = wx.GridBagSizer(5, 5)
+        #choice_sizer.SetMinSize((w-20, h-50))
+        panel = ScrolledPanel(self, style=wx.RAISED_BORDER, size=(w-20, h-50))
+        panel.SetupScrolling()
+        #add text
+        if text.strip() == "":
+            text = "This Perspective does not allow multiple data !\n"
+            text += "Please select only one Data.\n"
+        text_ctrl = wx.StaticText(self, -1, str(text))
+        sizer_txt.Add(text_ctrl)
+        iy = 0
+        ix = 0
+        rbox = wx.RadioButton(panel, -1, str(data_list[0].name), 
+                                  (10, 10), style= wx.RB_GROUP)
+        rbox.SetValue(True)
+        self.list_of_ctrl.append((rbox, data_list[0]))
+        choice_sizer.Add(rbox, (iy, ix), (1, 1),
+                         wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        for i in range(1, len(data_list)):
+            iy += 1
+            rbox = wx.RadioButton(panel, -1, str(data_list[i].name), (10, 10))
+            rbox.SetValue(False)
+            self.list_of_ctrl.append((rbox, data_list[i]))
+            choice_sizer.Add(rbox, (iy, ix),
+                           (1, 1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        panel.SetSizer(choice_sizer)
+        #add sizer
+        sizer_button.Add((20, 20), 1, wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        button_cancel = wx.Button(self, wx.ID_CANCEL, "Cancel")
+        sizer_button.Add(button_cancel, 0,
+                          wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)
+        button_OK = wx.Button(self, wx.ID_OK, "Ok")
+        button_OK.SetFocus()
+        sizer_button.Add(button_OK, 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)
+        static_line = wx.StaticLine(self, -1)
+        
+        sizer_txt.Add(panel, 1, wx.EXPAND|wx.LEFT|wx.RIGHT, 5)
+        sizer_main.Add(sizer_txt, 1, wx.EXPAND|wx.ALL, 10)
+        sizer_main.Add(static_line, 0, wx.EXPAND, 0)
+        sizer_main.Add(sizer_button, 0, wx.EXPAND|wx.ALL, 10)
+        self.SetSizer(sizer_main)
+        self.Layout()
+        
+    def get_data(self):
+        """
+        return the selected data
+        """
+        for item in self.list_of_ctrl:
+            rbox, data = item
+            if rbox.GetValue():
+                return data