From 46dcda40600625d91458f822588dbb73805f3ded Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sun, 22 Mar 2015 12:10:53 +0900 Subject: [PATCH] Getting rid of relative scale because it was not very interesting --- client/index.html | 5 +---- client/scripts/grapher.js | 33 ++++++++++----------------------- client/scripts/search.js | 13 ++++++------- 3 files changed, 17 insertions(+), 34 deletions(-) diff --git a/client/index.html b/client/index.html index d2bb188..e205af8 100644 --- a/client/index.html +++ b/client/index.html @@ -65,10 +65,7 @@
- -
-
- +
diff --git a/client/scripts/grapher.js b/client/scripts/grapher.js index aa6ca78..9c9a4f9 100644 --- a/client/scripts/grapher.js +++ b/client/scripts/grapher.js @@ -304,15 +304,14 @@ // grapher.Grapher = function(params) { - var _canvas = params.canvas; - var _columns = {}; - var _data = {}; - var _range = new Range(params.range.min || -1.0, params.range.max || 1.0); - var _steps = params.steps || 20; - var _useLocalScale = params.useLocalScale || true; - var _useRelativeScale = params.useRelativeScale || true; - var _displayType = params.displayType || 'density'; - var _onValueChanged = params.onValueChanged; + var _canvas = params.canvas; + var _columns = {}; + var _data = {}; + var _range = new Range(params.range.min || -1.0, params.range.max || 1.0); + var _steps = params.steps || 20; + var _useLocalScale = params.useLocalScale || false; + var _displayType = params.displayType || 'density'; + var _onValueChanged = params.onValueChanged; function processHintParameters(columns) { var displayTypes = {compatibility: 'compatibility', density: 'count'}; @@ -331,12 +330,7 @@ return hint.rating; }); - var min = 0; - if (_useRelativeScale) { - min = _.min(ratings); - } - - return new Range(min, _.max(ratings)); + return new Range(0, _.max(ratings)); } function computeGlobalScale(columnsData) { @@ -357,7 +351,7 @@ this.setColumns = function(columnsData) { processHintParameters(columnsData); - var scale = 0; + var scale = null; if (!_useLocalScale) { scale = computeGlobalScale(columnsData); } @@ -395,13 +389,6 @@ } }; - this.setUseRelativeScale = function(useRelativeScale) { - if (useRelativeScale != _useRelativeScale) { - _useRelativeScale = useRelativeScale; - this.setColumns(_data); - } - }; - this.setDisplayType = function(displayType) { if (displayType != _displayType) { _displayType = displayType; diff --git a/client/scripts/search.js b/client/scripts/search.js index 987e8e7..0155d61 100644 --- a/client/scripts/search.js +++ b/client/scripts/search.js @@ -81,13 +81,12 @@ $.getJSON('/query', _ctx.query, function(results) { if (!_.has(_ctx, 'grapher')) { _ctx.grapher = new grapher.Grapher({ - canvas: new Snap('#svg'), - steps: _ctx.query.hintSteps, - range: _ctx.query.range, - onValueChanged: onAdjust, - displayType: $('#displayType').val(), - useLocalScale: $('#useLocalScale').is(':checked'), - useRelativeScale: $('#useRelativeScale').is(':checked') + canvas: new Snap('#svg'), + steps: _ctx.query.hintSteps, + range: _ctx.query.range, + onValueChanged: onAdjust, + displayType: $('#displayType').val(), + useLocalScale: $('#useLocalScale').is(':checked') }); $('#useLocalScale').click(function() {