Changeset 9cec2dd in sasview

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

Location:

invariantview/src/sans/perspectives/invariant

Files:

• invariant.py (modified) (4 diffs)
• invariant_details.py (modified) (4 diffs)
• invariant_widgets.py (modified) (5 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"))

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

@@ -28 +28 @@
     FONT_VARIANT = 1
     
+ERROR_COLOR = wx.Colour(255,  0, 0, 128)
+EXTRAPOLATION_COLOR = wx.Colour(169,  169, 168, 128)
+INVARIANT_COLOR =  wx.Colour(67,  208,  128, 128)    
+  
   
 class InvariantContainer(wx.Object):
@@ -197 +201 @@
        
         #Default color the extrapolation bar is grey
-        self.extrapolation_color_low = wx.Colour(169,  169, 168, 128)
-        self.extrapolation_color_high = wx.Colour(169,  169, 168, 128)
-        self.invariant_color = wx.Colour(67,  208,  128, 128)
+        self.extrapolation_color_low = EXTRAPOLATION_COLOR
+        self.extrapolation_color_high = EXTRAPOLATION_COLOR
+        self.invariant_color = INVARIANT_COLOR
         #change color of high and low bar when necessary
         self.set_color_bar()
@@ -420 +424 @@
         Change the color for low and high bar when necessary
         """
-        ERROR_COLOR = wx.Colour(255,  0, 0, 128)
+        self.extrapolation_color_low = EXTRAPOLATION_COLOR
+        self.extrapolation_color_high = EXTRAPOLATION_COLOR
+        self.invariant_color = INVARIANT_COLOR
         #warning to the user when the extrapolated invariant is greater than %5
         if self.low_scale >= 0.05 or self.low_scale > 1 or self.low_scale < 0:
@@ -426 +432 @@
         if self.high_scale >= 0.05 or self.high_scale > 1 or self.high_scale < 0:
             self.extrapolation_color_high = ERROR_COLOR 
-        if self.inv_scale >= 0.05 or self.inv_scale > 1 or self.inv_scale < 0:
+        if self.inv_scale > 1 or self.inv_scale < 0:
             self.invariant_color = ERROR_COLOR  
-            
+    
     def on_close(self, event):
         """

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

@@ -17 +17 @@
 
 WIDTH = 400
-HEIGHT = 200
+HEIGHT = 350
+
+class DialogPanel(ScrolledPanel):
+    def __init__(self, *args, **kwds):
+        ScrolledPanel.__init__(self, *args, **kwds)
+        self.SetupScrolling()
         
 class InvTextCtrl(wx.TextCtrl):
@@ -96 +101 @@
     """
     def __init__(self, data_list, parent=None, text='', *args, **kwds):
+        kwds['size'] = (WIDTH, HEIGHT)
+        kwds['title'] = "Data Selection"
         wx.Dialog.__init__(self, parent, *args, **kwds)
-        self.SetTitle("Data Selection")
-        self.SetSize((WIDTH, HEIGHT))
         self.list_of_ctrl = []
         if not data_list:
@@ -106 +111 @@
         self._sizer_button = wx.BoxSizer(wx.HORIZONTAL)
         self._choice_sizer = wx.GridBagSizer(5, 5)
-        self._panel = ScrolledPanel(self, style=wx.RAISED_BORDER,
-                               size=(WIDTH-20, HEIGHT-50))
-        self._panel.SetupScrolling()
+        self._panel = DialogPanel(self, style=wx.RAISED_BORDER,
+                               size=(WIDTH-20, HEIGHT/3))
+        self.SetSizer(self._sizer_main)
         self.__do_layout(data_list, text=text)
+        self.Layout()
         
     def __do_layout(self, data_list, text=''):
@@ -121 +127 @@
             text = "This Perspective does not allow multiple data !\n"
             text += "Please select only one Data.\n"
-        text_ctrl = wx.StaticText(self, -1, str(text))
-        self._sizer_txt.Add(text_ctrl)
+        text_ctrl = wx.TextCtrl(self, -1, str(text), style=wx.TE_MULTILINE,
+                                size=(-1, HEIGHT/3))
+        text_ctrl.SetEditable(False)
+        self._sizer_txt.Add(text_ctrl , 1, wx.EXPAND|wx.ALL, 10)
         iy = 0
         ix = 0
@@ -151 +159 @@
         static_line = wx.StaticLine(self, -1)
         
-        self._sizer_txt.Add(self._panel, 1, wx.EXPAND|wx.LEFT|wx.RIGHT, 5)
-        self._sizer_main.Add(self._sizer_txt, 1, wx.EXPAND|wx.ALL, 10)
+        self._sizer_txt.Add(self._panel, 0, wx.EXPAND|wx.ALL, 5)
+        self._sizer_main.Add(self._sizer_txt, 0, wx.EXPAND|wx.ALL, 5)
         self._sizer_main.Add(static_line, 0, wx.EXPAND, 0)
         self._sizer_main.Add(self._sizer_button, 0, wx.EXPAND|wx.ALL, 10)
-        self.SetSizer(self._sizer_main)
-        self.Layout()
+        
         
     def get_data(self):