Changeset 58c6ba6 in sasview for sansview/perspectives

Timestamp:

Aug 7, 2009 9:38:17 AM (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:

26e4a24

Parents:

9bd69098

Message:

temp. fix for orientational parameter display on model panel. Should come back fix it permanently in a week.

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (3 diffs)
• modelpage.py (modified) (8 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -438 +438 @@
                                                wx.EXPAND|wx.ADJUST_MINSIZE, 0)
                             ix +=1
-                            self.sizer4_4.Add((20,20), (iy,ix),(1,1),
-                                               wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                            #self.sizer4_4.Add((20,20), (iy,ix),(1,1),
+                                               #wx.EXPAND|wx.ADJUST_MINSIZE, 0)
                             self.fixed_param.append([None,name3, Tctl
                                                      ,None,None, None, None,None])    
@@ -457 +457 @@
         ix =0
         iy +=1 
-        self.sizer4_4.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)        
+        #self.sizer4_4.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)        
         self.sizer4_4.Layout()
         self.sizer4.Layout()
@@ -1261 +1261 @@
               
         iy+=1
-        sizer.Add((10,10),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        #sizer.Add((10,10),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         
         #Display units text on panel

sansview/perspectives/fitting/modelpage.py

@@ -124 +124 @@
         self.fixed_param=[]
         self.orientation_params_disp=[]
+        #self.temp=[]
        
         self.sizer4_4.Clear(True)
@@ -268 +269 @@
                                                wx.EXPAND|wx.ADJUST_MINSIZE, 0)
                             ix +=1
-                            self.sizer4_4.Add((20,20), (iy,ix),(1,1),
-                                               wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+                            #self.sizer4_4.Add((20,20), (iy,ix),(1,1),
+                                               #wx.EXPAND|wx.ADJUST_MINSIZE, 0)
                             self.fixed_param.append([None,name3, Tctl2,
                                                      None,None, None, None,None])
@@ -280 +281 @@
         ix =0
         iy +=1 
-        self.sizer4_4.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)   
+        #self.sizer4_4.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)   
         self.sizer4_4.Layout()
         self.sizer4.Layout()
@@ -300 +301 @@
             self.model_view.Disable()
            
-            #ToDo:cleanup this mess.           
-            #self.set_model_param_sizer(self.model)
-            #self._set_sizer_gaussian()
+            #ToDo:cleanup this mess.  resets orient param on 2D when polydis. is on.  
+            #broken since _set_sizer_gaussian() was removed from the code.  
+            n = self.disp_box.GetCurrentSelection()
+            dispersity= self.disp_box.GetClientData(n)
+ 
+            self.set_model_param_sizer(self.model)
+            self._set_sizer_dispersion(dispersity)
             
             if len(self.orientation_params)>0:
+                #recover hidden orient. param.s
+                #for item in self.temp:
+                #    for num in range(len(item)):
+                #        item[num].Show(True)
                 for item in self.orientation_params:
                     if item[2]!=None:      
-    
+                        #item[2].Show()
                         item[2].Enable()
+            
             if  self.disp_name.lower() == "array":                
                 self._set_sizer_arraydispersion()  
             else:
+
                 if len(self.orientation_params_disp)>0:
-                     for item in self.orientation_params_disp:
+                    #for item in self.temp:
+                    #    for num in range(len(item)):
+                    #        item[num].Show(True)
+                    
+                    for item in self.orientation_params_disp:
                         if item[2]!=None:
+                            #item[2].Show()
                             item[2].Enable()
         self.state.enable2D =  copy.deepcopy(self.enable2D)
+        self.Layout()
         ## post state to fit panel
         self._undo.Enable(True)
@@ -458 +475 @@
         self.orientation_params=[]
         self.orientation_params_disp=[]
+        #self.temp=[]
         if model ==None:
             ##no model avaiable to draw sizer 
@@ -567 +585 @@
                 if not self.enable2D:
                     units.Hide()
-                    units.Disable()
+                    #units.Disable()
                 else:
                     units.Show(True)
-                    units.Enable()
-
+                    #units.Enable()
+   
                 sizer.Add(units, (iy,ix),(1,1),  wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-                
+                #Save 2D orient. params
+                #self.temp.append([name,ctl1,units,orient_angle])
+                
+                               
                 ##[cb state, name, value, "+/-", error of fit, min, max , units]
                 self.parameters.append([None,item, ctl1,
@@ -581 +602 @@
                     
         iy+=1
-        sizer.Add((10,10),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
+        #sizer.Add((10,10),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         
         #Display units text on panel
@@ -597 +618 @@
     
  
-            
+
+                
         
 class HelpWindow(wx.Frame):