added ability to open viewers on any viewer node or derivative

Fixes #1362 Also fixes some other bugs that impeded this from working.
2021-04-12 22:58:34 +10:00
parent 17f40cf91f
commit c03c197412
26 changed files with 173 additions and 85 deletions
@@ -382,14 +382,26 @@ NodeValueTable NodeValueTable::Merge(QList<NodeValueTable> tables)
  NodeValueTable merged_table;

  // Slipstreams all tables together
-  foreach (const NodeValueTable& t, tables) {
-    if (row >= t.Count()) {
-      continue;
+  while (true) {
+    bool all_merged = true;
+
+    foreach (const NodeValueTable& t, tables) {
+      if (row < t.Count()) {
+        all_merged = false;
+      } else {
+        continue;
+      }
+
+      int row_index = t.Count() - 1 - row;
+
+      merged_table.Prepend(t.at(row_index));
    }

-    int row_index = t.Count() - 1 - row;
+    row++;

-    merged_table.Prepend(t.at(row_index));
+    if (all_merged) {
+      break;
+    }
  }

  return merged_table;