Changeset e6a93df in sasview

Timestamp:

Mar 14, 2011 4:52:56 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:

dce84c0

Parents:

ee2b492

Message:

working on freeze

Location:

guiframe

Files:

• data_manager.py (modified) (2 diffs)
• gui_manager.py (modified) (2 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (2 diffs)

guiframe/data_manager.py

@@ -182 +182 @@
     
    
-            
+           
+    def freeze(self, theory_id):
+        """
+        """
+        return self.freeze_theory(self.stored_data.keys(), theory_id)
+        
     def freeze_theory(self, data_id, theory_id):
         """
@@ -196 +201 @@
                         new_theory = copy.deepcopy(theory_data)
                         new_theory.id  = wx.NewId()
+                        new_theory.is_data = True
                         selected_theory[new_theory.id] = DataState(new_theory)
                         self.stored_data[new_theory.id] = selected_theory[new_theory.id]

guiframe/gui_manager.py

@@ -448 +448 @@
         self._data_panel.load_data_list(data_state)
         
+    def onfreeze(self, theory_id):
+        """
+        """
+        data_state_list = self._data_manager.freeze(theory_id)
+        self._data_panel.load_data_list(list=data_state_list)
+        for data_state in data_state_list.values():
+            new_plot = data_state.get_data()
+            wx.PostEvent(self, NewPlotEvent(plot=new_plot,
+                                             title=new_plot.title))
+        
     def freeze(self, data_id, theory_id):
         """
@@ -453 +463 @@
         data_state_list = self._data_manager.freeze_theory(data_id=data_id, 
                                                 theory_id=theory_id)
-        
         self._data_panel.load_data_list(list=data_state_list)
         for data_state in data_state_list.values():

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -272 +272 @@
         if self.graph.selected_plottable in self.plots:
             plot = self.plots[self.graph.selected_plottable]
+            if not plot.is_data:
+                id = wx.NewId()
+                self._slicerpop.Append(id, '&Freeze', 'Freeze')
+                wx.EVT_MENU(self, id, self.onFreeze)
             id = wx.NewId()
             name = plot.name
@@ -307 +311 @@
         self.PopupMenu(self._slicerpop, pos)
      
+    def onFreeze(self, event):
+        """
+        """
+        plot = self.plots[self.graph.selected_plottable]
+        self.parent.onfreeze([plot.id])
+        
     def onChangeSymbol(self, event):
         """