Changeset a0a4486 in sasview for invariantview/perspectives

Timestamp:

Mar 24, 2010 6:14:33 PM (14 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:

da87bce

Parents:

d3fac18

Message:

error checking on data

File:

• invariantview/perspectives/invariant/invariant_panel.py (modified) (5 diffs)

invariantview/perspectives/invariant/invariant_panel.py

@@ -91 +91 @@
         #Draw the panel
         self._do_layout()
+        if self.parent is not None:
+            msg = ""
+            wx.PostEvent(self.parent, StatusEvent(status= msg))
        
+    def err_check_on_data(self):
+        """
+            Check if data is valid for further computation
+        """
+        flag = False
+        #edit the panel
+        if self._data is not None:
+            if len(self._data.x[self._data.x==0]) > 0:
+                flag = True
+                msg = "Invariant: one of your q-values is zero. Delete that entry before proceeding"
+                wx.PostEvent(self.parent, StatusEvent(status= msg, type="stop")) 
+        return flag
+    
     def set_data(self, data):
         """
@@ -99 +115 @@
         #edit the panel
         if self._data is not None:
+            self.err_check_on_data()
             data_name = self._data.name
             data_qmin = min (self._data.x)
@@ -342 +359 @@
         msg= ""
         wx.PostEvent(self.parent, StatusEvent(status= msg))
-        if self._data is None:
+        if self._data is None or self.err_check_on_data():
             return
+    
         #clear outputs textctrl 
         self._reset_output()
@@ -370 +388 @@
         #check the type of extrapolation
         extrapolation = self.get_extrapolation_type(low_q=low_q, high_q=high_q)
-        #prepare a new container to put result of invariant
-        self.inv_container = InvariantContainer()
+       
         #Compute invariant
         try:
@@ -415 +432 @@
         self.surface_tcl.Clear()
         self.surface_err_tcl.Clear()
+        #prepare a new container to put result of invariant
+        self.inv_container = InvariantContainer()
         
     def _define_structure(self):