Changeset 052a66bc in sasview for guitools/fitDialog.py

Timestamp:

May 30, 2008 12:14:48 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

be0ea2a

Parents:

6a8adb0

Message:

Bug fixing

File:

• guitools/fitDialog.py (modified) (3 diffs)

guitools/fitDialog.py

@@ -13 +13 @@
         Return a float in a standardized, human-readable formatted string 
     """
+    try: 
+        value = float(value)
+    except:
+        print "returning 0"
+        return "0"
+    
     if high:
         return "%-6.4g" % value
@@ -130 +136 @@
         iy += 1
         ix = 0
-        sizer.Add(wx.StaticText(self, -1, 'Plotted range'),(iy, ix),(1,1),\
+        sizer.Add(wx.StaticText(self, -1, 'Maximum range'),(iy, ix),(1,1),\
                    wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix +=1
@@ -190 +196 @@
         
         if self.Avalue==None:
-            self.tcA.SetLabel(str(self.default_A))
+            self.tcA.SetLabel(format_number(self.default_A))
         else :
-            self.tcA.SetLabel(str(self.Avalue))
+            self.tcA.SetLabel(format_number(self.Avalue))
         if self.Bvalue==None:
-            self.tcB.SetLabel(str(self.default_B))
+            self.tcB.SetLabel(format_number(self.default_B))
         else:
-            self.tcB.SetLabel(str(self.Bvalue))
+            self.tcB.SetLabel(format_number(self.Bvalue))
         if self.ErrAvalue==None:
-            self.tcErrA.SetLabel(str(0.0))
+            self.tcErrA.SetLabel(format_number(0.0))
         else:
-            self.tcErrA.SetLabel(str(self.ErrAvalue))
+            self.tcErrA.SetLabel(format_number(self.ErrAvalue))
         if self.ErrBvalue==None:
-            self.tcErrB.SetLabel(str(0.0))
+            self.tcErrB.SetLabel(format_number(0.0))
         else:
-            self.tcErrB.SetLabel(str(self.ErrBvalue))
+            self.tcErrB.SetLabel(format_number(self.ErrBvalue))
         if self.Chivalue==None:
-            self.tcChi.SetLabel(str(0.0))
+            self.tcChi.SetLabel(format_number(0.0))
         else:
-            self.tcChi.SetLabel(str(self.Chivalue))
+            self.tcChi.SetLabel(format_number(self.Chivalue))
         if self.plottable.x !=[]:
             self.mini =min(self.plottable.x)