Changeset b1bda35 in sasview for calculatorview/src/sans/perspectives

Timestamp:

Sep 28, 2011 9:43:09 AM (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:

77a43fb

Parents:

535d9f6

Message:

little fix in comments

Location:

calculatorview/src/sans/perspectives/calculator

Files:

• calculator.py (modified) (2 diffs)
• pyconsole.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)."
+        pyconsole_help = "Python Console."
         #data_editor_help = "Meta Data Editor"
         return [("SLD Calculator", sld_help, self.on_calculate_sld),
@@ -58 +58 @@
                           ("SANS Resolution Estimator", 
                         resolution_help, self.on_calculate_resoltuion),
-                ("Python Console", pyconsole_help, self.on_python_console)]
+                ("Python Shell", pyconsole_help, self.on_python_console)]
               
     def on_edit_data(self, event):

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

@@ -17 +17 @@
 class PyConsole(wx.py.crust.CrustFrame):
     ## Internal nickname for the window, used by the AUI manager
-    window_name = "Python Console"
+    window_name = "Python Shell"
     ## Name to appear on the window title bar
-    window_caption = "Python Console"
+    window_caption = "Python Shell"
     ## 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 Console by PyCrust', 
+                    title='Python Shell', 
                     size=(PANEL_WIDTH, PANEL_HEIGHT)):
         if parent != None:
             dataDir = parent._default_save_location
+        else:
+             dataDir = None
         wx.py.crust.CrustFrame.__init__(self, parent=parent, 
                                         title=title, size=size,
@@ -52 +54 @@
         """
         message = ABOUT
-        dial = wx.MessageDialog(self, message, 'About Python',
+        dial = wx.MessageDialog(self, message, 'About',
                            wx.OK|wx.ICON_INFORMATION)  
         dial.ShowModal()
         
-ABOUT =  "Welcome to Python 2.5! \n\n"
-ABOUT += "This window uses PyCrust in wx (developed by Patrick K. O'Brien).\n"
+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 += "If this is your first time using Python, \n"
 ABOUT += "you should definitely check out the tutorial "