Changeset 18ec684 in sasview for guiframe

Timestamp:

Feb 14, 2011 3:10:37 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:

9590db6

Parents:

4e4d3bb

Message:

working on guiframe

Location:

guiframe

Files:

• data_panel.py (modified) (9 diffs)
• gui_manager.py (modified) (3 diffs)
• gui_toolbar.py (modified) (1 diff)

guiframe/data_panel.py

@@ -83 +83 @@
         self.sizer3 = wx.GridBagSizer(5,5)
         self.sizer4 = wx.BoxSizer(wx.HORIZONTAL)
-        self.sizer5 = wx.BoxSizer(wx.HORIZONTAL)
-        #self.sizer3.SetMinSize((w-60, -1))
-        
+        self.sizer5 = wx.BoxSizer(wx.VERTICAL)
+       
         self.vbox.Add(self.sizer5, 0,wx.EXPAND|wx.ALL,10)
         self.vbox.Add(self.sizer1, 0,wx.EXPAND|wx.ALL,0)
@@ -107 +106 @@
         for option in list_of_options:
             self.selection_cbox.Append(str(option))
-        self.selection_cbox.SetValue('None')
+        self.selection_cbox.SetValue('Select all Data')
         wx.EVT_COMBOBOX(self.selection_cbox,-1, self._on_selection_type)
         self.sizer5.AddMany([(select_txt,0, wx.ALL,5),
@@ -165 +164 @@
         Select data according to patterns
         """
+        
+        list_of_options = ['Select all Data',
+                            'Unselect all Data',
+                           'Select all Data 1D',
+                           'Unselect all Data 1D',
+                           'Select all Data 2D',
+                           'Unselect all Data 2D' ]
         option = self.selection_cbox.GetValue()
-        if option == 'Select all Data':
-            print "on select"
-            
+        
+        pos = self.selection_cbox.GetSelection()
+        if pos == wx.NOT_FOUND:
+            return 
+        option = self.selection_cbox.GetString(pos)
+        for item in self.list_cb_data:
+            data_id, data_class = self.tree_ctrl.GetItemPyData(item) 
+            if option == 'Select all Data':
+                self.tree_ctrl.CheckItem(item, True) 
+            elif option == 'Unselect all Data':
+                self.tree_ctrl.CheckItem(item, False)
+            elif option == 'Select all Data 1D':
+                if data_class == 'Data1D':
+                    self.tree_ctrl.CheckItem(item, True) 
+            elif option == 'Unselect all Data 1D':
+                if data_class in ['Data1D', 'Theory1D']:
+                    self.tree_ctrl.CheckItem(item, False) 
+            elif option == 'Select all Data 1D':
+                if data_class == ['Data1D', 'Theory1D']:
+                    self.tree_ctrl.CheckItem(item, True) 
+            elif option == 'Select all Data 2D':
+                if data_class == 'Data2D':
+                    self.tree_ctrl.CheckItem(item, True) 
+            elif option == 'Unselect all Data 2D':
+                if data_class == 'Data2D':
+                    self.tree_ctrl.CheckItem(item, False) 
+               
     def on_set_active_perspective(self, event):
         """
@@ -199 +229 @@
         self.tctrl_plotpanel = wx.StaticText(self, -1, 'No Plot panel on focus')
         self.tctrl_plotpanel.SetToolTipString("Active Plot Panel")
-        #self.sizer3.AddMany([(self.bt_import,0, wx.ALL,5),
-        #                     (self.bt_append_plot,0, wx.ALL,5),
-        #                     (self.bt_plot, 0, wx.ALL,5),
-        # (self.bt_remove,0, wx.ALL,5)])
+    
         ix = 0
         iy = 0
@@ -226 +253 @@
                              wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         
+        
      
     def layout_batch(self):
@@ -309 +337 @@
                     for process in data.process:
                         theory_child = self.tree_ctrl.FindItem(data_child,
-                                                        "Available Theories")#,
+                                                        "Available Theories"),
                         if theory is not None:
                             av_theory_child =self.tree_ctrl.AppendItem(theory_child,
@@ -323 +351 @@
             if data_child is None:
                 data_child =self.tree_ctrl.InsertItem(self.tree_ctrl.root,0,
-                                                   data_name,ct_type=1, data=data.id)
+                                                   data_name,ct_type=1, data=(data.id, data_class))
                 cb_data = self.tree_ctrl.GetFirstChild(self.tree_ctrl.root) 
                 item, id = cb_data
@@ -356 +384 @@
         for item in self.list_cb_data:
             if item.IsChecked():
-                
-               data_to_plot.append(self.tree_ctrl.GetItemPyData(item))
+               data_id, data_class = self.tree_ctrl.GetItemPyData(item) 
+               data_to_plot.append(self.tree_ctrl.GetItemPyData(data_id))
         theory_to_plot = []
         for item in self.list_cb_theory:
             if item.IsChecked():
-                theory_to_plot.append(self.tree_ctrl.GetItemPyData(item))
+                data_id, data_class = self.tree_ctrl.GetItemPyData(item)
+                theory_to_plot.append(self.tree_ctrl.GetItemPyData(data_id))
         return data_to_plot, theory_to_plot
     
     def on_remove(self, event):
+        """
+        remove data from application
+        """
         data_to_remove, theory_to_remove = self.set_data_helper()
         for item in self.list_cb_data:
@@ -377 +409 @@
         if data_to_remove:
             delete_all = True
-        self.parent.delete_data(data_id=data_to_remove,
+        self.parent.remove_data(data_id=data_to_remove,
                                   theory_id=theory_to_remove,
                                   delete_all=delete_all)

guiframe/gui_manager.py

@@ -341 +341 @@
         style = self.__gui_style & (GUIFRAME.MANAGER_ON)
         if self._data_panel is not None  and (p == self._data_panel):
-            panel_width_min = self._window_width * 2/25 
+            panel_width_min = self._window_width * 5/25 
             return panel_width_min, panel_height_min
         if hasattr(p, "CENTER_PANE") and p.CENTER_PANE:
             style = self.__gui_style & (GUIFRAME.PLOTTING_ON|GUIFRAME.MANAGER_ON)
             if style == (GUIFRAME.PLOTTING_ON|GUIFRAME.MANAGER_ON):
-                panel_width_min = self._window_width * 17/25 
+                panel_width_min = self._window_width * 15/25 
             return panel_width_min, panel_height_min
         return panel_width_min, panel_height_min
@@ -386 +386 @@
                               Left().
                               MinimizeButton().
-                              MinSize(wx.Size(w, h)).
+                              TopDockable(False).
+                              BottomDockable(False).
+                              LeftDockable(True).
+                              RightDockable(False).
+                              BestSize(wx.Size(w, h)).
                               Hide())
         style = self.__gui_style & GUIFRAME.MANAGER_ON
@@ -1311 +1315 @@
                 self._data_panel.load_data_list(data_state)
                 
-    def delete_data(self, data_id, theory_id=None, delete_all=True):
+    def remove_data(self, data_id, theory_id=None, delete_all=True):
         """
         Delete data state if data_id is provide

guiframe/gui_toolbar.py

@@ -76 +76 @@
         disable_reset_bmp = wx.NullBitmap
         self.AddLabelTool(GUIFRAME_ID.RESET_ID, 'Reset', reset_bmp,
-                   disable_reset_bmp, button_type,'Reset In')
+                   disable_reset_bmp, button_type,'Reset')
         self.AddSeparator()
         drag_im = GUIFRAME_ICON.DRAG_ICON