Changeset 6e9150d in sasview

Timestamp:

Sep 24, 2009 11:49:02 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:

e627f19

Parents:

4bb2917

Message:

separe the 2 radio group of selecting dispersiton type and enable apply dispersion

File:

• sansview/perspectives/fitting/basepage.py (modified) (6 diffs)

sansview/perspectives/fitting/basepage.py

@@ -334 +334 @@
         self.values=[]
         self.weights=[]
+        if event.GetEventObject()==self.noDisper_rbox:
+            if self.noDisper_rbox.GetValue():
+                #No array dispersity apply yet
+                self._reset_dispersity()
+                ## Redraw the model ???
+                self._draw_model()
         # Go through the list of dispersion check boxes to identify which one has changed 
-
         for p in self.disp_cb_dict:
             self.state.disp_cb_dict[p]=  self.disp_cb_dict[p].GetValue()
@@ -403 +408 @@
                     self._reset_dispersity()
               
-                ## Redraw the model ???
+                ## Redraw the model
                 self._draw_model()
         
@@ -1530 +1535 @@
             self._set_sizer_dispersion(dispersity= dispersity)
             
-            
         self.state.disp_box= n
-        
+        ## Redraw the model
+        self._draw_model() 
         #self._undo.Enable(True)
         event = PageInfoEvent(page = self)
@@ -1572 +1577 @@
         # Add a check box for each parameter.
         self.disp_cb_dict = {}
+        ix+=1 
+        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())
+        self.sizer4_4.Add(self.noDisper_rbox, (iy, ix),
+                           (1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         
         for p in self.model.dispersion.keys():
@@ -1581 +1591 @@
                 #wx.EVT_RADIOBUTTON(self, self.disp_cb_dict[p].GetId(), self.select_disp_angle)
                 self.sizer4_4.Add(self.disp_cb_dict[p], (iy, ix), (1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        
         for p in self.model.dispersion.keys():
             if p in self.model.orientation_params:
@@ -1586 +1597 @@
                 self.disp_cb_dict[p] = wx.RadioButton(self, -1, p, (10, 10))
                 self.state.disp_cb_dict[p]=  self.disp_cb_dict[p].GetValue()
-                #print "self.enable2D",self.enable2D
                 if not (self.enable2D or self.data.__class__.__name__ =="Data2D"):
                     self.disp_cb_dict[p].Hide()