Changeset 4bee68d in sasview

Timestamp:

Apr 26, 2011 11:46:00 AM (13 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:

34b9813

Parents:

5901bb9

Message:

partly fixed saving opening project/analysis file

Files:

• guiframe/gui_manager.py (modified) (4 diffs)
• guiframe/local_perspectives/plotting/plotting.py (modified) (1 diff)
• sansview/perspectives/fitting/fitpanel.py (modified) (2 diffs)
• sansview/perspectives/fitting/fitting.py (modified) (2 diffs)
• sansview/perspectives/fitting/pagestate.py (modified) (1 diff)

guiframe/gui_manager.py

@@ -1044 +1044 @@
         if self.defaultPanel is None:
             return 
-        for id in self.panels.keys():
+        for id, panel in self.panels.iteritems():
             if id  ==  'default':
                 # Show default panel
@@ -1052 +1052 @@
                 flag = self._mgr.GetPane(self.panels["data_panel"].window_name).IsShown()
                 self._mgr.GetPane(self.panels["data_panel"].window_name).Show(flag)
-            else:
+            elif panel not in self.plot_panels.values() :
                 self._mgr.GetPane(self.panels[id].window_name).IsShown()
                 self._mgr.GetPane(self.panels[id].window_name).Hide()
-            if self._toolbar != None and not self._toolbar.IsShown():
-                self._toolbar.Show(True)
-            self._on_toggle_toolbar()
+            #if self._toolbar != None and not self._toolbar.IsShown():
+            #    self._toolbar.Show(True)
+            #self._on_toggle_toolbar()
 
         self._mgr.Update()
@@ -1117 +1117 @@
             panel.Close()
             self._mgr.Update()
-            print "here here "
             return 
             if ID in self.panels.keys():
@@ -1208 +1207 @@
                 #remove panels for new states
                 for plug in self.plugins:
-                    reader, ext = plug.get_extensions()
-                    if ext is not None and ext.strip() != ''\
-                        and ext.lower() not in EXTENSIONS:
-                        plug.clear_panel()  
+                    #reader, ext = plug.get_extensions()
+                    #if ext is not None and ext.strip() != ''\
+                    #    and ext.lower() not in EXTENSIONS:
+                    #    print "herer clearpanel_geuiframe"
+                    plug.clear_panel() 
+                if self.defaultPanel != None:
+                    default_panel = self.panels['default']
+                    self.panels = {'default': default_panel}
+                else:
+                    #self.clear_panel()
+                    self.panels = {}
+                    
+                self.plot_panels = {}
             self.panel_on_focus = None    
             self.cpanel_on_focus = None 

guiframe/local_perspectives/plotting/plotting.py

@@ -94 +94 @@
     def clear_panel(self):
         """
-        """
-        pass
+        Clear and Hide all plot panels
+        """
+        for group_id in self.plot_panels.keys():
+            panel = self.plot_panels[group_id]
+            panel.graph.reset()
+            self.hide_panel(group_id)
+        self.plot_panels = {}     
     
     def clear_panel_by_id(self, group_id):

sansview/perspectives/fitting/fitpanel.py

@@ -198 +198 @@
             for uid, panel in self.opened_pages.iteritems():
                 #Don't return any panel is the exact same page is created
-                if uid == panel.uid:
+                if uid == panel.uid and panel.data == state.data:
                     # the page is still opened
                     panel.reset_page(state=state)
@@ -207 +207 @@
                 # add data associated to the page created
                 if panel is not None:  
-                    self._manager.store_page(page=panel.uid, data=state.data)
+                    self._manager.store_data(uid=panel.uid, 
+                                             data=state.data,
+                                             caption=panel.window_caption)
                     panel.reset_page(state=state)
                     panel.save_current_state()

sansview/perspectives/fitting/fitting.py

@@ -316 +316 @@
         #state = self.state_reader.get_state()
         if state != None:
+            state = state.clone()
             # store fitting state in temp_state
             self.temp_state.append(state) 
@@ -347 +348 @@
                 #set state
                 data = self.parent.create_gui_data(state.data)
-                
                 data.group_id = state.data.group_id
                 self.parent.add_data(data_list={data.id:data})

sansview/perspectives/fitting/pagestate.py

@@ -1454 +1454 @@
               
         except:
-            #self.call_back(format=ext)
-            self.state= state
+            self.call_back(format=ext)
+            #self.state= state
             raise