Changeset ec6c520 in sasview

Timestamp:

Sep 27, 2011 7:33:14 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:

861f8317

Parents:

650fd318

Message:

Python console added to tool menu

Files:

• calculatorview/src/sans/perspectives/calculator/calculator.py (modified) (3 diffs)
• calculatorview/src/sans/perspectives/calculator/pyconsole.py (added)
• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (2 diffs)

calculatorview/src/sans/perspectives/calculator/calculator.py

@@ -49 +49 @@
         resolution_help += "resolution of Q in 2D based on the SANS "
         resolution_help += "instrumental parameter values."
+        pyconsole_help = "Python Console from a third party (PyCrust)."
         #data_editor_help = "Meta Data Editor"
         return [("SLD Calculator", sld_help, self.on_calculate_sld),
@@ -56 +57 @@
                         kiessig_help, self.on_calculate_kiessig),
                           ("SANS Resolution Estimator", 
-                        resolution_help, self.on_calculate_resoltuion)]#,
-                #("Data Editor", data_editor_help, self.on_edit_data)]
+                        resolution_help, self.on_calculate_resoltuion),
+                ("Python Console", pyconsole_help, self.on_python_console)]
               
     def on_edit_data(self, event):
@@ -113 +114 @@
         #if event != None:
         #    event.Skip()
-
+    def on_python_console(self, event):
+        """
+        Open Python Console
+        
+        :param event: menu event
+        """
+        from pyconsole import PyConsole
+        frame = PyConsole(parent=self.parent)
+        frame.Show(True) 
+    
     
   

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -1211 +1211 @@
         else:
             self._data_panel_menu.SetText('Show Data Explorer')
-            
-        self._view_menu.AppendSeparator()
-        id = wx.NewId()
-        hint = "Display batch results into a grid"
-        self._view_menu.Append(id, '&Show Batch Results', hint) 
-        wx.EVT_MENU(self, id, self.show_batch_frame)
   
         self._view_menu.AppendSeparator()
@@ -1226 +1220 @@
             self._toolbar_menu = self._view_menu.Append(id,'&Show Toolbar', '')
         wx.EVT_MENU(self, id, self._on_toggle_toolbar)
-        
+                    
+        self._view_menu.AppendSeparator()
+        id = wx.NewId()
+        hint = "Display batch results into a grid"
+        self._view_menu.Append(id, '&Show Batch Results', hint) 
+        wx.EVT_MENU(self, id, self.show_batch_frame)
+
         if custom_config != None:
             self._view_menu.AppendSeparator()