Changeset 4752c31 in sasview for calculatorview/src

Timestamp:

Jun 4, 2012 5:34:07 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:

3f68e93

Parents:

da7cacb

Message:

fixing pylint warnings

File:

• calculatorview/src/sans/perspectives/calculator/sld_panel.py (modified) (3 diffs)

calculatorview/src/sans/perspectives/calculator/sld_panel.py

@@ -60 +60 @@
         self.compound_ctl = None
         self.density_ctl = None
+        self.compound = ""
+        self.density = ""
         self.wavelength_ctl = None
         self.neutron_sld_real_ctl = None
@@ -305 +307 @@
         energy = xray_energy(element.K_alpha)
         
-        self.sld_formula = formula(str(user_formula), density=self.density)
+        self.sld_formula = formula(str(self.compound), density=self.density)
         atom = self.sld_formula.atoms
         return xray_sld_from_atoms(atom, density=self.density, energy= energy)
@@ -320 +322 @@
     
         self.wavelength = self.wavelength_ctl.GetValue()
-        if self.wavelength.lstrip().rstrip() == "":
+        if str(self.wavelength).lstrip().rstrip() == "":
             self.wavelength = WAVELENGTH
             self.wavelength_ctl.SetValue(str(WAVELENGTH))