Changeset fe98127 in sasview

Timestamp:

Oct 13, 2011 11:09:27 AM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

b18cf3d

Parents:

5d0a786

Message:

check if the view object is a plottable

File:

• sansguiframe/src/sans/guiframe/data_processor.py (modified) (2 diffs)

sansguiframe/src/sans/guiframe/data_processor.py

@@ -18 +18 @@
 from sans.guiframe.events import NewPlotEvent 
 from sans.guiframe.events import StatusEvent  
+from danse.common.plottools import plottables
 from sans.guiframe.dataFitting import Data1D
 
@@ -689 +690 @@
                 value = values[row -1]
                 if issubclass(value.__class__, BatchCell):
+                    if value.object is None or len(value.object) == 0:
+                        msg = "Row %s , " % str(row)
+                        msg += "Column %s doesn't have a view" % str(label)
+                        #raise ValueError, msg
+                        wx.PostEvent(self.parent.parent, StatusEvent(status=msg, 
+                                                                info="error")) 
+                        return
                     for new_plot in value.object:
-                        if new_plot is None:
+                        if new_plot is None or \
+                         not issubclass(value.object.__class__, 
+                                        plottables.Plottable):
                             msg = "Row %s , " % str(row)
                             msg += "Column %s doesn't have a view" % str(label)