Changes in src/sas/sasgui/perspectives/fitting/fitpage.py [7988501:4c3be25] in sasview

File:

• src/sas/sasgui/perspectives/fitting/fitpage.py (modified) (9 diffs)

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -55 +55 @@
         self.weightbt_string = None
         self.m_name = None
-        # transform implementation
-        self._fill_Trafo_sizer()
-       # self.Trafobt_string()
         # get smear info from data
         self._get_smear_info()
@@ -95 +92 @@
         self.parent.on_set_focus(event)
         self.on_tap_focus()
-
-    def onTrafo(self, event):
-        """
-        On Trafo radio button event, sets the Trafobt_string
-        """
-        self.Trafobt_string = event.GetEventObject().GetLabelText()
-        self._set_Trafo()
-
-    def _fill_Trafo_sizer(self):
-
-        title = "Transform"
-        box_description_trafo = wx.StaticBox(self, wx.ID_ANY, str(title))
-        box_description_trafo.SetForegroundColour(wx.BLUE)
-        #boxsizer_trafo = wx.StaticBoxSizer(box_description_trafo, wx.VERTICAL)
-        boxsizer_trafo = wx.StaticBoxSizer(box_description_trafo, wx.HORIZONTAL)
-        #sizer_trafo = wx.StaticBoxSizer(box_description_trafo, wx.HORIZONTAL)
-        #weighting_set_box = wx.StaticBox(self, wx.ID_ANY,
-         #                              'Select the type of SESANS analysis')
-
-        #sizer_weighting = wx.BoxSizer(wx.HORIZONTAL)
-          #      weighting_box.SetMinSize((_DATA_BOX_WIDTH, 60))
-
-        #For every radio button (each statement x3):
-        self.no_transform = wx.RadioButton(self, wx.ID_ANY,
-                                                  'None', style=wx.RB_GROUP)
-
-        #self.Bind(wx.EVT_RADIOBUTTON, self.onTrafo,
-         #                 id=self.no_transform.GetId())
-        self.hankel = wx.RadioButton(self, wx.ID_ANY,
-                                                  'Hankel')
-        #self.Bind(wx.EVT_RADIOBUTTON, self.onTrafo,
-        #                  id=self.hankel.GetId())
-        self.cosine = wx.RadioButton(self, wx.ID_ANY,
-                                                  'Cosine')
-        #self.Bind(wx.EVT_RADIOBUTTON, self.onTrafo,
-         #                 id=self.cosine.GetId())
-
-        #Not sure about this (only once though)
-        self.no_transform.SetValue(True)
-
-        #For every radio button (each statement x3):
-        boxsizer_trafo.Add(self.no_transform, 0, wx.LEFT, 10)
-        boxsizer_trafo.Add((14, 10))
-        boxsizer_trafo.Add(self.hankel)
-        boxsizer_trafo.Add((14, 10))
-        boxsizer_trafo.Add(self.cosine)
-        boxsizer_trafo.Add((14, 10))
-            #Default for weighting is False, but these need to be on by default!
-        self.no_transform.Enable(True)
-
-        #Not sure about this (only once though)
-        #weighting_box.Add(sizer_trafo)
-
-        self.sizerTrafo.Clear(True)
-        self.sizerTrafo.Add(boxsizer_trafo, 0, wx.EXPAND | wx.ALL, 10)
-        #self.sizerTrafo.Add(sizer_trafo, 0, wx.EXPAND | wx.ALL, 10)
-        self.sizerTrafo.Layout()
 
     def _fill_data_sizer(self):
@@ -684 +624 @@
         ## fill a sizer with the combobox to select dispersion type
         model_disp = wx.StaticText(self, wx.ID_ANY, 'Function')
-        CHECK_STATE = self.cb1.GetValue()
+        CHECK_STATE = False
 
         ix = 0
@@ -1029 +969 @@
         self.state.model = self.model.clone()
         ## save state into
-        self.state.cb1 = self.cb1.GetValue()
         self._copy_parameters_state(self.parameters, self.state.parameters)
         self._copy_parameters_state(self.orientation_params_disp,
@@ -1040 +979 @@
                      StatusEvent(status=" Selected Distribution: Gaussian"))
         #Fill the list of fittable parameters
-        #self.select_all_param(event=None)
         self.get_all_checked_params()
         self.Layout()
@@ -2755 +2693 @@
         self._manager.set_param2fit(self.uid, param2fit)
 
-    def select_all_param(self, event):
-        """
-        set to true or false all checkBox given the main checkbox value cb1
-        """
-        self.param_toFit = []
-        if  self.parameters != []:
-            if  self.cb1.GetValue():
-                for item in self.parameters:
-                    if item[0].IsShown():
-                        ## for data2D select all to fit
-                        if self.data.__class__.__name__ == "Data2D" or \
-                                self.enable2D:
-                            item[0].SetValue(True)
-                            self.param_toFit.append(item)
-                        else:
-                            ## for 1D all parameters except orientation
-                            if not item in self.orientation_params:
-                                item[0].SetValue(True)
-                                self.param_toFit.append(item)
-                    else:
-                        item[0].SetValue(False)
-                #if len(self.fittable_param)>0:
-                for item in self.fittable_param:
-                    if item[0].IsShown():
-                        if self.data.__class__.__name__ == "Data2D" or \
-                                self.enable2D:
-                            item[0].SetValue(True)
-                            self.param_toFit.append(item)
-                            try:
-                                if len(self.values[item[1]]) > 0:
-                                    item[0].SetValue(False)
-                            except:
-                                pass
-
-                        else:
-                            ## for 1D all parameters except orientation
-                            if not item in self.orientation_params_disp:
-                                item[0].SetValue(True)
-                                self.param_toFit.append(item)
-                                try:
-                                    if len(self.values[item[1]]) > 0:
-                                        item[0].SetValue(False)
-                                except:
-                                    pass
-                    else:
-                        item[0].SetValue(False)
-
-            else:
-                for item in self.parameters:
-                    item[0].SetValue(False)
-                for item in self.fittable_param:
-                    item[0].SetValue(False)
-                self.param_toFit = []
-
-        self.save_current_state_fit()
-
-        if event != None:
-            #self._undo.Enable(True)
-            ## post state to fit panel
-            event = PageInfoEvent(page=self)
-            wx.PostEvent(self.parent, event)
-        param2fit = []
-        for item in self.param_toFit:
-            if item[0] and item[0].IsShown():
-                param2fit.append(item[1])
-        self.parent._manager.set_param2fit(self.uid, param2fit)
-
     def select_param(self, event):
         """
@@ -2868 +2739 @@
         if len(self.fittable_param) > 0:
             len_orient_para *= 2
-        #Set the value of checkbox that selected every checkbox or not
-        if len(self.parameters) + len(self.fittable_param) - len_orient_para \
-            == len(self.param_toFit):
-            self.cb1.SetValue(True)
-        else:
-            self.cb1.SetValue(False)
 
         self.save_current_state_fit()
@@ -2975 +2840 @@
         iy = 0
         ix = 0
-        select_text = "Select All"
-        self.cb1 = wx.CheckBox(self, wx.ID_ANY, str(select_text), (10, 10))
-        wx.EVT_CHECKBOX(self, self.cb1.GetId(), self.select_all_param)
-        self.cb1.SetToolTipString("To check/uncheck all the boxes below.")
-        self.cb1.SetValue(True)
-
-        sizer.Add(self.cb1, (iy, ix), (1, 1), \
-                             wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 5)
+        sizer.Add(wx.StaticText(self, wx.ID_ANY, 'Parameter'),
+                  (iy, ix), (1, 1), wx.EXPAND | wx.ADJUST_MINSIZE, 0)
         ix += 1
         self.text2_2 = wx.StaticText(self, wx.ID_ANY, 'Value')
@@ -3009 +2868 @@
         self.text2_4.Hide()
 
-        CHECK_STATE = self.cb1.GetValue()
+        CHECK_STATE = False
         for item in keys: