Merge pull request #86 from matthew-t-smith/fix/tabular-data

Fix: Update column width calculation
PyWorkflowApp · May 7, 2020 · a8a4a1d · a8a4a1d
2 parents 919549d + 887c745
commit a8a4a1d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/back-end/pyworkflow/pyworkflow/node_factory.py b/back-end/pyworkflow/pyworkflow/node_factory.py
@@ -34,6 +34,8 @@ def flow_node(node_key, node_info):
 def io_node(node_key, node_info):
     if node_key == 'ReadCsvNode':
         return ReadCsvNode(node_info)
+    elif node_key == 'TableCreatorNode':
+        return TableCreatorNode(node_info)
     elif node_key == 'WriteCsvNode':
         return WriteCsvNode(node_info)
     else:

diff --git a/back-end/pyworkflow/pyworkflow/nodes/io/__init__.py b/back-end/pyworkflow/pyworkflow/nodes/io/__init__.py
@@ -1,2 +1,3 @@
 from .read_csv import ReadCsvNode
 from .write_csv import WriteCsvNode
+from .table_creator import TableCreatorNode
diff --git a/...kflow/nodes/custom_nodes/table_creator.py → ...flow/pyworkflow/nodes/io/table_creator.py b/...kflow/nodes/custom_nodes/table_creator.py → ...flow/pyworkflow/nodes/io/table_creator.py
diff --git a/front-end/src/components/CustomNode/GraphView.js b/front-end/src/components/CustomNode/GraphView.js
@@ -23,7 +23,7 @@ export default class GraphView extends React.Component {
   };
 
   columnWidths = (index) => {
-    return 10 * this.state.widths[index];
+    return 12 * this.state.widths[index];
   };
 
   rowHeights = () => new Array(765)
@@ -56,11 +56,15 @@ export default class GraphView extends React.Component {
             for (let rowIndex = 0; rowIndex < rowCount; rowIndex++) {
               const row = data[column][rowIndex.toString()];
 
-              if (row != null && row.length > widths[index]) {
-                widths[index] = row.length;
+              if (row != null) {
+                  const rowContents = row.toString();
+
+                  if (rowContents.length > widths[index]) {
+                    widths[index] = rowContents.length;
+                  }
               }
 
-            maxWidth += widths[index] * 10;
+            maxWidth += widths[index] * 12;
             }
         }