Changeset ff8f99b in sasview

Timestamp:

Oct 14, 2009 8:00:19 PM (15 years ago)

Author:

Jae Cho <jhjcho@…>

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:

448e69c

Parents:

860afc1

Message:

fixed textbox and buttons in fit-panel and model-panel for MAC.

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (8 diffs)
• fitpage.py (modified) (8 diffs)
• modelpage.py (modified) (6 diffs)

sansview/perspectives/fitting/basepage.py

@@ -318 +318 @@
         self.Bind(wx.EVT_RADIOBUTTON, self._set_dipers_Param, id=self.disable_disp.GetId())
         self.Bind(wx.EVT_RADIOBUTTON, self._set_dipers_Param, id=self.enable_disp.GetId())
-        
+        #MAC needs SetValue
+        self.disable_disp.SetValue(True)
         sizer_dispersion = wx.BoxSizer(wx.HORIZONTAL)
         sizer_dispersion.Add((20,20))
@@ -1208 +1209 @@
         
         
-    def _set_model_sizer(self, sizer, title="", object=None):
+    def _set_model_sizer(self,sizer, box_sizer, title="", object=None):
         """
             Use lists to fill a sizer for model info
@@ -1214 +1215 @@
        
         sizer.Clear(True)
-        box_description= wx.StaticBox(self, -1,str(title))
-        boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
+        ##For MAC, this should defined here.
+        if box_sizer == None:
+                box_description= wx.StaticBox(self, -1,str(title))
+                boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
+        else:
+            boxsizer1 = box_sizer
+            
         #--------------------------------------------------------
         self.shape_rbutton = wx.RadioButton(self, -1, 'Shapes', style=wx.RB_GROUP)
@@ -1230 +1236 @@
         self.Bind( wx.EVT_RADIOBUTTON, self._show_combox,
                             id= self.plugin_rbutton.GetId() )  
-       
+                #MAC needs SetValue
+        self.shape_rbutton.SetValue(True)
       
         sizer_radiobutton = wx.GridSizer(2, 2,5, 5)
@@ -1373 +1380 @@
         self.disp_cb_dict ={}
         f_id = self.formfactorbox.GetCurrentSelection()
-
-        form_factor = self.formfactorbox.GetClientData( f_id )
+        #For MAC
+        form_factor = None
+        if f_id >= 0:
+            form_factor = self.formfactorbox.GetClientData( f_id )
+
         if not form_factor in  self.model_list_box["multiplication"]:
             self.structurebox.Hide()
@@ -1603 +1613 @@
                 disp_model = GaussianDispersion()
                
-                self._disp_obj_dict[p] = disp_model
-                # Set the new model as the dispersion object for the selected parameter
+                self._disp_obj_dict[p] = disp_model
+                # Set the new model as the dispersion object for the selected parameter
                 try:
-                   self.model.set_dispersion(p, disp_model)
+                   self.model.set_dispersion(p, disp_model)
                 except:
                     pass
-                                # Redraw the model
+                # Redraw the model
                 #self._draw_model()
         ## save state into
@@ -1683 +1693 @@
         self.noDisper_rbox = wx.RadioButton(self, -1,"None", (10, 10),style= wx.RB_GROUP)
         self.Bind(wx.EVT_RADIOBUTTON,self.select_disp_angle , id=self.noDisper_rbox.GetId())
+        #MAC needs SetValue
+        self.noDisper_rbox.SetValue(True)
         self.sizer4_4.Add(self.noDisper_rbox, (iy, ix),
                            (1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
@@ -1746 +1758 @@
        
 
-    def _set_range_sizer(self, title, object1=None,object=None):
-        """
-            Fill the 
+    def _set_range_sizer(self, title, box_sizer=None, object1=None,object=None):
+        """
+            Fill the Q range sizer
         """
         self.sizer5.Clear(True)
-        box_description= wx.StaticBox(self, -1,str(title))
-        boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
         #--------------------------------------------------------------
+        if box_sizer == None:
+                box_description= wx.StaticBox(self, -1,str(title))
+                boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
+        else:
+            #for MAC
+            boxsizer1 = box_sizer
+
         self.qmin    = BasicPage.ModelTextCtrl(self, -1,size=(_BOX_WIDTH,20))
         self.qmin.SetValue(str(self.qmin_x))

sansview/perspectives/fitting/fitpage.py

@@ -44 +44 @@
         ## default fitengine type
         self.engine_type = None
+        #self.smearer = None
         ## draw sizer
         self._fill_datainfo_sizer()
@@ -146 +147 @@
             add  access to npts
         """
+        title = "Fitting"
+        box_description_range = wx.StaticBox(self, -1,str(title))
+        boxsizer_range = wx.StaticBoxSizer(box_description_range, wx.VERTICAL)
+
         sizer_fit = wx.GridSizer(1, 1,0, 0)
     
@@ -155 +160 @@
         sizer_fit.Add((5,5),1, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 5)        
         sizer_fit.Add(self.btFit,0, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 35) 
-        
+        sizer_fit.Layout()
         sizer_smearer = wx.BoxSizer(wx.HORIZONTAL)
         #Filling the sizer containing instruments smearing info.
@@ -162 +167 @@
         self.Bind(wx.EVT_RADIOBUTTON, self.onSmear, id=self.disable_smearer.GetId())
         self.Bind(wx.EVT_RADIOBUTTON, self.onSmear, id=self.enable_smearer.GetId())
+        self.disable_smearer.SetValue(True)
         
         sizer_smearer.Add(wx.StaticText(self,-1,'Instrument Smearing? '))
@@ -168 +174 @@
         sizer_smearer.Add((10,10))
         sizer_smearer.Add( self.disable_smearer )
-        
         #Display Chi^2/dof
         sizer_smearer.Add((90,10))
@@ -184 +189 @@
                
         #Set sizer for Fitting section
-        self._set_range_sizer( title="Fitting",object1=sizer_smearer, object= sizer_fit)
+        self._set_range_sizer( title=title,box_sizer=boxsizer_range, object1=sizer_smearer, object= sizer_fit)
   
        
@@ -250 +255 @@
         """
         ##Add model function Details button in fitpanel.
+        ##The following 3 lines are for Mac. Let JHC know before modifying... 
+        title = "Model"
+        box_description= wx.StaticBox(self, -1,str(title))
+        boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
+         
         id = wx.NewId()
         self.model_help =wx.Button(self,id,'Details')
@@ -256 +266 @@
         
         ## class base method  to add view 2d button    
-        self._set_model_sizer(sizer=sizer, title="Model",object=self.model_help )   
+        self._set_model_sizer(sizer=sizer, box_sizer=boxsizer1, title="Model",object=self.model_help )   
 
     

sansview/perspectives/fitting/modelpage.py

@@ -83 +83 @@
             add  access to npts
         """
-        sizer_npts= wx.GridSizer(1, 1,5, 5)
-    
+        ##The following 3 lines are for Mac. Let JHC know before modifying..
+        title = "Plotted Q Range"
+        box_description= wx.StaticBox(self, -1,str(title))
+        boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
+
+        sizer_npts= wx.GridSizer(1, 1,5, 5)    
         self.npts    = BasicPage.ModelTextCtrl(self, -1,size=(_BOX_WIDTH,20))
         self.npts.SetValue(format_number(self.num_points))
@@ -91 +95 @@
         sizer_npts.Add(wx.StaticText(self, -1, 'Npts'),1, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 5)        
         sizer_npts.Add(self.npts,1, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 5) 
-        self._set_range_sizer( title="Plotted Q Range", object= sizer_npts)
+        self._set_range_sizer( title=title, box_sizer=boxsizer1, object= sizer_npts)
        
        
@@ -108 +112 @@
             fill sizer containing model info
         """
+        ##The following 3 lines are for Mac. Let JHC know before modifying..
+        title = "Model"
+        box_description= wx.StaticBox(self, -1,str(title))
+        boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
+        
         id = wx.NewId()
         self.model_view =wx.Button(self,id,'View 2D')
@@ -114 +123 @@
         
         ## class base method  to add view 2d button   
-        self._set_model_sizer(sizer=sizer, title="Model",object= self.model_view )    
+        self._set_model_sizer(sizer=sizer,box_sizer=boxsizer1, title=title,object= self.model_view )    
     
   
@@ -397 +406 @@
         self.Bind( wx.EVT_RADIOBUTTON, self._on_display_description,
                    id=self.description_show.GetId() )
+        #MAC needs SetValue
+        self.description_hide.SetValue(True)
         
         self.model_description = wx.Button(self,-1, label="Details")
@@ -405 +416 @@
         sizer_selection.Add( (20,20)) 
         sizer_selection.Add( self.description_hide )
-        sizer_selection.Add((20,20),0, wx.LEFT|wx.RIGHT|wx.EXPAND,67)
+        sizer_selection.Add((20,20),0, wx.LEFT|wx.RIGHT|wx.EXPAND,75)
         sizer_selection.Add( self.model_description )