Changeset fe9cb70e in sasview

Timestamp:

Jun 4, 2012 3:27:30 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:

0371eae

Parents:

ed09638

Message:

fixing pylint warnings

Files:

• fittingview/src/sans/perspectives/fitting/simfitpage.py (modified) (2 diffs)
• sansguiframe/src/sans/guiframe/data_state.py (modified) (1 diff)
• sansguiframe/src/sans/guiframe/local_perspectives/plotting/Arc.py (modified) (2 diffs)

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

@@ -658 +658 @@
             ctl2 = item[3]
             if ctl2.GetValue().lstrip().rstrip() == "":
-                model = param_cbox.GetClientData(param_cbox.GetCurrentSelection())
-                msg = " Enter a constraint for %s.%s! "%(model.name, 
+                model = param_cbox.GetClientData(\
+                                            param_cbox.GetCurrentSelection())
+                if model != None:
+                    msg = " Enter a constraint for %s.%s! "%(model.name, 
                                                         param_cbox.GetString(0))
+                else:
+                     msg = " Enter a constraint"
                 wx.PostEvent(self.parent.parent, StatusEvent(status=msg))
                 return
@@ -707 +711 @@
         if self.batch_on:
             if self.sizer2.IsShown():
-                self.sizer2.Hide()
+                self.sizer2.Show(False)
             return
         box_description= wx.StaticBox(self, -1, "Fit Constraints")

sansguiframe/src/sans/guiframe/data_state.py

@@ -35 +35 @@
             _str += "Data name : %s \n" % str(self.data.name)
             _str += "Data ID : %s \n" % str(self.data.id)
-        else:
-            _str += "Theory Data: %s \n" % str(self.theory_data)
-        if self.theory_data is not None:
-            _str += "Data name : %s \n" % str(self.theory_data.name)
-            _str += "Theory Data ID : %s \n" % str(self.theory_data.id)
-        else:
-            _str += "Theory Data: %s \n" % str(self.theory_data)
-            
         _str += "Theories available: %s \n" % len(self.theory_list)
         if self.theory_list:

sansguiframe/src/sans/guiframe/local_perspectives/plotting/Arc.py

@@ -50 +50 @@
         self.clear_markers()
         try:
-            self.marker.remove()
+            for item in self.markers:
+                item.remove()
             self.arc.remove()
         except:
@@ -161 +162 @@
         """
         x = params["radius"] 
-        self.set_cursor(x, self._mouse_y)
+        phi_max = self.theta2
+        nbins = self.npts
+        self.set_cursor(x, self._mouse_y, phi_max, nbins)