Changeset 1467e1a6 in sasview for sansview

Timestamp:

Aug 31, 2009 11:26:06 AM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

b7a25a7e

Parents:

ab62adb

Message:

cleaning the code for saving option

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (4 diffs)
• modelpage.py (modified) (1 diff)

sansview/perspectives/fitting/basepage.py

@@ -1087 +1087 @@
                             break
                     break
-        ## save state and post
-        
-                    
-        
+    
+    
     def _draw_model(self):
         """
@@ -1401 +1399 @@
     def _set_dipers_Param(self, event):
         """
-            Add more item to select user dispersity
-        """
+            respond to self.enable_disp and self.disable_disp radio box.
+            The dispersity object is reset inside the model into Gaussian. 
+            When the user select yes , this method display a combo box for more selection
+            when the user selects No,the combo box disappears.
+            Redraw the model with the default dispersity (Gaussian)
+        """
+        
         self._reset_dispersity()
-
+    
         if self.model ==None:
             self.model_disp.Hide()
             self.disp_box.Hide()
             self.sizer4_4.Clear(True)
-            ## save the state of the dispersity
-            #self.save_current_state()
+      
             return
             
@@ -1437 +1439 @@
             event = PageInfoEvent(page = self)
             wx.PostEvent(self.parent, event)
-        
+        #draw the model with the current dispersity
         self._draw_model()
         self.sizer4_4.Layout()
@@ -1506 +1508 @@
                     pass
                                 # Redraw the model
-                self._draw_model()
+                #self._draw_model()
         ## save state into
         self.save_current_state()

sansview/perspectives/fitting/modelpage.py

@@ -302 +302 @@
             self.model_view.Disable()
            
-            #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)
- 
+            #TODO:Find a better way to reinitialize the parameters containers 
+            # when resetting the page and 2D view is enable
+            #self.set_model_param_sizer(self.model): called here is using a lot
+            #of for loops and redraw the sizer again .How to avoid it?
             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":                
+            # same as above why do we have to redraw the sizer of dispersity to get
+            # the appropriate value of parameters containers on reset page?
+            # Reset containers of dispersity parameters for the appropriate dispersity
+            #and model
+            if  self.disp_name.lower()in ["array","arraydispersion"]:                
                 self._set_sizer_arraydispersion()  
             else:
-
+                self._set_sizer_dispersion(dispersity)
                 if len(self.orientation_params_disp)>0:
-                    #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()