Changeset 949aa2c in sasview for sansview

Timestamp:

Jun 3, 2014 4:13:26 PM (10 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:

f8940db

Parents:

35086c3 (diff), eb9fc6d (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:

merge from trunk to bumps

Location:

sansview

Files:

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

sansview/README.txt

@@ -15 +15 @@
       distribution of points when using a model to simulate data, and the 
       addition of a Kratky plot option to the linear plots
-    - a number of bugs have also been fixed      
+    - A number of bugs have also been fixed
+    - Save Project and Save Analysis now work more reliably
     - BETA: Magnetic contrast supporting full polarization analysis has been 
             implemented for some spherical and cylindrical models
@@ -31 +32 @@
     - New in Version 2.2.1
       - Minor patch to support CanSAS XML v1.1 file format
+      - Added DataInfo for data in the DataExplorer and plots
+      - Added Maximize/Restore button in the title bar of the graphs
+      - Added a hide button in the toolbar of the graph panel
+      - The 'x' button now deletes a graph
+      - Edit SUM Model from the menubar can now generate and save more than one sum model
+      - Reports can now be saved in pdf format on WIN and MAC
+      - Made significant improvements to the batch/grid panel and fixed several bugs
+      - Fixed a number of other minor bugs
 
     - New in Version 2.2.0

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']