Changeset 5376e03 in sasview

Timestamp:

Dec 15, 2011 1:10:34 PM (12 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:

2637a31

Parents:

bfcae3c

Message:

Re #3 modify local_config to find resources regardless of where sansview runs

Files:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (1 diff)
• sansview/local_config.py (modified) (1 diff)
• sansview/sansview.py (modified) (1 diff)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -2046 +2046 @@
         Pop up message to make sure the user wants to quit the application
         """
-        message = "\nDo you really want to exit this application?        \n\n"
-        dial = wx.MessageDialog(self, message, 'Confirm Exit',
-                           wx.YES_NO|wx.YES_DEFAULT|wx.ICON_QUESTION)
-        if dial.ShowModal() == wx.ID_YES:
-            return True
-        else:
-            return False    
+        return True
+        #message = "\nDo you really want to exit this application?        \n\n"
+        #dial = wx.MessageDialog(self, message, 'Confirm Exit',
+        #                   wx.YES_NO|wx.YES_DEFAULT|wx.ICON_QUESTION)
+        #if dial.ShowModal() == wx.ID_YES:
+        #    return True
+        #else:
+        #    return False    
         
     def Close(self, event=None):

sansview/local_config.py

@@ -39 +39 @@
 
 
-icon_path = "images"
-media_path = "media"
-test_path =  "test"
+icon_path = os.path.join(os.path.dirname(__file__), "images")
+media_path = os.path.join(os.path.dirname(__file__), "media")
+test_path =  os.path.join(os.path.dirname(__file__), "test")
 
 _nsf_logo = os.path.join(icon_path, "nsf_logo.png")

sansview/sansview.py

@@ -27 +27 @@
 import local_config
 import logging
-
-def run_old():
-    """
-        Run function for linux/OSX installations
-    """
-    module_path,_ = os.path.split(__file__)
-    os.system("cd %s;python sansview.py" % module_path)
 
 def run():