Changeset 1ec979d in sasview

Timestamp:

Oct 14, 2011 3:49:22 PM (13 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:

466dae7

Parents:

c27a111

Message:

gave sleep0.5 for error msg and send nan_to_num for nan to plottools

Files:

• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (2 diffs)
• sansguiframe/src/sans/guiframe/data_processor.py (modified) (8 diffs)

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

@@ -1465 +1465 @@
         """ 
         try:
+            numpy.nan_to_num(y)
+            
             new_plot = Data1D(x=x, y=y)
             new_plot.is_data = False
@@ -1551 +1553 @@
         that can be plot.
         """
+        numpy.nan_to_num(image)
         new_plot= Data2D(image=image, err_image=data.err_data)
         new_plot.name = model.name

sansguiframe/src/sans/guiframe/data_processor.py

@@ -5 +5 @@
 import numpy
 import math
+import time
 import re
 import os
@@ -745 +746 @@
                     wx.PostEvent(self.parent.parent, StatusEvent(status=msg, 
                                                                 info="error"))
+                    time.sleep(0.5)
                     continue
                 else:
@@ -767 +769 @@
                             wx.PostEvent(self.parent.parent, 
                                  StatusEvent(status=msg, info="error")) 
+                            time.sleep(0.5)
                             continue
                         
@@ -785 +788 @@
                                     wx.PostEvent(self.parent.parent, 
                                                  StatusEvent(status=msg,
-                                                              info="error")) 
+                                                              info="error"))
+                                    time.sleep(0.5) 
                                     continue  
                         """
@@ -795 +799 @@
                         wx.PostEvent(self.parent.parent, 
                                      NewPlotEvent(plot=new_plot, 
-                                                  group_id=str(group_id),
-                                                  title=title))  
+                                                group_id=str(new_plot.group_id),
+                                                title=title))  
                         msg = "Plotting the View Results  completed!"
                         wx.PostEvent( self.parent.parent, 
@@ -808 +812 @@
                     wx.PostEvent(self.parent.parent, 
                          StatusEvent(status=msg, info="error")) 
+                    time.sleep(0.5)
                     continue
     
@@ -863 +868 @@
         title = "%s vs %s" % (self.y_axis_title.GetValue(), 
                               self.x_axis_title.GetValue())
-        new_plot.xaxis(self.x_axis_title.GetValue(), self.x_axis_unit.GetValue())
-        new_plot.yaxis(self.y_axis_title.GetValue(), self.y_axis_unit.GetValue())
+        new_plot.xaxis(self.x_axis_title.GetValue(), 
+                       self.x_axis_unit.GetValue())
+        new_plot.yaxis(self.y_axis_title.GetValue(), 
+                       self.y_axis_unit.GetValue())
         try:
             title = self.notebook.GetPageText(pos)
@@ -871 +878 @@
             new_plot.ytransform  = "y"  
             wx.PostEvent(self.parent.parent, 
-                             NewPlotEvent(plot=new_plot, 
+                        NewPlotEvent(plot=new_plot, 
                         group_id=str(new_plot.group_id), title =title)) 
             msg = "Plotting completed!"