Merge branch 'plotInHistory' into cookBux

saqc/funcs/tools.py

@@ -349,8 +349,6 @@ def plot(
     if to_mask < np.inf:
         data = data.copy()
         data.loc[flags[field] >= to_mask, field] = np.nan
-        if level <= to_mask:
-            history = None
 
     if store_kwargs is None:
         store_kwargs = {}

saqc/lib/plotting.py

@@ -141,7 +141,7 @@ def makeFig(
     d = d[~na_mask]
 
     # insert nans between values mutually spaced > max_gap
-    if max_gap:
+    if max_gap and not d.empty:
         d = _insertBlockingNaNs(d, max_gap)
 
     # figure composition
@@ -229,6 +229,11 @@ def _plotVarWithFlags(
                 if ~(flags_i >= level).any():
                     continue
 
+                # Also skip plot, if all flagged values are np.nans (to catch flag missing and masked results mainly)
+                temp_i = datser.index.join(flags_i.index, how="inner")
+                if datser[temp_i][flags_i[temp_i].notna()].isna().all():
+                    continue
+
                 scatter_kwargs.update(
                     {"color": next(color_cycle), "marker": next(shape_cycle)}
                 )