Changeset 4a5de6f in sasview

Timestamp:

May 27, 2008 2:34:30 PM (16 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:

fd68aa9

Parents:

278cc25

Message:

Modified for Windows executable.

Location:

prview

Files:

• images/angles.png (added)
• images/angles_flat.png (added)
• images/ball.ico (added)
• images/danse_logo.png (added)
• images/nsf_logo.png (added)
• images/utlogo.gif (added)
• installer.iss (added)
• local_config.py (added)
• perspectives/pr/pr.py (modified) (7 diffs)
• perspectives/pr/requirements.txt (modified) (1 diff)
• sansview.py (modified) (2 diffs)
• setup_exe.py (added)

prview/perspectives/pr/pr.py

@@ -4 +4 @@
 
 import os
+import sys
 import wx
 from sans.guitools.plottables import Data1D, Theory1D
@@ -267 +268 @@
                     x = float(toks[0])
                     y = float(toks[1])
-                    data_x = numpy.append(data_x, x)
-                    data_y = numpy.append(data_y, y)
                     try:
                         scale = 0.05/math.sqrt(data_x[0])
@@ -274 +273 @@
                         scale = 1.0
                     #data_err = numpy.append(data_err, 10.0*math.sqrt(y)+1000.0)
-                    data_err = numpy.append(data_err, scale*math.sqrt(y))
+                    data_x = numpy.append(data_x, x)
+                    data_y = numpy.append(data_y, y)
+                    data_err = numpy.append(data_err, scale*math.sqrt(math.fabs(y)))
                 except:
                     print "Error reading line: ", line
@@ -387 +388 @@
         self.q_max = q_max
         
-        self._create_plot_pr()
-        self.perform_inversion()
+        try:
+            self._create_plot_pr()
+            self.perform_inversion()
+        except:
+            wx.PostEvent(self.parent, StatusEvent(status=sys.exc_value))
 
     def estimate_plot_inversion(self, alpha, nfunc, d_max, q_min=None, q_max=None):
@@ -397 +401 @@
         self.q_max = q_max
         
-        self._create_plot_pr()
-        self.perform_estimate()
+        try:
+            self._create_plot_pr()
+            self.perform_estimate()
+        except:
+            wx.PostEvent(self.parent, StatusEvent(status=sys.exc_value))            
 
     def _create_plot_pr(self):
@@ -435 +442 @@
         self.q_max = q_max
         
-        self._create_file_pr(path)
-        
-        self.perform_inversion()
+        try:
+            if self._create_file_pr(path):
+                self.perform_inversion()
+        except:
+            wx.PostEvent(self.parent, StatusEvent(status=sys.exc_value))
           
     def estimate_file_inversion(self, alpha, nfunc, d_max, path, q_min=None, q_max=None):
@@ -446 +455 @@
         self.q_max = q_max
         
-        if self._create_file_pr(path):
-            self.perform_estimate()
+        try:
+            if self._create_file_pr(path):
+                self.perform_estimate()
+        except:
+            wx.PostEvent(self.parent, StatusEvent(status=sys.exc_value))
+                
           
     def _create_file_pr(self, path):

prview/perspectives/pr/requirements.txt

@@ -24 +24 @@
 20. If a figure of merit is clearly bad, put its background red
 21. Option to save data.
+22. If you click compute before loading data, an error occurs.
+23. Plot I(q) immediately when you choose a new file.
+24. *** probably need to ship the perspectives separately...

prview/sansview.py

@@ -2 +2 @@
 #import gui_manager
 from sans.guiframe import gui_manager
+
+# For py2exe, import config here
+import local_config
+
 class SansView():
     
@@ -11 +15 @@
         self.gui = gui_manager.ViewApp(0)
         
+        # Add perspectives to the basic application
+        # Additional perspectives can still be loaded
+        # dynamically
+        import perspectives.pr as module
+        plug = module.Plugin()
+        self.gui.add_perspective(plug)
+            
+        # Build the GUI
+        self.gui.build_gui()
+        
         # Set the application manager for the GUI
         self.gui.set_manager(self)