Changeset fb58234 in sasview

Timestamp:

Nov 28, 2011 1:35:21 PM (12 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:

056b569

Parents:

61f557b

Message:

remove sansview from namespace and added editor

Location:

calculatorview/src/sans/perspectives/calculator

Files:

• calculator.py (modified) (2 diffs)
• pyconsole.py (modified) (3 diffs)

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

@@ -66 +66 @@
                           ("SANS Resolution Estimator", 
                         resolution_help, self.on_calculate_resoltuion),
-                ("Python Shell", pyconsole_help, self.on_python_console)]
+                ("Python Shell/Editor", pyconsole_help, self.on_python_console)]
               
     def on_edit_data(self, event):
@@ -133 +133 @@
         :param event: menu event
         """
+        self.get_python_panel(filename=None)
+        
+    def get_python_panel(self, filename=None):
+        """
+        Get the python shell panel
+        
+        :param filename: file name to open in editor
+        """
         from pyconsole import PyConsole
-        frame = PyConsole(parent=self.parent)
+        frame = PyConsole(parent=self.parent, filename=filename)
         self.put_icon(frame)
         frame.Show(True) 
-    
+        
     def put_icon(self, frame):
         """

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

@@ -2 +2 @@
 Console Module display Python console
 """
+import sys
 import wx
-import wx.py.crust
-import sys
-
+#import wx.py.crust as crust
+import wx.py.editor as editor
 if sys.platform.count("win32")>0:
     PANEL_WIDTH = 800
@@ -15 +15 @@
     FONT_VARIANT = 1
     
-class PyConsole(wx.py.crust.CrustFrame):
+class PyConsole(editor.EditorNotebookFrame):
     ## Internal nickname for the window, used by the AUI manager
-    window_name = "Python Shell"
+    window_name = "Python Shell/Editor"
     ## Name to appear on the window title bar
-    window_caption = "Python Shell"
+    window_caption = "Python Shell/Editor"
     ## Flag to tell the AUI manager to put this panel in the center pane
     CENTER_PANE = False
     def __init__(self, parent=None, manager=None,
-                    title='Python Shell', 
+                    title='Python Shell/Editor', filename=None,
                     size=(PANEL_WIDTH, PANEL_HEIGHT)):
-        if parent != None:
-            dataDir = parent._default_save_location
-        else:
-             dataDir = None
-        wx.py.crust.CrustFrame.__init__(self, parent=parent, 
+        #if parent != None:
+        #    dataDir = parent._default_save_location
+        #else:
+        #     dataDir = None
+        #wx.py.crust.CrustFrame.__init__(self, parent=parent, 
+        #                                title=title, size=size,
+        #                                dataDir=dataDir)
+        self.config = None
+        editor.EditorNotebookFrame.__init__(self, parent=parent, 
                                         title=title, size=size,
-                                        dataDir=dataDir)
+                                        filename=filename)
         self._import_site()
         self.parent = parent
@@ -57 +61 @@
                            wx.OK|wx.ICON_INFORMATION)  
         dial.ShowModal()
-        
+             
 ABOUT =  "Welcome to Python %s! \n\n"% sys.version.split()[0]
-ABOUT += "This uses PyCrust Shell in wx (developed by Patrick K. O'Brien).\n"
+ABOUT += "This uses Py Shell in wx (developed by Patrick K. O'Brien).\n"
 ABOUT += "If this is your first time using Python, \n"
 ABOUT += "you should definitely check out the tutorial "