Changeset 233c121 in sasview for sansview

Timestamp:

May 21, 2014 9:19:00 AM (11 years ago)

Author:

pkienzle

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:

bf5e985

Parents:

85a3b46 (diff), 099c355 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

refactor OnFit? handler to allow fit to current page only

Location:

sansview

Files:

• README.txt (modified) (2 diffs)
• sansview.py (modified) (2 diffs)
• setup_exe.py (modified) (1 diff)

sansview/README.txt

@@ -165 +165 @@
                      www.sasview.org/trac/wiki.
     *** Note 2:  If you have EXE or ZIP SasView installer, you won't need any of
-                 the following.
+                 the following.  However it is highly recommended that any
+                 previous versions be un-installed prior to installing the
+                 new version.
 
     2.1- System Requirements:
@@ -218 +220 @@
           constrained fit will likely not be correct
         - Save project does not store the state of all the windows
+        - Loading projects can be very slow
+        - Save Project only works once a data set has been associated with
+          a model.  Error is reported on status bar.
 
     3.2- Windows:
-        - None
+        - If installed to same directory as old version without first removing
+          the old version, the old desktop icon will remain but point to the
+          new exe version. Likewise all the start menu folders and items will
+          have the old name even though pointing to the new version.  Usually
+          safest to uninstall old version prior to installing new version anyway.
                 
     3.3- MAC:

sansview/sansview.py

@@ -36 +36 @@
 PLUGIN_MODEL_DIR = 'plugin_models'
 APP_NAME = 'SasView'
-def run():
-    sys.path.append(os.path.join("..","..",".."))
-    from multiprocessing import freeze_support
-    freeze_support()
-    sasview = SasView()
-        
+
 class SasViewApp(gui_manager.ViewApp):
     """
@@ -113 +108 @@
         self.gui.clean_plugin_models(PLUGIN_MODEL_DIR)
         # Start the main loop
-        self.gui.MainLoop()  
-       
+        self.gui.MainLoop()
 
 
-if __name__ == "__main__": 
+def run():
     from multiprocessing import freeze_support
     freeze_support()
-    #Process(target=SasView).start()
-    sasview = SasView()
+    if len(sys.argv) > 1:
+        thing_to_run = sys.argv[1]
+        sys.argv = sys.argv[1:]
+        import runpy
+        if os.path.exists(thing_to_run):
+            runpy.run_path(thing_to_run)
+        else:
+            runpy.run_module(thing_to_run)
+    else:
+        SasView()
 
-   
+if __name__ == "__main__":
+    run()
+

sansview/setup_exe.py

@@ -319 +319 @@
 'reportlab.platypus',
 ])
+packages.append('IPython')
 includes = ['site']