fixed comparator with given rtol/atol

gdementen · gdementen · commit 10f9f22e67cc · 2019-10-10T14:19:47.000+02:00
diff --git a/larray_editor/comparator.py b/larray_editor/comparator.py
@@ -62,15 +62,6 @@ def __init__(self, parent=None, bg_gradient='red-white-blue', rtol=0, atol=0, na
 
         self.arraywidget.btn_layout.addLayout(tolerance_layout)
 
-        if rtol > 0 and atol > 0:
-            raise ValueError("Arguments 'rtol' and 'atol' cannot be used together.")
-        if rtol > 0:
-            self.tolerance_combobox.setCurrentText("relative")
-            self.tolerance_line_edit.setText(str(rtol))
-        if atol > 0:
-            self.tolerance_combobox.setCurrentText("absolute")
-            self.tolerance_line_edit.setText(str(atol))
-
         self.nans_equal = nans_equal
 
         # add local arraywidget to layout
@@ -83,6 +74,15 @@ def __init__(self, parent=None, bg_gradient='red-white-blue', rtol=0, atol=0, na
         self.bg_value = None
         self.stack_axis = None
 
+        if rtol > 0 and atol > 0:
+            raise ValueError("Arguments 'rtol' and 'atol' cannot be used together.")
+        if rtol > 0:
+            self.tolerance_combobox.setCurrentText("relative")
+            self.tolerance_line_edit.setText(str(rtol))
+        if atol > 0:
+            self.tolerance_combobox.setCurrentText("absolute")
+            self.tolerance_line_edit.setText(str(atol))
+
     # override keyPressEvent to prevent pressing Enter after changing the tolerance value
     # in associated QLineEdit to close the parent dialog box
     def keyPressEvent(self, event):
@@ -111,6 +111,9 @@ def set_data(self, arrays, stack_axis):
         self.update_isequal()
 
     def update_isequal(self):
+        if self.array is None:
+            return
+
         try:
             tol_str = self.tolerance_line_edit.text()
             tol = ast.literal_eval(tol_str) if tol_str else 0
