v1.1.0

* WIP #979 Added 'xlabel', 'ylabel' to deepforge.Graph

* WIP #979 Added 'xlabel','ylabel' to the Graph metadata

* WIP #979 Updated graph to show xlabel, ylabel

package.json

@@ -17,7 +17,7 @@
     "watch-test": "nodemon --exec 'mocha --recursive test'",
     "build-nn": "node ./utils/nn-parser.js"
   },
-  "version": "1.0.0",
+  "version": "1.1.0",
   "dependencies": {
     "commander": "^2.9.0",
     "dotenv": "^2.0.0",

src/common/Constants.js

@@ -30,6 +30,10 @@
         GRAPH_CREATE: 'GRAPH',
         GRAPH_PLOT: 'PLOT',
         GRAPH_CREATE_LINE: 'LINE',
+        GRAPH_LABEL_AXIS: {
+            X: 'X',
+            Y: 'Y'
+        },
 
         // Code Generation Constants
         CTOR_ARGS_ATTR: 'ctor_arg_order',

src/decorators/OperationDecorator/EasyDAG/OperationDecorator.EasyDAGWidget.js

@@ -2,9 +2,11 @@
 /*jshint browser: true, camelcase: false*/
 
 define([
+    'deepforge/Constants',
     'decorators/EllipseDecorator/EasyDAG/EllipseDecorator.EasyDAGWidget',
     'css!./OperationDecorator.EasyDAGWidget.css'
 ], function (
+    CONSTANTS,
     DecoratorBase
 ) {
 
@@ -13,6 +15,7 @@ define([
     var OperationDecorator,
         NAME_MARGIN = 25,
         DECORATOR_ID = 'OperationDecorator',
+        OPERATION_COLORS = {},
         PORT_TOOLTIP_OPTS = {
             tipJoint: 'left',
             removeElementsOnHide: true,
@@ -24,8 +27,9 @@ define([
     //     - highlight ports
     //     - unhighlight ports
     //     - report the location of specific ports
+    OPERATION_COLORS[CONSTANTS.OP.OUTPUT] = '#b0bec5';
     OperationDecorator = function (options) {
-        options.color = options.color || '#78909c';
+        options.color = options.color || OPERATION_COLORS[options.node.name] || '#78909c';
         DecoratorBase.call(this, options);
 
         this.id = this._node.id;

src/plugins/ExecuteJob/ExecuteJob.Metadata.js

@@ -30,6 +30,30 @@ define([
         this._metadata[id] = graph;
     };
 
+    ExecuteJob.prototype[CONSTANTS.GRAPH_LABEL_AXIS.X] = function (job, id) {
+        var name = Array.prototype.slice.call(arguments, 2).join(' '),
+            jobId = this.core.getPath(job),
+            graph;
+
+        id = jobId + '/' + id;
+        this.logger.info(`Labeling the x-axis of ${id}: ${name}`);
+
+        graph = this._metadata[id];
+        this.setAttribute(graph, 'xlabel', name);
+    };
+
+    ExecuteJob.prototype[CONSTANTS.GRAPH_LABEL_AXIS.Y] = function (job, id) {
+        var name = Array.prototype.slice.call(arguments, 2).join(' '),
+            jobId = this.core.getPath(job),
+            graph;
+
+        id = jobId + '/' + id;
+        this.logger.info(`Labeling the y-axis of ${id}: ${name}`);
+
+        graph = this._metadata[id];
+        this.setAttribute(graph, 'ylabel', name);
+    };
+
     ExecuteJob.prototype[CONSTANTS.GRAPH_PLOT] = function (job, id, x, y) {
         var jobId = this.core.getPath(job),
             nonNum = /[^\d-\.]*/g,

src/plugins/ExecuteJob/templates/deepforge.ejs

@@ -52,6 +52,14 @@ function Graph:line(name, opts)
     return deepforge._Line(self.id, name, opts)
 end
 
+function Graph:xlabel(name)
+    deepforge._cmd('<%= GRAPH_LABEL_AXIS.X %>', self.id, name)
+end
+
+function Graph:ylabel(name)
+    deepforge._cmd('<%= GRAPH_LABEL_AXIS.Y %>', self.id, name)
+end
+
 -- Image support
 local function saveImage(name, tensor)
     require 'image'

src/seeds/pipeline/version.txt

@@ -1 +1 @@
-0.4.1
+0.5.0

src/visualizers/panels/LineGraph/LineGraphControl.js

@@ -99,6 +99,9 @@ define([
 
                 desc.type = 'line';
                 desc.points = points;
+            } else {
+                desc.xlabel = node.getAttribute('xlabel');
+                desc.ylabel = node.getAttribute('ylabel');
             }
         }
 

src/visualizers/panels/PipelineEditor/PipelineEditorControl.js

@@ -32,9 +32,7 @@ define([
             SRC: 'src',
             DST: 'dst'
         },
-        DECORATORS = {
-            ArtifactFinder: 'ArtifactOpDecorator'
-        },
+        DECORATORS = {},
         WIDGET_NAME = 'EasyDAG';
 
     DECORATORS[CONSTANTS.OP.INPUT] = 'ArtifactOpDecorator';

src/visualizers/widgets/ExecutionView/SelectionManager.js

@@ -23,7 +23,9 @@ define([
         var jobName = this.selectedItem.desc.name;
 
         // Check if it is an Input or Output job
-        if (jobName !== CONSTANTS.OP.INPUT && jobName !== CONSTANTS.OP.OUTPUT) {
+        if (!this.selectedItem.isConnection && jobName !== CONSTANTS.OP.INPUT &&
+            jobName !== CONSTANTS.OP.OUTPUT) {
+
             new Buttons.Enter({
                 context: this._widget,
                 $pEl: this.$selection,

src/visualizers/widgets/LineGraph/LineGraphWidget.js

@@ -42,17 +42,16 @@ define([
 
             chart.xAxis
                 .tickFormat(d3.format(',r'));
-
-            if (this.options.xAxis) {
-                chart.xAxis
-                    .axisLabel(this.options.xAxis);
-            }
-
             chart.yAxis.tickFormat(d3.format('.02f'));
+
             if (this.options.yAxis) {
                 chart.yAxis
                     .axisLabel(this.options.yAxis);
             }
+            if (this.options.xAxis) {
+                chart.xAxis
+                    .axisLabel(this.options.xAxis);
+            }
 
             var myData = this.getData();
 
@@ -83,6 +82,9 @@ define([
                     key: desc.name,
                     values: desc.points
                 };
+            } else {
+                this.options.xAxis = desc.xlabel;
+                this.options.yAxis = desc.ylabel;
             }
             this.refreshChart();
         }
@@ -94,11 +96,14 @@ define([
     };
 
     LineGraphWidget.prototype.updateNode = function (desc) {
-        if (desc && this.lineData[desc.id]) {
+        if (this.lineData[desc.id]) {
             this.lineData[desc.id].values = desc.points;
             this.lineData[desc.id].key = desc.name;
-            this.refreshChart();
+        } else {
+            this.options.xAxis = desc.xlabel;
+            this.options.yAxis = desc.ylabel;
         }
+        this.refreshChart();
     };
 
     LineGraphWidget.prototype.onWidgetContainerResize = function(width, height) {
@@ -111,6 +116,17 @@ define([
 
     LineGraphWidget.prototype.updateChartData = function () {
         if (this.$chart && this.chart) {
+
+            if (this.options.yAxis) {
+                this.chart.yAxis
+                    .axisLabel(this.options.yAxis || '');
+            }
+            if (this.options.xAxis) {
+                this.chart.xAxis
+                    .axisLabel(this.options.xAxis || '');
+            }
+
+
             this.$chart
                 .datum(this.getData())
                 .call(this.chart);