Changeset 357b79b in sasview

Timestamp:

Jul 3, 2008 3:35:59 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:

9362f85

Parents:

7578961

Message:

Minor improvements

Location:

prview

Files:

• images/prview.jpg (added)
• installer.iss (modified) (3 diffs)
• local_config.py (modified) (2 diffs)
• perspectives/pr/inversion_panel.py (modified) (3 diffs)
• perspectives/pr/pr.py (modified) (5 diffs)
• perspectives/pr/pr_thread.py (modified) (2 diffs)

prview/installer.iss

@@ -3 +3 @@
 
 [Setup]
-AppName=PrView-0.1
-AppVerName=PrView 0.1
+AppName=PrView-0.2
+AppVerName=PrView 0.2
 AppPublisher=University of Tennessee
 AppPublisherURL=http://danse.chem.utk.edu/
 AppSupportURL=http://danse.chem.utk.edu/
 AppUpdatesURL=http://danse.chem.utk.edu/
-DefaultDirName={userappdata}\PrView-0.1
-DefaultGroupName=DANSE\PrView-0.1
+DefaultDirName={userappdata}\PrView-0.2
+DefaultGroupName=DANSE\PrView-0.2
 DisableProgramGroupPage=yes
 LicenseFile=license.txt
@@ -17 +17 @@
 Compression=lzma
 SolidCompression=yes
+PrivilegesRequired=none
 
 [Languages]
@@ -35 +36 @@
 Name: "{group}\PrView"; Filename: "{app}\prView.exe"; WorkingDir: "{app}"
 Name: "{group}\{cm:UninstallProgram,PrView}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\PrView 0.1"; Filename: "{app}\prView.exe"; Tasks: desktopicon; WorkingDir: "{app}"
+Name: "{commondesktop}\PrView 0.2"; Filename: "{app}\prView.exe"; Tasks: desktopicon; WorkingDir: "{app}"
 
 [Run]

prview/local_config.py

@@ -6 +6 @@
 # Version of the application
 __appname__ = "PrView"
-__version__ = '0.1.1'
+__version__ = '0.2.1'
 __download_page__ = 'http://danse.chem.utk.edu'
 
 
 # Debug message flag
-__EVT_DEBUG__ = True
+__EVT_DEBUG__ = False
 
 # Flag for automated testing
@@ -40 +40 @@
 _danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html"
 _inst_url = "http://www.utk.edu"
-_corner_image = "images/angles_flat.png"
+_corner_image = "images/prview.jpg"
 _copyright = "(c) 2008, University of Tennessee"
 

prview/perspectives/pr/inversion_panel.py

@@ -348 +348 @@
             sizer_slit = wx.GridBagSizer(5,5)
     
-            label_sheight = wx.StaticText(self, -1, "Height")
-            label_swidth = wx.StaticText(self, -1, "Width")
+            label_sheight = wx.StaticText(self, -1, "Height", size=(35,20))
+            label_swidth = wx.StaticText(self, -1, "Width", size=(35,20))
             #label_sunits1 = wx.StaticText(self, -1, "[A^(-1)]")
-            label_sunits2 = wx.StaticText(self, -1, "[A^(-1)]")
+            label_sunits2 = wx.StaticText(self, -1, "[A^(-1)]", size=(40,20))
             self.sheight_ctl = wx.TextCtrl(self, -1, size=(60,20))
             self.swidth_ctl = wx.TextCtrl(self, -1, size=(60,20))
@@ -360 +360 @@
             
             iy = 0
-            sizer_slit.Add(label_sheight,    (iy,0), (1,1), wx.LEFT|wx.EXPAND, 15)
-            sizer_slit.Add(self.sheight_ctl, (iy,1), (1,1), wx.LEFT|wx.EXPAND, 10)
+            sizer_slit.Add(label_sheight,    (iy,0), (1,1), wx.LEFT|wx.EXPAND, 5)
+            sizer_slit.Add(self.sheight_ctl, (iy,1), (1,1), wx.LEFT|wx.EXPAND, 5)
             #sizer_slit.Add(label_sunits1,    (iy,2), (1,1), wx.LEFT|wx.EXPAND, 10)
-            sizer_slit.Add(label_swidth,     (iy,2), (1,1), wx.LEFT|wx.EXPAND, 15)
-            sizer_slit.Add(self.swidth_ctl,  (iy,3), (1,1), wx.LEFT|wx.EXPAND, 10)
-            sizer_slit.Add(label_sunits2,    (iy,4), (1,1), wx.LEFT|wx.EXPAND, 10)
+            sizer_slit.Add(label_swidth,     (iy,2), (1,1), wx.LEFT|wx.EXPAND, 5)
+            sizer_slit.Add(self.swidth_ctl,  (iy,3), (1,1), wx.LEFT|wx.EXPAND, 5)
+            sizer_slit.Add(label_sunits2,    (iy,4), (1,1), wx.LEFT|wx.EXPAND, 5)
             
             sboxsizer.Add(sizer_slit, wx.TOP, 15)
             vbox.Add(sboxsizer)
+        
+        
+        # ----- Q range -----
+        qbox = wx.StaticBox(self, -1, "Q range")
+        qboxsizer = wx.StaticBoxSizer(qbox, wx.VERTICAL)
+        qboxsizer.SetMinSize((320,20))
+        
+        sizer_q = wx.GridBagSizer(5,5)
+
+        label_qmin = wx.StaticText(self, -1, "Q min", size=(35,20))
+        label_qmax = wx.StaticText(self, -1, "Q max", size=(35,20))
+        #label_qunits1 = wx.StaticText(self, -1, "[A^(-1)]")
+        label_qunits2 = wx.StaticText(self, -1, "[A^(-1)]", size=(40,20))
+        self.qmin_ctl = wx.TextCtrl(self, -1, size=(60,20))
+        self.qmax_ctl = wx.TextCtrl(self, -1, size=(60,20))
+        self.qmin_ctl.SetToolTipString("Select a lower bound for Q or leave blank.")
+        self.qmax_ctl.SetToolTipString("Select an upper bound for Q or leave blank.")
+        self.qmin_ctl.Bind(wx.EVT_TEXT, self._on_pars_changed)
+        self.qmax_ctl.Bind(wx.EVT_TEXT, self._on_pars_changed)
+        
+        iy = 0
+        sizer_q.Add(label_qmin,    (iy,0), (1,1), wx.LEFT|wx.EXPAND, 5)
+        sizer_q.Add(self.qmin_ctl, (iy,1), (1,1), wx.LEFT|wx.EXPAND, 5)
+        #sizer_q.Add(label_qunits1, (iy,2), (1,1), wx.LEFT|wx.EXPAND, 15)
+        sizer_q.Add(label_qmax,    (iy,2), (1,1), wx.LEFT|wx.EXPAND, 5)
+        sizer_q.Add(self.qmax_ctl, (iy,3), (1,1), wx.LEFT|wx.EXPAND, 5)
+        sizer_q.Add(label_qunits2, (iy,4), (1,1), wx.LEFT|wx.EXPAND, 5)
+        qboxsizer.Add(sizer_q, wx.TOP, 15)
+        vbox.Add(qboxsizer)
+        
+        
         
 
@@ -443 +474 @@
         vbox.Add(boxsizer2)
 
-        # ----- Q range -----
-        qbox = wx.StaticBox(self, -1, "Q range")
-        qboxsizer = wx.StaticBoxSizer(qbox, wx.VERTICAL)
-        qboxsizer.SetMinSize((320,20))
-        
-        sizer_q = wx.GridBagSizer(5,5)
-
-        label_qmin = wx.StaticText(self, -1, "Q min")
-        label_qmax = wx.StaticText(self, -1, "Q max")
-        #label_qunits1 = wx.StaticText(self, -1, "[A^(-1)]")
-        label_qunits2 = wx.StaticText(self, -1, "[A^(-1)]")
-        self.qmin_ctl = wx.TextCtrl(self, -1, size=(60,20))
-        self.qmax_ctl = wx.TextCtrl(self, -1, size=(60,20))
-        self.qmin_ctl.SetToolTipString("Select a lower bound for Q or leave blank.")
-        self.qmax_ctl.SetToolTipString("Select an upper bound for Q or leave blank.")
-        self.qmin_ctl.Bind(wx.EVT_TEXT, self._on_pars_changed)
-        self.qmax_ctl.Bind(wx.EVT_TEXT, self._on_pars_changed)
-        
-        iy = 0
-        sizer_q.Add(label_qmin,    (iy,0), (1,1), wx.LEFT|wx.EXPAND, 15)
-        sizer_q.Add(self.qmin_ctl, (iy,1), (1,1), wx.LEFT|wx.EXPAND, 10)
-        #sizer_q.Add(label_qunits1, (iy,2), (1,1), wx.LEFT|wx.EXPAND, 15)
-        sizer_q.Add(label_qmax,    (iy,2), (1,1), wx.LEFT|wx.EXPAND, 15)
-        sizer_q.Add(self.qmax_ctl, (iy,3), (1,1), wx.LEFT|wx.EXPAND, 10)
-        sizer_q.Add(label_qunits2, (iy,4), (1,1), wx.LEFT|wx.EXPAND, 15)
-        qboxsizer.Add(sizer_q, wx.TOP, 15)
-        vbox.Add(qboxsizer)
-        
-        
 
         # ----- Results -----

prview/perspectives/pr/pr.py

@@ -351 +351 @@
                     pass
                    
+        if not scale==None:
+            message = "The loaded file had no error bars, statistical errors are assumed."
+            wx.PostEvent(self.parent, StatusEvent(status=message))
+        else:
+            wx.PostEvent(self.parent, StatusEvent(status=''))
+                        
         return data_x, data_y, data_err     
         
@@ -519 +525 @@
               
         # Make a plot of I(q) data
-        new_plot = Data1D(self.pr.x, self.pr.y, dy=self.pr.err)
+        if self.pr.err==None:
+            new_plot = Theory1D(self.pr.x, self.pr.y)
+        else:
+            new_plot = Data1D(self.pr.x, self.pr.y, dy=self.pr.err)
         new_plot.name = "I_{obs}(q)"
         new_plot.xaxis("\\rm{Q}", 'A^{-1}')
@@ -648 +657 @@
             @param path: path of the file to read in 
         """
+        from sans.guiframe.data_loader import load_ascii_1D
+        import numpy
         # Load data
         if os.path.isfile(path):
+            
             x, y, err = self.load(path)
+            #x, y, err = load_ascii_1D(path)
+            
+            # If we have not errors, add statistical errors
+            if err==None:
+                err = numpy.zeros(len(y))
+                for i in range(len(y)):
+                    err[i] = math.sqrt( math.fabs(y[i]) )
+                message = "The loaded file had no error bars, statistical errors are assumed."
+                wx.PostEvent(self.parent, StatusEvent(status=message))
+            else:
+                wx.PostEvent(self.parent, StatusEvent(status=''))
             
             # Get the data from the chosen data set and perform inversion
@@ -674 +697 @@
         from copy import deepcopy
         
-        wx.PostEvent(self.parent, StatusEvent(status=''))
         # If a thread is already started, stop it
         if self.estimation_thread != None and self.estimation_thread.isrunning():
@@ -690 +712 @@
         from copy import deepcopy
         
-        wx.PostEvent(self.parent, StatusEvent(status=''))
         # If a thread is already started, stop it
         if self.estimation_thread != None and self.estimation_thread.isrunning():

prview/perspectives/pr/pr_thread.py

@@ -105 +105 @@
         self.error_func = error_func
         self.starttime = 0
-        
+        self._time_for_sleep = 0
+        self._sleep_delay = 1.0
+
+
+    def isquit(self):
+        CalcThread.isquit(self)
+        if time.time()>self._time_for_sleep+self._sleep_delay:
+            time.sleep(.2)
+            self._time_for_sleep = time.time()
+
     def compute(self):
         """
@@ -113 +122 @@
         try:            
             t_0 = time.time()
+            self._time_for_sleep = t_0
             nterms, alpha, message = self.pr.estimate_numterms(self.isquit)
             t_1 = time.time()-t_0