Merge c6b3fa3 into d019f02

web-client/public/js/constants.js

@@ -20,4 +20,7 @@ export const DEMO_INFORMATION = [
     [ UNWEIGHTED_DEMO_ID, UNWEIGHTED_DEMO_PATH, UNWEIGHTED_DEMO_NAME ],
     [ SCHADE_INPUT_ID,    SCHADE_INPUT_PATH,    SCHADE_INPUT_NAME    ],
     [ SCHADE_OUTPUT_ID,   SCHADE_OUTPUT_PATH,   SCHADE_OUTPUT_NAME   ]
-];
+];
+
+export const MIN_EDGE_WEIGHT_NORMALIZATION = 0.0001;
+export const MAX_EDGE_WEIGHT_NORMALIZATION = 1000;

web-client/public/js/graph.js

@@ -1,4 +1,5 @@
 import Grid from "d3-v4-grid";
+import { grnState } from "./grnstate";
 const hasExpressionData = require("./node-coloring").hasExpressionData;
 
 /* globals d3 */
@@ -91,6 +92,8 @@ export var drawGraph = function (network, sliderController, nodeColoring) {
         document.getElementById("edge-weight-normalization-factor-menu").setAttribute("placeholder", "");
     } else {
         var maxWeight = d3.max(allWeights);
+        grnState.resetNormalizationMax = maxWeight;
+        grnState.normalizationMax = maxWeight;
         document.getElementById("normalization-max").setAttribute("placeholder", maxWeight);
         document.getElementById("edge-weight-normalization-factor-menu").setAttribute("placeholder", maxWeight);
     }

web-client/public/js/grnsight.js

@@ -10,8 +10,8 @@ import { grnState } from "./grnstate";
 import { updateApp } from "./update-app";
 import { setupHandlers } from "./setup-handlers";
 
-setupHandlers(grnState);
-updateApp(grnState);
-
 container();
 upload(sliderObject, sliderGroupController, drawGraph, nodeColoringController);
+
+setupHandlers(grnState);
+updateApp(grnState);

web-client/public/js/grnstate.js

@@ -42,5 +42,8 @@ export const grnState = {
 
     dashedLine: false,
 
-    annotateLinks: () => annotateLinks(currentNetwork)
+    annotateLinks: () => annotateLinks(currentNetwork),
+
+    normalizationMax : null,
+    resetNormalizationMax: null
 };

web-client/public/js/setup-handlers.js

@@ -19,4 +19,19 @@ export const setupHandlers = grnState => {
         grnState.dashedLine = !$(GREY_EDGES_DASHED_MENU).prop("checked");
         updateApp(grnState);
     });
+
+    $("#normalization-button").click(function () {
+        grnState.normalizationMax = $("#normalization-max").val();
+        updateApp(grnState);
+    });
+
+    $("#reset-normalization-factor-menu, #resetNormalizationButton").click(function () {
+        grnState.normalizationMax = grnState.resetNormalizationMax;
+        updateApp(grnState);
+    });
+
+    $("#edge-weight-normalization-factor-menu").on("change", function () {
+        grnState.normalizationMax = $("#edge-weight-normalization-factor-menu").val();
+        updateApp(grnState);
+    });
 };

web-client/public/js/update-app.js

@@ -4,7 +4,9 @@ import { displayWarnings } from "./warnings";
 
 import {
   GREY_EDGES_DASHED_MENU,
-  GREY_EDGES_DASHED_SIDEBAR
+  GREY_EDGES_DASHED_SIDEBAR,
+  MIN_EDGE_WEIGHT_NORMALIZATION,
+  MAX_EDGE_WEIGHT_NORMALIZATION
 } from "./constants";
 
 // In this transitory state, updateApp might get called before things are completely set up, so for now
@@ -39,6 +41,7 @@ const displayNetwork = (network, name) => {
 };
 
 export const updateApp = grnState => {
+
     if (grnState.newNetwork) {
         displayNetwork(grnState.network, grnState.name);
         refreshApp();
@@ -48,6 +51,27 @@ export const updateApp = grnState => {
         grnState.newNetwork = false;
     }
 
+    if (grnState.normalizationMax !== null) {
+        var valueValidator = (min, max, value) => {
+            return Math.min(max, Math.max(min, value));
+        };
+
+        var edgeWeightNormalizationInputValidation = (value) => {
+            return value ===
+            "" ? "" : valueValidator(MIN_EDGE_WEIGHT_NORMALIZATION, MAX_EDGE_WEIGHT_NORMALIZATION, value);
+        };
+
+        var synchronizeNormalizationValues = (value) => {
+            var validated = edgeWeightNormalizationInputValidation(value);
+            $("#normalization-max").val(validated);
+            $("#edge-weight-normalization-factor-menu").val(validated);
+        };
+
+        synchronizeNormalizationValues(grnState.normalizationMax);
+        refreshApp();
+    }
+
+// Dashed Line Synchronization
     if (grnState.dashedLine) {
         $(GREY_EDGES_DASHED_MENU + " span").addClass("glyphicon-ok");
         $(GREY_EDGES_DASHED_MENU).prop("checked", "checked");

web-client/public/js/upload.js

@@ -139,7 +139,7 @@ export const upload = function (sliderObject, sliderGroupController, drawGraph,
     var MIN_EDGE_WEIGHT_NORMALIZATION = 0.0001;
     var MAX_EDGE_WEIGHT_NORMALIZATION = 1000;
 
-    var valueValidator = function (min, max, value) {
+    let valueValidator = (min, max, value) => {
         return Math.min(max, Math.max(min, value));
     };