Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Store gradient/color information in DB [ Fixes #307 ] #322

Merged
merged 3 commits into from
Apr 5, 2020
Merged

Store gradient/color information in DB [ Fixes #307 ] #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e3279b
Store gradient/color information in DB
cjchirag7 Apr 5, 2020
44ff1a6
Maintain the default colors, on changing number of intervals
cjchirag7 Apr 5, 2020
9e78647
Change setting.color to setting.colors[0]
cjchirag7 Apr 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion apps/heatmap/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,17 @@ function initCore() {
editedData: $D.editedDataClusters,
size: $D.heatMapData.provenance.analysis.size,
fields: $D.heatMapData.provenance.analysis.fields,
color: '#253494', // inputs[3].value
color: '#1034A6', // inputs[3].value
};

if ($D.heatMapData.provenance.analysis.setting) {
opt.mode = $D.heatMapData.provenance.analysis.setting.mode;
if (opt.mode === 'binal') {
opt.color = $D.heatMapData.provenance.analysis.setting.colors[0];
} else if (opt.mode === 'gradient') {
opt.colors = $D.heatMapData.provenance.analysis.setting.colors;
opt.steps = $D.heatMapData.provenance.analysis.setting.colors.length + 1;
}
if ($D.heatMapData.provenance.analysis.setting.field) {
opt.currentFieldName = $D.heatMapData.provenance.analysis.setting.field;
}
Expand Down
7 changes: 6 additions & 1 deletion apps/heatmap/uicallbacks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,12 @@ async function onUpdateHeatmapFields() {
mode: $CAMIC.viewer.heatmap.mode,
};

if ($CAMIC.viewer.heatmap.mode=='gradient') setting.field = $CAMIC.viewer.heatmap._currentField.name;
if ($CAMIC.viewer.heatmap.mode=='gradient') {
setting.field = $CAMIC.viewer.heatmap._currentField.name;
setting.colors = $CAMIC.viewer.heatmap._colors;
} else if ($CAMIC.viewer.heatmap.mode=='binal') {
setting.colors = [$CAMIC.viewer.heatmap._color];
}

const fields = $D.heatMapData.provenance.analysis.fields;
const specimen = $D.heatMapData.provenance.image.specimen;
Expand Down
4 changes: 2 additions & 2 deletions apps/viewer/uicallbacks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,7 +1295,7 @@ async function callback(data) {
mode: 'binal',
size: $D.heatMapData.provenance.analysis.size,
fields: $D.heatMapData.provenance.analysis.fields,
color: '#253494', // inputs[3].value
color: '#1034A6', // inputs[3].value
};

if ($D.heatMapData.provenance.analysis.setting) {
Expand All @@ -1322,7 +1322,7 @@ async function callback(data) {
// editedData:$D.editedDataClusters,
size: $D.heatMapData.provenance.analysis.size,
fields: $D.heatMapData.provenance.analysis.fields,
color: '#253494', // inputs[3].value
color: '#1034A6', // inputs[3].value
};

if ($D.heatMapData.provenance.analysis.setting) {
Expand Down
27 changes: 21 additions & 6 deletions components/heatmapcontrol/heatmapcontrol.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ HeatmapControl.prototype.__refresh = function() {
const template = `
<div class='mode-panel'>

<label> Gradient <input type='checkbox' value='gradient' ${this.setting.mode == 'gradient'? 'checked':''} /></label>
<label> Gradient <input type='checkbox' value='gradient' ${
this.setting.mode == 'gradient' ? 'checked' : ''
} /></label>
</div>
<div class='sel-field-panel'>
<select></select>
Expand All @@ -78,10 +80,16 @@ HeatmapControl.prototype.__refresh = function() {
</div>
</div>
<div class='color-panel'>
<label> Color <input id='heatMapColor' type='color' value='#1034A6' /></label>
<label> Color <input id='heatMapColor' type='color' value= ${
this.setting.mode === 'gradient' ?
'#1034A6' :
$CAMIC.viewer.heatmap._color
} /></label>
</div>
<div class='colors-legend-panel'>
<label># of Intervals <input id='legendIntervals' type='number' class='range-enforced' value='5' min='2' max='10'/></label> <div class="warning" style="display: none;"></div>
<label># of Intervals <input id='legendIntervals' type='number' class='range-enforced' value=${
this.setting.mode === 'gradient' ? $CAMIC.viewer.heatmap._colors.length : 5
} min='2' max='10'/></label> <div class="warning" style="display: none;"></div>
<div class='legends'>
</div>
</div>
Expand Down Expand Up @@ -131,7 +139,8 @@ HeatmapControl.prototype.__refresh = function() {

const legendIntervalsInput = colorsLegendPanel.querySelector('#legendIntervals');
// Setting default value of intervals
legendIntervalsInput.value = 5;
legendIntervalsInput.value =
this.setting.mode === 'gradient' ? $CAMIC.viewer.heatmap._colors.length : 5;
const noOfIntervals = legendIntervalsInput.value;

const legendsContainer = colorsLegendPanel.querySelector('.legends');
Expand Down Expand Up @@ -327,6 +336,7 @@ function createOpacities(container, field, changeFunc) {
// Create HTML Color inputs for given noOfIntervals
function createIntervalInputs(container, noOfIntervals, changeFunc) {
// Empty the container
let colors=[];
while ( container.firstChild ) container.removeChild( container.firstChild );
for (let i = 1; i <= noOfIntervals; i++) {
const div = document.createElement('div');
Expand All @@ -336,14 +346,19 @@ function createIntervalInputs(container, noOfIntervals, changeFunc) {
label.className = 'color-input';
const color = document.createElement('input');
color.type = 'color';
color.value = defaultColorList[getGradientColorIndex(i, noOfIntervals)];
if (i <= $CAMIC.viewer.heatmap._colors.length) {
color.value = $CAMIC.viewer.heatmap._colors[i - 1];
} else {
color.value = defaultColorList[i - 1];
}
color.oninput = changeFunc;
// Input for color legends.
div.appendChild(label);
div.appendChild(color);

colors.push(color.value);
container.appendChild(div);
}
$CAMIC.viewer.heatmap.setColors(colors);
}
// returns selected colors for intervals
function getColors(container) {
Expand Down
35 changes: 23 additions & 12 deletions core/extension/osd-heatmap-overlay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
this.mode = options.mode || "binal";
this._fields = createFields(options.fields);
this._size = options.size;
this._steps = options.steps || 3;
this._steps = options.steps || 6;
this._t_data = null;
this._operator = "AND";
this._currentField = options.currentField || this._fields[0];
Expand All @@ -88,8 +88,8 @@
f => f.name === options.currentFieldName
);
}
this._color = options.color || "#045a8d"; // heatmap color
this._colors = options.colors || ["#edf8e9", "#006d2c"]; // heatmap color
this._color = options.color || '#1034a6'; // heatmap color
this._colors = options.colors || ['#EAF2F8', '#D4E6F1', '#A9CCE3', '#7FB3D5', '#5499C7']; // heatmap color
this.intervals = _getIntervals(
this._currentField,
this._colors,
Expand Down Expand Up @@ -185,7 +185,7 @@
this.__legend_info.style.width = "";
this.__legend_info.style.height = "";
}
}.bind(this)
}.bind(this),
);
this.__legend.style.display = "none";

Expand Down Expand Up @@ -226,8 +226,8 @@
f => f.name === options.currentFieldName
);
}
this._color = options.color || this._color || "#006d2c";
this._colors = options.colors || ["#FFFFFF", "#1034A6"];
this._color = options.color || this._color || '#1034a6';
this._colors = options.colors || this._colors || ['#EAF2F8', '#D4E6F1', '#A9CCE3', '#7FB3D5', '#5499C7'];
this.intervals = _getIntervals(
this._currentField,
this._colors,
Expand Down Expand Up @@ -597,12 +597,15 @@
const y = d[1]; // top

// current view's bounding box against a patch
if (this._getCanvasBoundBox)
return $.isIntersectBbox(this._getCanvasBoundBox, {
x: x,
y: y,
width: this._size[0],
height: this._size[1]
});
else
console.log(this._getCanvasBoundBox);
},
/**
* [filter description]
Expand Down Expand Up @@ -802,16 +805,24 @@
return ps;
}

function _getIntervals(field, colors = ["#FFFFFF", "#000000"], steps = 3) {
function _getIntervals(
field,
colors = ['#EAF2F8', '#D4E6F1', '#A9CCE3', '#7FB3D5', '#5499C7'],
steps = 6
) {
// get list of colors
//
// const colorList = interpolateColors(hexToRgb(colors[0]),hexToRgb(colors[1]),steps);

// Default preset of colors
const defaultColorList = ["#2b83ba", "#abdda4", "#ffffbf", "#fdae61", "#d7191c"];
const defaultColorList = ['#EAF2F8', '#D4E6F1', '#A9CCE3', '#7FB3D5', '#5499C7'];

if(colors.length + 1 != steps){
console.log(`Number of colors ${colors.length + 1 } required for steps ${steps} are not right. Switch to default colors`)
if (colors.length + 1 != steps) {
console.log(
`Number of colors ${
colors.length + 1
} required for steps ${steps} are not right. Switch to default colors`
);
colors = defaultColorList;
steps = defaultColorList.length + 1;
}
Expand All @@ -822,7 +833,7 @@
//const colorList = ['#fee5d9','#fcae91','#fb6a4a','#de2d26','#a50f15'];
// const colorList = ['#feedde','#fdbe85','#fd8d3c','#e6550d','#a63603'];
//const colorList = ['#edf8e9','#bae4b3','#74c476','#31a354','#006d2c'];

// get a boundary list of intervals
const threstholds = field.value;
const boundaries = interpolateNums(
Expand All @@ -836,7 +847,7 @@
rs.push({
color: colors[i],
range: [boundaries[i], boundaries[i + 1]],
data: []
data: [],
});
}
return rs;
Expand Down