Merge pull request #226 from wpfff/fix/invaliddata

Fix/invaliddata
toolsforexperiments · Sep 15, 2021 · e9e53fa · e9e53fa
2 parents 855ee5f + 7ed446a
commit e9e53fa
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 12 deletions.
diff --git a/plottr/apps/autoplot.py b/plottr/apps/autoplot.py
@@ -248,9 +248,16 @@ def setDefaults(self, data: DataDictBase) -> None:
         if len(axes) == 1:
             drs = {axes[0]: 'x-axis'}
 
-        self.fc.nodes()['Data selection'].selectedData = selected
-        self.fc.nodes()['Grid'].grid = GridOption.guessShape, {}
-        self.fc.nodes()['Dimension assignment'].dimensionRoles = drs
+        try:
+            self.fc.nodes()['Data selection'].selectedData = selected
+            self.fc.nodes()['Grid'].grid = GridOption.guessShape, {}
+            self.fc.nodes()['Dimension assignment'].dimensionRoles = drs
+        # FIXME: this is maybe a bit excessive, but trying to set all the defaults
+        #   like this can result in many types of errors.
+        #   a better approach would be to inspect the data better and make sure
+        #   we can set defaults reliably.
+        except:
+            pass
         unwrap_optional(self.plotWidget).update()
 
 

diff --git a/plottr/data/datadict.py b/plottr/data/datadict.py
@@ -988,11 +988,10 @@ def remove_invalid_entries(self) -> 'DataDict':
             except TypeError:
                 pass
 
-            idxs.append(_idxs)
+            idxs.append(_idxs.astype(int))
 
         if len(idxs) > 0:
-            remove_idxs = reduce(np.intersect1d,
-                                 tuple(np.array(idxs).astype(int)))
+            remove_idxs = reduce(np.intersect1d, tuple(idxs))
             for k, v in ret.data_items():
                 v['values'] = np.delete(v['values'], remove_idxs, axis=0)
 

diff --git a/plottr/node/node.py b/plottr/node/node.py
@@ -262,17 +262,28 @@ def process(self, dataIn: Optional[DataDictBase]=None) -> Optional[Dict[str, Opt
             _structChanged = False
             _shapesChanged = False
 
-            if daxes != self.dataAxes:
+            if self.dataAxes is None and daxes is not None:
+                _fieldsChanged = True
+                _structChanged = True
                 _axesChanged = True
-
-            if daxes != self.dataAxes or ddeps != self.dataDependents:
+            elif self.dataAxes is not None and daxes is None:
+                assert daxes is not None and self.dataAxes is not None
+                if set(daxes) != set(self.dataAxes):
+                    _axesChanged = True
+                    _fieldsChanged = True
+                    _structChanged = True
+
+            if self.dataDependents is None and ddeps is not None:
                 _fieldsChanged = True
+                _structChanged = True
+            else:
+                assert ddeps is not None and self.dataDependents is not None
+                if set(ddeps) != set(self.dataDependents):
+                    _fieldsChanged = True
+                    _structChanged = True
 
             if dtype != self.dataType:
                 _typeChanged = True
-
-            if dtype != self.dataType or daxes != self.dataAxes \
-                    or ddeps != self.dataDependents:
                 _structChanged = True
 
             if dshapes != self.dataShapes: