Changeset c572e5e in sasview

Timestamp:

Sep 23, 2011 4:08:37 PM (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:

4c2c93f

Parents:

e89c135

Message:

minor fix: remove plot id in panels dic of guiframe when the panel removed

Files:

• fittingview/src/sans/perspectives/fitting/basepage.py (modified) (1 diff)
• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (2 diffs)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/plotting.py (modified) (1 diff)

fittingview/src/sans/perspectives/fitting/basepage.py

@@ -2740 +2740 @@
         gui_manager = self.parent.parent
         # loops through the panels [dic]
-        for item1, item2 in gui_manager.panels.iteritems():
+        for item1, item2 in gui_manager.plot_panels.iteritems():
              data_title = self.data.group_id
              data_name = str(self.data.name).split(" [")[0]

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -973 +973 @@
         captions = self._get_plotpanel_captions()
         while (1):
-            self.graph_num += 1
             caption = windowcaption + '%s'% str(self.graph_num)
             if caption not in captions:
                 break
+            self.graph_num += 1
 
         p.window_caption = caption
@@ -1670 +1670 @@
             wx.CallAfter(self._mgr.Update)
             #delete uid number not str(uid)
-            if uid in self.plot_panels.keys():
-                del self.plot_panels[uid]
+            if ID in self.plot_panels.keys():
+                del self.plot_panels[ID]
+            if ID in self.panels.keys():
+                del self.panels[ID]
             return 
       

sansguiframe/src/sans/guiframe/local_perspectives/plotting/plotting.py

@@ -258 +258 @@
             self.delete_menu_item(panel.window_caption, panel.uid)
             del self.plot_panels[group_id]
-            #self.parent.delete_panel(uid)
             return True