Changeset be1ec9f in sasview for fittingview

Timestamp:

Jul 13, 2012 6:11:26 PM (12 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:

0da4eba

Parents:

e95614e

Message:

base_page: pylint cleanup#2

File:

• fittingview/src/sans/perspectives/fitting/basepage.py (modified) (30 diffs)

fittingview/src/sans/perspectives/fitting/basepage.py

@@ -68 +68 @@
         ## current model
         self.model = None
+        self.m_name = None
         self.index_model = None
+        self.panel = None
         ## data
         self.data = None
@@ -88 +90 @@
         ## total number of point: float
         self.npts = None
+        self.num_points = None
         ## default fitengine type
         self.engine_type = 'scipy'
@@ -125 +128 @@
         self.btEditMask = None
         self.btFit = None
+        self.sld_axes = None
+        self.multi_factor = None
        
         self.disp_cb_dict = {}
@@ -230 +235 @@
             if self.model != None:
                 if not self.data.is_data:
-                    self._manager.page_finder[self.uid].set_fit_data(data=[self.data])
+                    self._manager.page_finder[self.uid].set_fit_data(data=\
+                                                                [self.data])
             self.on_smear_helper(update=True)
             self.state.enable_smearer = self.enable_smearer.GetValue()
@@ -346 +352 @@
                             and (self.model != None)
             sim_menu.Enable(not self.batch_on and flag)
-            batch_menu = self._manager.menu1.FindItemById(self._manager.id_batchfit)
+            batch_menu = \
+                    self._manager.menu1.FindItemById(self._manager.id_batchfit)
             batch_menu.Enable(self.batch_on and flag)
     
@@ -361 +368 @@
         
         """
-        ## Set to True when the mouse is clicked while the whole string is selected
+        ## Set to True when the mouse is clicked while whole string is selected
         full_selection = False
         ## Call back for EVT_SET_FOCUS events
@@ -431 +438 @@
             
             event.Skip()
-            pass
+            #pass
     
     def set_page_info(self, page_info):
@@ -760 +767 @@
         """
         # date and time
-        year, month, day, hour, minute, second, tda, ty, tm_isdst \
-            = time.localtime()
+        year, month, day, hour, minute, second, _, _, _ = time.localtime()
         current_time = str(hour) + ":" + str(minute) + ":" + str(second)
         current_date = str(month) + "/" + str(day) + "/" + str(year)
@@ -1123 +1129 @@
                         not item in self.model.details:
                         self.model.details[item] = ["", None, None]
-                for k, v in self.state.disp_cb_dict.iteritems():
-                    self.disp_cb_dict = copy.deepcopy(state.disp_cb_dict)
-                    self.state.disp_cb_dict = copy.deepcopy(state.disp_cb_dict)
+                self.disp_cb_dict = copy.deepcopy(state.disp_cb_dict)
+                self.state.disp_cb_dict = copy.deepcopy(state.disp_cb_dict)
         ## smearing info  restore
         if hasattr(self, "enable_smearer"):
@@ -1212 +1217 @@
             formfactor_pos = 0
             for ind_form in range(self.formfactorbox.GetCount()):
-                if self.formfactorbox.GetString(ind_form) == (state.formfactorcombobox):
+                if self.formfactorbox.GetString(ind_form) == \
+                                                    (state.formfactorcombobox):
                     formfactor_pos = int(ind_form)
                     break
@@ -1224 +1230 @@
             structfactor_pos = 0
             for ind_struct in range(self.structurebox.GetCount()):
-                if self.structurebox.GetString(ind_struct) == (state.structurecombobox):
+                if self.structurebox.GetString(ind_struct) == \
+                                                    (state.structurecombobox):
                     structfactor_pos = int(ind_struct)
                     break
@@ -1383 +1390 @@
         if self.parent != None:
             self._default_save_location = \
-                        self.parent.parent._default_save_location
+                        self.parent.parent.get_save_location()
         dlg = wx.FileDialog(self, "Choose a weight file",
                                 self._default_save_location, "",
@@ -1397 +1404 @@
         reset the context menu
         """
-        for name, state in self.state.saved_states.iteritems():
+        for name, _ in self.state.saved_states.iteritems():
             self.number_saved_state += 1
             ## Add item in the context menu
@@ -1898 +1905 @@
         x, y = self.model.getProfile()
 
-        from danse.common.plottools import Data1D
+        from danse.common.plottools import Data1D as pf_data1d
         #from sans.perspectives.theory.profile_dialog import SLDPanel
         from sans.guiframe.local_perspectives.plotting.profile_dialog \
         import SLDPanel
-        sld_data = Data1D(x, y)
+        sld_data = pf_data1d(x, y)
         sld_data.name = 'SLD'
         sld_data.axes = self.sld_axes
@@ -2016 +2023 @@
         wx.PostEvent(self.parent, StatusEvent(status=msg))
         # Flag to register when a parameter has changed.
-        is_modified = False
+        #is_modified = False
         if tcrtl.GetValue().lstrip().rstrip() != "":
             try:
-                value = float(tcrtl.GetValue())
+                float(tcrtl.GetValue())
                 tcrtl.SetBackgroundColour(wx.WHITE)
                 # If qmin and qmax have been modified, update qmin and qmax
@@ -2045 +2052 @@
                     if temp_npts != self.num_points:
                         self.num_points = temp_npts
-                        is_modified = True
+                        #is_modified = True
                 else:
                     msg = "Cannot Plot :No npts in that Qrange!!!  "
@@ -2146 +2153 @@
         if form_factor != None:
             # set multifactor for Mutifunctional models
-            if form_factor().__class__ in self.model_list_box["Multi-Functions"]:
+            if form_factor().__class__ in \
+                                        self.model_list_box["Multi-Functions"]:
                 m_id = self.multifactorbox.GetCurrentSelection()
                 multiplicity = form_factor().multiplicity_info[0]
@@ -2167 +2175 @@
                 # Check len of the text1 and max_multiplicity
                 text = ''
-                if form_factor.multiplicity_info[0] == len(form_factor.multiplicity_info[2]):
+                if form_factor.multiplicity_info[0] == \
+                                        len(form_factor.multiplicity_info[2]):
                     text = form_factor.multiplicity_info[2][self.multi_factor]
                 self.mutifactor_text1.SetLabel(text)
@@ -2273 +2282 @@
                 self.qmax.SetBackgroundColour("pink")
                 self.qmax.Refresh()
-                msg = "Npts of Data Error :No or too little npts of %s." % data.name
+                msg = "Npts of Data Error :"
+                msg += "No or too little npts of %s." % data.name
                 wx.PostEvent(self.parent.parent, StatusEvent(status=msg))
                 self.fitrange = False
@@ -2307 +2317 @@
                 self.qmax.SetBackgroundColour("pink")
                 self.qmax.Refresh()
-                msg = "Npts of Data Error :No or too little npts of %s." % data.name
+                msg = "Npts of Data Error :"
+                msg += "No or too little npts of %s." % data.name
                 wx.PostEvent(self.parent.parent, StatusEvent(status=msg))
                 self.fitrange = False
@@ -2389 +2400 @@
                 
                 if name in self.model.details.keys():
-                        self.model.details[name][1:3] = param_min, param_max
-                        is_modified = True
+                    self.model.details[name][1:3] = param_min, param_max
+                    is_modified = True
                 else:
-                        self.model.details[name] = ["", param_min, param_max]
-                        is_modified = True
+                    self.model.details[name] = ["", param_min, param_max]
+                    is_modified = True
             try:
                 # Check if the textctr is enabled
@@ -2707 +2718 @@
         #so that
         # it's not lost when we use the model within another thread.
-        #TODO: total hack - fix this
         self.state.model = self.model.clone()
         self.model._persistency_dict[name.split('.')[0]] = \
@@ -2846 +2856 @@
         
         : return graphs: list of figures
-        : TODO: Move to guiframe
+        : Need Move to guiframe
         """
         # set list of graphs
@@ -2854 +2864 @@
         gui_manager = self.parent.parent
         # loops through the panels [dic]
-        for item1, item2 in gui_manager.plot_panels.iteritems():
+        for _, item2 in gui_manager.plot_panels.iteritems():
             data_title = self.data.group_id
             # try to get all plots belonging to this control panel
@@ -2874 +2884 @@
         on 'More details' button
         """
-        from help_panel import  HelpWindow
+        from sans.perspectives.fitting.help_panel import  HelpWindow
         from sans.models import get_data_path
         
@@ -2922 +2932 @@
         # Figuring out key combo: Cmd for copy, Alt for paste
         if event.CmdDown() and event.ShiftDown():
-            flag = self.get_paste()
+            self.get_paste()
         elif event.CmdDown():
-            flag = self.get_copy()
+            self.get_copy()
         else:
             event.Skip()
@@ -2949 +2959 @@
             
             # go through the parameters
-            string = self._get_copy_helper(self.parameters,
+            strings = self._get_copy_helper(self.parameters,
                                            self.orientation_params)
-            content += string
+            content += strings
             
             # go through the fittables
-            string = self._get_copy_helper(self.fittable_param,
+            strings = self._get_copy_helper(self.fittable_param,
                                            self.orientation_params_disp)
-            content += string
+            content += strings
 
             # go through the fixed params
-            string = self._get_copy_helper(self.fixed_param,
+            strings = self._get_copy_helper(self.fixed_param,
                                            self.orientation_params_disp)
-            content += string
+            content += strings
                 
             # go through the str params
-            string = self._get_copy_helper(self.str_parameters,
+            strings = self._get_copy_helper(self.str_parameters,
                                            self.orientation_params)
-            content += string
+            content += strings
             return content
         else:
@@ -3027 +3037 @@
                 
                 disfunc = ',' + disfunc
-            # TODO: to support array func for copy/paste
+            # Need to support array func for copy/paste
             try:
                 if disfunc.count('array') > 0:
@@ -3052 +3062 @@
                 data = wx.TextDataObject()
                 # get wx dataobject
-                success = wx.TheClipboard.GetData(data)
+                #success = wx.TheClipboard.GetData(data)
                 # get text
                 text = data.GetText()
@@ -3269 +3279 @@
         """
             Method to be called by sub-classes
-            TODO: this method doesn't belong here
+            Moveit; This method doesn't belong here
         """
         print "BasicPage.update_pinhole_smear was called: skipping"