Changeset 1e6d7290 in sasview

Timestamp:

Apr 12, 2012 4:04:39 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

25c0def

Parents:

92a52ff2

Message:

Fixing code style problems

File:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (11 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -1 @@
-
+"""
+    Gui manager: manages the widgets making up an application
+"""
 ################################################################################
 #This software was developed by the University of Tennessee as part of the
@@ -15 +17 @@
 import os
 import sys
-import xml
 import time
-import py_compile
 import imp
 import warnings
@@ -38 +38 @@
 from sans.guiframe.gui_toolbar import GUIToolBar
 from sans.guiframe.data_processor import GridFrame
-from sans.guiframe.data_processor import BatchOutputFrame
 from sans.guiframe.events import EVT_NEW_BATCH
 from sans.dataloader.loader import Loader
@@ -73 +72 @@
 
 def get_user_directory():
-    USERDIR = os.path.join(os.path.expanduser("~"),".sansview")
-    if not os.path.isdir(USERDIR):
-        os.makedirs(USERDIR)
-    return USERDIR
+    """
+        Returns the user's home directory
+    """
+    userdir = os.path.join(os.path.expanduser("~"),".sansview")
+    if not os.path.isdir(userdir):
+        os.makedirs(userdir)
+    return userdir
     
 def _find_local_config(file, path):
@@ -136 +138 @@
 SS_MAX_DISPLAY_TIME = config.SS_MAX_DISPLAY_TIME
 if not WELCOME_PANEL_ON:
-        WELCOME_PANEL_SHOW = False
+    WELCOME_PANEL_SHOW = False
 else:
     WELCOME_PANEL_SHOW = True
@@ -593 +595 @@
         if event != None:
             self.panel_on_focus = event.panel
-        panel_name = 'No panel on focus'
-        application_name = 'No Selected Analysis'
         if self.panel_on_focus is not None:
             #Disable save application if the current panel is in batch mode
@@ -617 +617 @@
         Helper for panel on focus with data_panel
         """
-        panel_name = self.panel_on_focus.window_caption
         ID = self.panel_on_focus.uid
         self._data_panel.set_panel_on_focus(ID)
@@ -731 +730 @@
     def PushStatusText(self, *args, **kwds):
         """
+            FIXME: No message is passed. What is this supposed to do? 
         """
         field = self.sb.get_msg_position()
-        wx.Frame.PushStatusText(self, field=field, string=string)
+        wx.Frame.PushStatusText(self, field=field, 
+                                string="FIXME: PushStatusText called without text")
 
     def add_perspective(self, plugin):
@@ -2193 +2194 @@
                     dialog.Show(True) 
                 except:
+                    print "Error in _onTutorial: %s" % sys.exc_value
                     try:
                         #in case when the pdf default set other than acrobat
@@ -2841 +2843 @@
         is_state_data = False
         if has_meta_data:
-            if 'invstate' in new_plot.meta_data: is_state_data = True
-            if  'prstate' in new_plot.meta_data: is_state_data = True
-            if  'fitstate' in new_plot.meta_data: is_state_data = True
+            if 'invstate' in new_plot.meta_data: 
+                is_state_data = True
+            if  'prstate' in new_plot.meta_data: 
+                is_state_data = True
+            if  'fitstate' in new_plot.meta_data: 
+                is_state_data = True
     
         return is_data1d and not is_data2d and not is_theory and not is_state_data
@@ -3311 +3316 @@
             logging.error(msg)
         # Display a splash screen on top of the frame.
-        if len(sys.argv) > 1 and '--time' in sys.argv[1:]:
-            log_time("Starting to display the splash screen")
         try:
             if os.path.isfile(SPLASH_SCREEN_PATH):