Changeset f932c02 in sasview

Timestamp:

Apr 14, 2011 9:50:37 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:

0cf97c5

Parents:

56fb77f

Message:

added save button in toolbar, and repositioned menu items

Files:

• guiframe/gui_manager.py (modified) (6 diffs)
• guiframe/gui_toolbar.py (modified) (4 diffs)
• invariantview/perspectives/invariant/invariant_panel.py (modified) (1 diff)
• sansview/perspectives/fitting/fitpage.py (modified) (1 diff)
• sansview/perspectives/fitting/fitting.py (modified) (1 diff)

guiframe/gui_manager.py

@@ -642 +642 @@
         self._menubar = wx.MenuBar()
         self._add_menu_file()
+        self._add_menu_edit()
         self._add_menu_data()
         self._add_menu_application()
-        self._add_menu_edit()
+        
         self._add_menu_tool()
         self._add_current_plugin_menu()
@@ -695 +696 @@
                         wx.EVT_MENU(self, id, tool[2])
             if self._tool_menu is not None:
-                self._menubar.Append(self._tool_menu, '&Tools')
+                self._menubar.Append(self._tool_menu, '&Tool')
                 
     def _add_current_plugin_menu(self):
@@ -784 +785 @@
                 self._window_menu.AppendSubMenu(menu, name)
         self._menubar.Append(self._window_menu, '&Window')
-     
-        style = self.__gui_style & GUIFRAME.MANAGER_ON
-        id = wx.NewId()
-        self._data_panel_menu = self._window_menu.Append(id,
-                                                '&Data Explorer ON', '')
-        wx.EVT_MENU(self, id, self.show_data_panel)
-        if style == GUIFRAME.MANAGER_ON:
-            self._data_panel_menu.SetText('Data Explorer OFF')
-        else:
-            self._data_panel_menu.SetText('Data Explorer ON')
             
         style = self.__gui_style & GUIFRAME.PLOTTING_ON
@@ -800 +791 @@
             id = wx.NewId()
             preferences_menu = wx.Menu()
-            hint = "Plot panels will floating"
-            preferences_menu.Append(id, '&Floating Plot Panel', hint)
+            hint = "All plot panels will floating"
+            preferences_menu.Append(id, '&Floating Graphs', hint)
             wx.EVT_MENU(self, id, self.set_plotpanel_floating)
             id = wx.NewId()
-            hint = "Plot panels will displayed within the frame"
-            preferences_menu.Append(id, '&Fixed Plot Panel', hint)
+            hint = "All plot panels will displayed within the frame"
+            preferences_menu.Append(id, '&Fixed Graphs', hint)
             wx.EVT_MENU(self, id, self.set_plotpanel_fixed)
             id = wx.NewId()
@@ -868 +859 @@
             if (not plug_data_count or not plug_no_data_count):
                 self._applications_menu.RemoveItem(separator)
-            self._menubar.Append(self._applications_menu, '&Applications')
+            self._menubar.Append(self._applications_menu, '&Application')
             self._check_applications_menu()
             
@@ -955 +946 @@
                     self._menubar.Append(menu, name)
             
+        style = self.__gui_style & GUIFRAME.MANAGER_ON
+        if self._data_plugin != None:
+            _data_menu = self._data_plugin._data_menu
+            _data_menu.AppendSeparator()
+            id = wx.NewId()
+            self._data_panel_menu = _data_menu.Append(id,
+                                                    '&Data Explorer ON', '')
+            wx.EVT_MENU(self, id, self.show_data_panel)
+            if style == GUIFRAME.MANAGER_ON:
+                self._data_panel_menu.SetText('Data Explorer OFF')
+            else:
+                self._data_panel_menu.SetText('Data Explorer ON')
+                        
     def _on_hide_toolbar(self, event=None):
         """

guiframe/gui_toolbar.py

@@ -59 +59 @@
         drag_bmp = drag_im.ConvertToBitmap()
         self.AddSeparator()
+        save_im = GUIFRAME_ICON.SAVE_ICON
+        save_im.Rescale(tbar_size[0], tbar_size[1], wx.IMAGE_QUALITY_HIGH)
+        save_bmp = save_im.ConvertToBitmap()
+        disable_save_bmp = wx.NullBitmap
+        self.AddLabelTool(GUIFRAME_ID.SAVE_ID, 'Save', save_bmp,
+                   disable_save_bmp, button_type,'Save')
+        self.AddSeparator()
         report_im = GUIFRAME_ICON.REPORT_ICON
         report_im.Rescale(tbar_size[0], tbar_size[1], wx.IMAGE_QUALITY_HIGH)
@@ -141 +148 @@
             self.parent.Bind(wx.EVT_TOOL, self.parent.on_reset_panel,
                              id=GUIFRAME_ID.RESET_ID)
+            self.parent.Bind(wx.EVT_TOOL, self.parent.on_save_panel,
+                             id=GUIFRAME_ID.SAVE_ID)
             self.parent.Bind(wx.EVT_TOOL, self.parent.on_preview_panel,
                              id=GUIFRAME_ID.PREVIEW_ID)
@@ -161 +170 @@
             self.EnableTool(GUIFRAME_ID.PREVIEW_ID, False)
             self.EnableTool(GUIFRAME_ID.RESET_ID, False)
+            self.EnableTool(GUIFRAME_ID.SAVE_ID, False)
             self._bookmark_bt.Disable()
             
@@ -169 +179 @@
             self.EnableTool(GUIFRAME_ID.PREVIEW_ID, panel.get_preview_flag())
             self.EnableTool(GUIFRAME_ID.RESET_ID, panel.get_reset_flag())
+            self.EnableTool(GUIFRAME_ID.SAVE_ID, panel.get_save_flag())
             self._bookmark_bt.Enable(panel.get_bookmark_flag())
         self.Realize()

invariantview/perspectives/invariant/invariant_panel.py

@@ -133 +133 @@
             #Reset the list of states
             self.state.data = copy.deepcopy(data)
+            self._set_save_flag(True)
             self._set_preview_flag(False)
             self._reset_state_list()

sansview/perspectives/fitting/fitpage.py

@@ -1019 +1019 @@
         if self.model != None:
             self._set_bookmark_flag(True)
-            self._set_save_flag(True)
+            #self._set_save_flag(True)
             # Reset smearer, model and data
             self._set_smear(self.data)

sansview/perspectives/fitting/fitting.py

@@ -137 +137 @@
         
         id1 = wx.NewId()
-        simul_help = "Add new fit page"
-        self.menu1.Append(id1, '&Create New Page',simul_help)
+        simul_help = "Add new fit panel"
+        self.menu1.Append(id1, '&New Fit Page',simul_help)
         wx.EVT_MENU(owner, id1, self.on_add_new_page)