Changeset 7a07864 in sasview

Timestamp:

Aug 16, 2010 1:35:12 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

077f096

Parents:

b63dc6e

Message:

a bit generalized the plotdata

Files:

• guiframe/data_loader.py (modified) (1 diff)
• guiframe/gui_manager.py (modified) (3 diffs)
• invariantview/perspectives/invariant/invariant.py (modified) (2 diffs)
• sansview/perspectives/fitting/fitting.py (modified) (4 diffs)

guiframe/data_loader.py

@@ -8 +8 @@
 from DataLoader.loader import Loader
 from load_thread import DataReader
-from sans.perspectives.invariant import InvStateUpdateEvent
-from perspectives.fitting import FitStateUpdateEvent
+from sans.guicomm.events import FitStateUpdateEvent
+from sans.guicomm.events import InvStateUpdateEvent
 
 from sans.guicomm.events import NewPlotEvent, StatusEvent

guiframe/gui_manager.py

@@ -50 +50 @@
 from sans.guicomm.events import EVT_NEW_PLOT,EVT_SLICER_PARS_UPDATE
 from sans.guicomm.events import EVT_ADD_MANY_DATA
-
-
 from data_manager import DataManager
+STATE_FILE_EXT = ['.inv','.fitv','.prv']
 
 def quit_guiframe(parent=None):
@@ -720 +719 @@
              if  basename.endswith('.svs'):
                 #remove panels for new states
-                 for item in self.panels:
-                     try:
-                         self.panels[item].clear_panel()
-                     except: pass
-                 plot_data(self, path,'.inv')
-                 plot_data(self, path,'.prv')
-                 plot_data(self, path,'.fitv')
+                for item in self.panels:
+                    try:
+                        self.panels[item].clear_panel()
+                    except: pass
+                #reset states and plot data 
+                for item in STATE_FILE_EXT:
+                    exec "plot_data(self, path,'%s')"% str(item)
              else: plot_data(self,path)
+             
         if self.defaultPanel is not None and \
             self._mgr.GetPane(self.panels["default"].window_name).IsShown():
@@ -755 +755 @@
         for item in self.panels:
             try:
-                if self.panels[item].window_name == 'Invariant' or self.panels[item].window_name == 'pr_control' or self.panels[item].window_name == 'Fit panel':
-                    if self.panels[item].window_name == 'Invariant':
-                        data = self.panels[item]._data
-                        if data != None:
-                            state = self.panels[item].state
-                            new_doc =self.panels[item]._manager.state_reader.write_toXML(data,state)
-                            if hasattr(doc, "firstChild"):
-                                doc.firstChild.appendChild (new_doc.firstChild.firstChild)  
+                if self.panels[item].window_name == 'Invariant':
+                    data = self.panels[item]._data
+                    if data != None:
+                        state = self.panels[item].state
+                        new_doc =self.panels[item]._manager.state_reader.write_toXML(data,state)
+                        if hasattr(doc, "firstChild"):
+                            doc.firstChild.appendChild (new_doc.firstChild.firstChild)  
+                        else:
+                            doc = new_doc 
+                elif self.panels[item].window_name == 'pr_control':
+                    data = self.panels[item].manager.current_plottable
+                    if data != None:
+                        state = self.panels[item].get_state()
+                        new_doc =self.panels[item].manager.state_reader.write_toXML(data,state)
+                        if hasattr(doc, "firstChild"):
+                            doc.firstChild.appendChild (new_doc.firstChild.firstChild)  
+                        else:
+                            doc = new_doc 
+                elif self.panels[item].window_name == 'Fit panel':
+                    for index in range(self.panels[item].GetPageCount()):
+                        selected_page = self.panels[item].GetPage(index) 
+                        if hasattr(selected_page,"get_data"):
+                            data = selected_page.get_data()
+                            state = selected_page.state
+                            new_doc =selected_page.manager.state_reader.write_toXML(data,state)
+                            if doc != None and hasattr(doc, "firstChild"):
+                                doc.firstChild.appendChild (new_doc.firstChild.firstChild)
                             else:
-                                doc = new_doc 
-                    elif self.panels[item].window_name == 'pr_control':
-                        data = self.panels[item].manager.current_plottable
-                        if data != None:
-                            state = self.panels[item].get_state()
-                            new_doc =self.panels[item].manager.state_reader.write_toXML(data,state)
-                            if hasattr(doc, "firstChild"):
-                                doc.firstChild.appendChild (new_doc.firstChild.firstChild)  
-                            else:
-                                doc = new_doc 
-                    elif self.panels[item].window_name == 'Fit panel':
-                        for index in range(self.panels[item].GetPageCount()):
-                            selected_page = self.panels[item].GetPage(index) 
-                            if hasattr(selected_page,"get_data"):
-                                data = selected_page.get_data()
-                                state = selected_page.state
-                                new_doc =selected_page.manager.state_reader.write_toXML(data,state)
-                                if doc != None and hasattr(doc, "firstChild"):
-                                    doc.firstChild.appendChild (new_doc.firstChild.firstChild)
-                                else:
-                                    doc = new_doc
+                                doc = new_doc
 
             except: 

invariantview/perspectives/invariant/invariant.py

@@ -26 +26 @@
 from DataLoader.loader import Loader
 from invariant_panel import InvariantPanel
-(InvStateUpdateEvent, EVT_STATE_UPDATE)   = wx.lib.newevent.NewEvent()
+from sans.guicomm.events import EVT_INVSTATE_UPDATE
 
 class Plugin:
@@ -98 +98 @@
         #add error back to the data
         self.parent.Bind(ERR_DATA, self._on_data_error)
-        self.parent.Bind(EVT_STATE_UPDATE, self.on_set_state_helper)
+        self.parent.Bind(EVT_INVSTATE_UPDATE, self.on_set_state_helper)
         
         self.invariant_panel = InvariantPanel(parent=self.parent)

sansview/perspectives/fitting/fitting.py

@@ -35 +35 @@
 from sans.guicomm.events import EVT_SLICER_PANEL,ERR_DATA,EVT_REMOVE_DATA
 from sans.guicomm.events import EVT_SLICER_PARS_UPDATE
+from sans.guicomm.events import EVT_FITSTATE_UPDATE
 
 from sans.fit.AbstractFitEngine import Model
@@ -51 +52 @@
 
 (PageInfoEvent, EVT_PAGE_INFO)   = wx.lib.newevent.NewEvent()
-(FitStateUpdateEvent, EVT_STATE_UPDATE)   = wx.lib.newevent.NewEvent()
+#(FitStateUpdateEvent, EVT_STATE_UPDATE)   = wx.lib.newevent.NewEvent()
 from fitpage import Chi2UpdateEvent
 
@@ -238 +239 @@
         """
         self.parent = parent
-        self.parent.Bind(EVT_STATE_UPDATE, self.on_set_state_helper)
+        self.parent.Bind(EVT_FITSTATE_UPDATE, self.on_set_state_helper)
         # Creation of the fit panel
         self.fit_panel = FitPanel(self.parent, -1)
@@ -320 +321 @@
         : event: FitStateUpdateEvent called by dataloader.plot_data from guiframe
         """
-        if len(self.temp_state) == 0 and self.sfile_ext =='.svs':
-            if self.state_index==0 and len(self.mypanels) <= 0:
+        if len(self.temp_state) == 0:
+            if self.state_index==0 and len(self.mypanels) <= 0 and self.sfile_ext =='.svs':
                 self.fit_panel.add_default_pages()
                 self.temp_state = []