Changeset 4318af7f in sasview

Timestamp:

Jul 9, 2008 10:37:54 AM (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:

7a2feab

Parents:

8800ff6

Message:

Improvements for Mac

Location:

prview

Files:

• perspectives/pr/inversion_panel.py (modified) (9 diffs)
• perspectives/pr/mactime.py (added)
• perspectives/pr/pr_thread.py (modified) (6 diffs)
• sansview.py (modified) (2 diffs)

prview/perspectives/pr/inversion_panel.py

@@ -297 +297 @@
         
     def _do_layout(self):
-        #panel = wx.Panel(self, -1)
-        vbox = wx.BoxSizer(wx.VERTICAL)
-        #vbox.SetMinSize((1000,50))
+        vbox = wx.GridBagSizer(0,0)
+        iy_vb = 0
 
         # ----- I(q) data -----
@@ -338 +337 @@
         pars_sizer.Add(self.bck_chk, (iy,0), (1,2), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         boxsizer1.Add(pars_sizer, 0, wx.EXPAND)  
-        vbox.Add(boxsizer1)
+        vbox.Add(boxsizer1, (iy_vb,0), (1,1), wx.RIGHT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         
         # ----- Add slit parameters -----
@@ -348 +347 @@
             sizer_slit = wx.GridBagSizer(5,5)
     
-            label_sheight = wx.StaticText(self, -1, "Height", size=(35,20))
-            label_swidth = wx.StaticText(self, -1, "Width", size=(35,20))
+            label_sheight = wx.StaticText(self, -1, "Height", size=(40,20))
+            label_swidth = wx.StaticText(self, -1, "Width", size=(40,20))
             #label_sunits1 = wx.StaticText(self, -1, "[A^(-1)]")
-            label_sunits2 = wx.StaticText(self, -1, "[A^(-1)]", size=(40,20))
+            label_sunits2 = wx.StaticText(self, -1, "[A^(-1)]", size=(55,20))
             self.sheight_ctl = wx.TextCtrl(self, -1, size=(60,20))
             self.swidth_ctl = wx.TextCtrl(self, -1, size=(60,20))
@@ -368 +367 @@
             
             sboxsizer.Add(sizer_slit, wx.TOP, 15)
-            vbox.Add(sboxsizer)
+            iy_vb += 1
+            vbox.Add(sboxsizer, (iy_vb,0), (1,1), wx.RIGHT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         
         
@@ -378 +378 @@
         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_qmin = wx.StaticText(self, -1, "Q min", size=(40,20))
+        label_qmax = wx.StaticText(self, -1, "Q max", size=(40,20))
         #label_qunits1 = wx.StaticText(self, -1, "[A^(-1)]")
-        label_qunits2 = wx.StaticText(self, -1, "[A^(-1)]", size=(40,20))
+        label_qunits2 = wx.StaticText(self, -1, "[A^(-1)]", size=(55,20))
         self.qmin_ctl = wx.TextCtrl(self, -1, size=(60,20))
         self.qmax_ctl = wx.TextCtrl(self, -1, size=(60,20))
@@ -397 +397 @@
         sizer_q.Add(label_qunits2, (iy,4), (1,1), wx.LEFT|wx.EXPAND, 5)
         qboxsizer.Add(sizer_q, wx.TOP, 15)
-        vbox.Add(qboxsizer)
+
+        iy_vb += 1
+        vbox.Add(qboxsizer, (iy_vb,0), (1,1), wx.RIGHT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         
         
@@ -472 +474 @@
         boxsizer2.Add(sizer_params, 0)
         
-        vbox.Add(boxsizer2)
+        iy_vb += 1
+        vbox.Add(boxsizer2, (iy_vb,0), (1,1), wx.RIGHT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
 
 
@@ -565 +568 @@
 
         ressizer.Add(sizer_res, 0)
-        vbox.Add(ressizer)
+        iy_vb += 1
+        vbox.Add(ressizer, (iy_vb,0), (1,1), wx.RIGHT|wx.EXPAND|wx.ADJUST_MINSIZE, 0)
 
         # ----- Buttons -----
         static_line = wx.StaticLine(self, -1)
-        vbox.Add(static_line, 0, wx.EXPAND|wx.TOP, 10)
+        iy_vb += 1
+        vbox.Add(static_line, (iy_vb,0), (1,1), wx.EXPAND|wx.TOP, 10)
         
         id = wx.NewId()
@@ -587 +592 @@
         sizer_button.Add(button_OK, 0, wx.LEFT|wx.ADJUST_MINSIZE, 10)
         #sizer_button.Add(button_Cancel, 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)        
-        vbox.Add(sizer_button, 0, wx.EXPAND|wx.BOTTOM|wx.TOP, 10)
+        iy_vb += 1
+        vbox.Add(sizer_button, (iy_vb,0), (1,1), wx.EXPAND|wx.BOTTOM|wx.TOP, 10)
 
 

prview/perspectives/pr/pr_thread.py

@@ -1 +1 @@
 import sys, time
 from calcthread import CalcThread
-from sans.pr.invertor import Invertor
-import numpy
-from config import printEVT
 
 class CalcPr(CalcThread):
@@ -28 +25 @@
         self.starttime = 0
         
-    def isquit(self):
-        try:
-            CalcThread.isquit(self)
-        except KeyboardInterrupt:
-            printEVT("P(r) calc interrupted")
-            raise KeyboardInterrupt
-        
     def compute(self):
-        import time
+        """
+            Perform P(r) inversion
+        """
         try:
             self.starttime = time.time()
@@ -46 +38 @@
         except KeyboardInterrupt:
             # Thread was interrupted, just proceed
-            printEVT("P(r) calc interrupted")
+            pass
         except:
             if not self.error_func==None:
@@ -84 +76 @@
         except KeyboardInterrupt:
             # Thread was interrupted, just proceed
-            printEVT("Alpha estimator thread interrupted")
+            pass
         except:
             if not self.error_func==None:
@@ -119 +111 @@
             Calculates the estimate
         """
-        import time
         try:            
             t_0 = time.time()
@@ -129 +120 @@
         except KeyboardInterrupt:
             # Thread was interrupted, just proceed
-            printEVT("Number of terms thread interrupted")
+            pass
         except:
             if not self.error_func==None:

prview/sansview.py

@@ -6 +6 @@
 import local_config
 from perspectives.pr.pr import NewPrFileEvent
+
+# OS-dependent preferred height
+#TODO: refactor this
+_DEFAULT_HEIGHT=650
+import sys
+if sys.platform.count("darwin")>0:
+        _DEFAULT_HEIGHT=720
 
 class PrFrame(gui_manager.ViewerFrame):
@@ -15 +22 @@
         #from gui_manager import ViewerFrame
         self.frame = PrFrame(None, -1, local_config.__appname__, 
-                             window_height=650, window_width=750)    
+                             window_height=_DEFAULT_HEIGHT, window_width=750)    
         self.frame.Show(True)
 
         if hasattr(self.frame, 'special'):
-            print "Special?", self.frame.special.__class__.__name__
             self.frame.special.SetCurrent()
         self.SetTopWindow(self.frame)