Changeset eddb6ec in sasview for src/sans/perspectives

Timestamp:

Apr 2, 2014 5:25:09 AM (11 years ago)

Author:

Tobias Richter <tobias.richter@…>

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:

6771d94

Parents:

8817d07

Message:

refs #57 Clean up warnings in Python code

Location:

src/sans/perspectives/fitting

Files:

• basepage.py (modified) (5 diffs)
• fitpanel.py (modified) (1 diff)
• pagestate.py (modified) (6 diffs)

src/sans/perspectives/fitting/basepage.py

@@ -496 +496 @@
         self.model_list_box = page_info.model_list_box
         ## Data member to store the dispersion object created
-        self.populate_box(dict=self.model_list_box)
+        self.populate_box(model_dict=self.model_list_box)
         
     def onContextMenu(self, event):
@@ -599 +599 @@
         self.state.manager = manager
         
-    def populate_box(self, dict):
+    def populate_box(self, model_dict):
         """
         Store list of model
         
-        :param dict: dictionary containing list of models
-        
-        """
-        self.model_list_box = dict
+        :param model_dict: dictionary containing list of models
+        
+        """
+        self.model_list_box = model_dict
         self.state.model_list_box = self.model_list_box
         self.initialize_combox()
@@ -928 +928 @@
                 f_select = self.formfactorbox.GetSelection()
                 if f_select > 0:
-                        self.state.formfactorcombobox = self.formfactorbox.\
-                        GetString(f_select)
+                    self.state.formfactorcombobox = self.formfactorbox.\
+                    GetString(f_select)
         if self.categorybox != None:
-                cb_select = self.categorybox.GetSelection()
-                if cb_select > 0:
-                        self.state.categorycombobox = self.categorybox.\
-                        GetString(cb_select)                
-        #save radiobutton state for model selection
-        #self.state.shape_rbutton = self.shape_rbutton.GetValue()
-        #self.state.shape_indep_rbutton = self.shape_indep_rbutton.GetValue()
-        #self.state.struct_rbutton = self.struct_rbutton.GetValue()
-        #self.state.plugin_rbutton = self.plugin_rbutton.GetValue()
+            cb_select = self.categorybox.GetSelection()
+            if cb_select > 0:
+                self.state.categorycombobox = self.categorybox.\
+                GetString(cb_select)
         
         self.state.enable2D = copy.deepcopy(self.enable2D)
@@ -1045 +1040 @@
             if len(self.disp_cb_dict) > 0:
                 for k, v in self.disp_cb_dict.iteritems():
-         
                     if v == None:
                         self.state.disp_cb_dict[k] = v
@@ -1053 +1047 @@
                         except:
                             self.state.disp_cb_dict[k] = None
-           
             if len(self._disp_obj_dict) > 0:
                 for k, v in self._disp_obj_dict.iteritems():

src/sans/perspectives/fitting/fitpanel.py

@@ -384 +384 @@
         panel._set_save_flag(not panel.batch_on)
         panel.set_model_dictionary(self.model_dictionary)
-        panel.populate_box(dict=self.model_list_box)
+        panel.populate_box(model_dict=self.model_list_box)
         panel.formfactor_combo_init()
         panel.set_manager(self._manager)

src/sans/perspectives/fitting/pagestate.py

@@ -17 +17 @@
 import logging
 import numpy
+import string
 
 import xml.dom.minidom
-from xml.dom.minidom import parse
 from lxml import etree
 
@@ -193 +193 @@
         ##page name
         self.page_name = ""
-        # Contains link between  model ,all its parameters, and panel organization
+        # Contains link between model, all its parameters, and panel organization
         self.parameters = []
         # String parameter list that can not be fitted
@@ -205 +205 @@
         ## orientation parameters
         self.orientation_params = []
-        ## orientation parmaters for gaussian dispersity
+        ## orientation parameters for gaussian dispersity
         self.orientation_params_disp = []
         ## smearer info
@@ -216 +216 @@
         self.dxl = None
         self.dxw = None
-        #list of dispersion paramaters
+        #list of dispersion parameters
         self.disp_list = []
         if self.model is not None:
@@ -600 +600 @@
         : param figs: list of pylab figures [list]
         """
-        from report_dialog import ReportDialog
+        from sans.perspectives.fitting.report_dialog import ReportDialog
         # get the strings for report
         html_str, text_str, title = self.set_report_string()
@@ -630 +630 @@
         dialog.ShowModal()
         
-    def _toXML_helper(self, list, element, newdoc):
+    def _toXML_helper(self, thelist, element, newdoc):
         """
         Helper method to create xml file for saving state
         """
-        for item in list:
+        for item in thelist:
             sub_element = newdoc.createElement('parameter')
             sub_element.setAttribute('name', str(item[1]))