Changeset 52f3c98 in sasview

Timestamp:

Apr 19, 2011 10:56:22 AM (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:

48665ed

Parents:

fdc690f

Message:

rearranged graph(window) menu items

Location:

guiframe

Files:

• gui_manager.py (modified) (7 diffs)
• local_perspectives/plotting/Plotter2D.py (modified) (1 diff)
• local_perspectives/plotting/plotting.py (modified) (3 diffs)

guiframe/gui_manager.py

@@ -784 +784 @@
             for (menu, name) in self._plotting_plugin.populate_menu(self):
                 self._window_menu.AppendSubMenu(menu, name)
-        self._menubar.Append(self._window_menu, '&Window')
-            
+        self._menubar.Append(self._window_menu, '&Graph')
+
         style = self.__gui_style & GUIFRAME.PLOTTING_ON
         if style == GUIFRAME.PLOTTING_ON:
@@ -792 +792 @@
             preferences_menu = wx.Menu()
             hint = "All plot panels will floating"
-            preferences_menu.Append(id, '&Floating Graphs', hint)
+            preferences_menu.Append(id, '&Float', hint)
             wx.EVT_MENU(self, id, self.set_plotpanel_floating)
             id = wx.NewId()
             hint = "All plot panels will displayed within the frame"
-            preferences_menu.Append(id, '&Fixed Graphs', hint)
+            preferences_menu.Append(id, '&Dock', hint)
             wx.EVT_MENU(self, id, self.set_plotpanel_fixed)
-            id = wx.NewId()
-            style1 = self.__gui_style & GUIFRAME.MULTIPLE_APPLICATIONS
-            if style1 == GUIFRAME.MULTIPLE_APPLICATIONS:
-                id = wx.NewId()
-                self._toolbar_menu = preferences_menu.Append(id,'&Show Toolbar', '')
-                wx.EVT_MENU(self, id, self._on_hide_toolbar)
+
             self._window_menu.AppendSubMenu(preferences_menu,'&Preferences')
         if self._window_menu.GetMenuItemCount() == 0:
-            pos = self._menubar.FindMenu('Window')
+            pos = self._menubar.FindMenu('Graph')
             self._menubar.Remove(pos)
         #wx.EVT_MENU(self, id, self.show_preferences_panel)   
@@ -928 +923 @@
                                'Reset current panel')
         wx.EVT_MENU(self, GUIFRAME_ID.RESET_ID, self.on_reset_panel)
+       
+        self._edit_menu.AppendSeparator()
+        style1 = self.__gui_style & GUIFRAME.MULTIPLE_APPLICATIONS
+        if style1 == GUIFRAME.MULTIPLE_APPLICATIONS:
+            id = wx.NewId()
+            self._toolbar_menu = self._edit_menu.Append(id,'&Show Toolbar', '')
+            wx.EVT_MENU(self, id, self._on_hide_toolbar)
+        
         self._menubar.Append(self._edit_menu,  '&Edit')
         self.enable_edit_menu()
@@ -1046 +1049 @@
                 if show == 'on':
                     self._mgr.GetPane(self.panels[ID].window_name).Show()   
-                elif self.panels[ID].window_name.split(" ")[0] == "Residuals":
+                elif self.panels[ID].window_caption.split(" ")[0] == \
+                                                            "Residuals":
                     self._mgr.GetPane(self.panels[ID].window_name).Hide()
                 else:
@@ -1527 +1531 @@
         list_data, _ = self._data_manager.get_by_id(data_id)
         if self._current_perspective is not None:
+            for uid, panel in self.plot_panels.iteritems() :
+                #panel = self.plot_panels[uid]
+                window = self._mgr.GetPane(panel.window_name)
+                if not window.IsFloating():
+                    self.hide_panel(uid)
             self._current_perspective.set_data(list_data.values())
             self.on_close_welcome_panel()
@@ -1631 +1640 @@
             #Set the SansView title
             self._set_title_name(name)
-            
+          
             
     def _set_title_name(self, name):
@@ -1687 +1696 @@
         style = self.__gui_style & GUIFRAME.FIXED_PANEL
         if style == GUIFRAME.FIXED_PANEL:
+            self._mgr.GetPane(p.window_name).Dock()
             self._mgr.GetPane(p.window_name).Floatable()
             self._mgr.GetPane(p.window_name).Right()

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -287 +287 @@
             slicerpop.AppendSeparator() 
         id = wx.NewId()
-        slicerpop.Append(id, '&Detector Parameters')
+        slicerpop.Append(id, '&2D Color Map')
         wx.EVT_MENU(self, id, self._onEditDetector)
         id = wx.NewId()

guiframe/local_perspectives/plotting/plotting.py

@@ -20 +20 @@
 from sans.guiframe.dataFitting import Data2D
 
-DEFAULT_MENU_ITEM_LABEL = "No plot available"
+DEFAULT_MENU_ITEM_LABEL = "No graph available"
 DEFAULT_MENU_ITEM_ID = wx.NewId()
 
@@ -64 +64 @@
                              "No graph available")
         self.menu.FindItemByPosition(0).Enable(False)
-        return [(self.menu, "Graph")]
+        return [(self.menu, "Show")]
     
     def get_panels(self, parent):
@@ -216 +216 @@
         if self.menu.GetMenuItemCount() == 0:
             self.menu.Append(DEFAULT_MENU_ITEM_ID, DEFAULT_MENU_ITEM_LABEL, 
-                             "No plot available")
+                             "No graph available")
             self.menu.FindItemByPosition(0).Enable(False)