Changeset d03a356 in sasview

Timestamp:

Sep 23, 2011 11:44:43 AM (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:

a582d28

Parents:

5e48acb

Message:

working on data processor

Location:

sansguiframe/src/sans/guiframe

Files:

• data_panel.py (modified) (1 diff)
• data_processor.py (modified) (3 diffs)
• gui_manager.py (modified) (11 diffs)
• panel_base.py (modified) (1 diff)

sansguiframe/src/sans/guiframe/data_panel.py

@@ -330 +330 @@
                    id=self.rb_batch_mode.GetId())
         
-        self.rb_single_mode.SetValue(True)
-        self.rb_batch_mode.SetValue(False)
+        self.rb_single_mode.SetValue(not self.parent.batch_on)
+        self.rb_batch_mode.SetValue(self.parent.batch_on)
         self.sizer4.AddMany([(self.rb_single_mode,0, wx.ALL,5),
                             (self.rb_batch_mode,0, wx.ALL,5),

sansguiframe/src/sans/guiframe/data_processor.py

@@ -75 +75 @@
         self.data_inputs = {}
         self.data_outputs = {}
-        self.data = {}
+        self.data = None
         self._cols = 50
         self._rows = 51
@@ -310 +310 @@
         self.manager = manager
         self.data = data
+        #add empty page
+        self.add_empty_page()
+        
         self.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CLOSE, self.on_close_page)
     
+    def add_empty_page(self):
+        """
+        """
+        grid = GridPage(self, panel=self.parent)
+        self.AddPage(grid, "", True)
+        pos = self.GetPageIndex(grid)
+        title = "Batch " + str(self.GetPageCount())
+        self.SetPageText(pos, title)
+        self.SetSelection(pos)
+        return grid
+        
     def enable_close_button(self):
         """
@@ -434 +448 @@
         if data_outputs is None or data_outputs == {}:
             return
-        grid = GridPage(self, panel=self.parent)
+        grid = self.add_empty_page()
+        #grid = GridPage(self, panel=self.parent)
         grid.set_data(data_inputs, data_outputs)  
-        self.AddPage(grid, "")
-        pos = self.GetPageIndex(grid)
-        title = "Batch " + str(self.GetPageCount())
-        self.SetPageText(pos, title)
+        #self.AddPage(grid, "", True)
+        #pos = self.GetPageIndex(grid)
+        #title = "Batch " + str(self.GetPageCount())
+        #self.SetPageText(pos, title)
+        #self.SetSelection(pos)
         
     def add_column(self):

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -262 +262 @@
         self.loader = Loader()   
         #data manager
+        self.batch_on = True
         from data_manager import DataManager
         self._data_manager = DataManager()
@@ -276 +277 @@
         self.batch_frame = GridFrame(parent=self)
         self.batch_frame.Hide()
+        self.on_batch_selection(event=None)
         # Check for update
         #self._check_update(None)
@@ -305 +307 @@
         file_name = self._default_save_location + str(file_name)
         #Need to save configuration for later 
+        """
         frame = BatchOutputFrame(parent=self, data_outputs=data_outputs, 
                                  data_inputs=data_inputs,
                                 file_name=file_name,
                                 details=details)
-        frame.Show(True)
-    
-    def open_with_localapp(self, data_inputs, data_outputs):
+        """
+        self.open_with_localapp(data_inputs=data_inputs,
+                                    data_outputs=data_outputs)
+        #frame.Show(True)
+    
+    def open_with_localapp(self, data_inputs=None, data_outputs=None):
         """
         Display value of data into the application grid
@@ -374 +380 @@
                                 for row in range(index + 1, len(lines)-1)]
                 c_index += 1
-        self.open_with_localapp(data=data)
+        self.open_with_localapp(data_outputs=data)
         
     def write_batch_tofile(self, data, file_name, details=""):
@@ -432 +438 @@
             
          
-    def on_batch_selection(self, event):
+    def on_batch_selection(self, event=None):
         """
         :param event: contains parameter enable . when enable is set to True
@@ -438 +444 @@
         else the application is default mode(single mode)
         """
-        self.batch_on = event.enable
+        if event is not None:
+            self.batch_on = event.enable
         for plug in self.plugins:
             plug.set_batch_selection(self.batch_on)
@@ -671 +678 @@
         is_loaded = False
         for item in self.plugins:
+            item.set_batch_selection(self.batch_on)
             if plugin.__class__ == item.__class__:
                 msg = "Plugin %s already loaded" % plugin.sub_menu
@@ -676 +684 @@
                 is_loaded = True  
         if not is_loaded:
-            
-            self.plugins.append(plugin)
-             
+            self.plugins.append(plugin)  
       
     def _get_local_plugins(self):
@@ -1192 +1198 @@
         else:
             self._data_panel_menu.SetText('Show Data Explorer')
+            
+        self._view_menu.AppendSeparator()
+        id = wx.NewId()
+        hint = "Display batch results into a grid"
+        self._view_menu.Append(id, '&Show Batch Results', hint) 
+        wx.EVT_MENU(self, id, self.show_batch_frame)
+  
         self._view_menu.AppendSeparator()
         id = wx.NewId()
@@ -1209 +1222 @@
         self._menubar.Append(self._view_menu, '&View')   
          
+    def show_batch_frame(self, event=None):
+        """
+        show the grid of result
+        """
+        self.batch_frame.Show(True)
+        
     def _on_preference_menu(self, event):     
         """
@@ -1397 +1416 @@
             wx.EVT_MENU(self, id, self._on_save_application)
             self._file_menu.AppendSeparator()
-        self._file_menu.AppendSeparator()
-        id = wx.NewId()
-        hint = "Display content of the file into a grid"
-        self._file_menu.Append(id, '&Open Batch Result', hint) 
-        wx.EVT_MENU(self, id, self.on_read_batch_tofile)
-        self._file_menu.AppendSeparator()
+       
         id = wx.NewId()
         self._file_menu.Append(id, '&Quit', 'Exit') 

sansguiframe/src/sans/guiframe/panel_base.py

@@ -53 +53 @@
         self._has_changed = False
         self.batch_on = False
+        if self.parent is not None and hasattr(self.parent, "batch_on"):
+            self.batch_on = self.parent.batch_on
+       
         self.group_id = None
         self.Bind(EVT_NEW_BATCH, self.on_batch_selection)