Commit 955197e2 authored by jgould's avatar jgould

renamed variables

parent 1e218ac5
...@@ -7,8 +7,8 @@ morpheus.AbstractColorSupplier = function() { ...@@ -7,8 +7,8 @@ morpheus.AbstractColorSupplier = function() {
this.missingColor = '#c0c0c0'; this.missingColor = '#c0c0c0';
this.scalingMode = morpheus.HeatMapColorScheme.ScalingMode.RELATIVE; this.scalingMode = morpheus.HeatMapColorScheme.ScalingMode.RELATIVE;
this.stepped = false; this.stepped = false;
this._sizer = new morpheus.HeatMapSizer(); this.sizer = new morpheus.HeatMapSizer();
this._conditions = new morpheus.HeatMapConditions(); this.conditions = new morpheus.HeatMapConditions();
}; };
morpheus.AbstractColorSupplier.fromJson = function(json) { morpheus.AbstractColorSupplier.fromJson = function(json) {
var cs = json.stepped ? new morpheus.SteppedColorSupplier() var cs = json.stepped ? new morpheus.SteppedColorSupplier()
...@@ -30,10 +30,10 @@ morpheus.AbstractColorSupplier.fromJson = function(json) { ...@@ -30,10 +30,10 @@ morpheus.AbstractColorSupplier.fromJson = function(json) {
morpheus.AbstractColorSupplier.prototype = { morpheus.AbstractColorSupplier.prototype = {
discrete : false, discrete : false,
getSizer : function() { getSizer : function() {
return this._sizer; return this.sizer;
}, },
getConditions : function() { getConditions : function() {
return this._conditions; return this.conditions;
}, },
isDiscrete : function() { isDiscrete : function() {
return this.discrete; return this.discrete;
...@@ -54,11 +54,11 @@ morpheus.AbstractColorSupplier.prototype = { ...@@ -54,11 +54,11 @@ morpheus.AbstractColorSupplier.prototype = {
if (this.names != null) { if (this.names != null) {
c.names = this.names.slice(0); c.names = this.names.slice(0);
} }
if (this._sizer) { if (this.sizer) {
c._sizer = this._sizer.copy(); c.sizer = this.sizer.copy();
} }
if (this._conditions) { if (this.conditions) {
c._conditions = this._conditions.copy(); c.conditions = this.conditions.copy();
} }
c.scalingMode = this.scalingMode; c.scalingMode = this.scalingMode;
c.min = this.min; c.min = this.min;
......
...@@ -427,8 +427,8 @@ morpheus.HeatMapColorScheme.prototype = { ...@@ -427,8 +427,8 @@ morpheus.HeatMapColorScheme.prototype = {
var oldColorSupplier = this.currentColorSupplier; var oldColorSupplier = this.currentColorSupplier;
var newColorSupplier = stepped ? new morpheus.SteppedColorSupplier() var newColorSupplier = stepped ? new morpheus.SteppedColorSupplier()
: new morpheus.GradientColorSupplier(); : new morpheus.GradientColorSupplier();
newColorSupplier._sizer = oldColorSupplier.getSizer(); newColorSupplier.sizer = oldColorSupplier.getSizer();
newColorSupplier._conditions = oldColorSupplier.getConditions(); newColorSupplier.conditions = oldColorSupplier.getConditions();
newColorSupplier.getScalingMode(oldColorSupplier.getScalingMode()); newColorSupplier.getScalingMode(oldColorSupplier.getScalingMode());
newColorSupplier.setMin(oldColorSupplier.getMin()); newColorSupplier.setMin(oldColorSupplier.getMin());
newColorSupplier.setMax(oldColorSupplier.getMax()); newColorSupplier.setMax(oldColorSupplier.getMax());
...@@ -449,8 +449,8 @@ morpheus.HeatMapColorScheme.prototype = { ...@@ -449,8 +449,8 @@ morpheus.HeatMapColorScheme.prototype = {
_.each(_.keys(this.rowValueToColorSupplier), function(key) { _.each(_.keys(this.rowValueToColorSupplier), function(key) {
// save each scheme // save each scheme
var val = _this.rowValueToColorSupplier[key]; var val = _this.rowValueToColorSupplier[key];
delete val._sizer; // delete val.sizer;
delete val._conditions; // delete val.conditions;
json.colorSchemes[key] = val; json.colorSchemes[key] = val;
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment