Skip to content

Commit

Permalink
Merge pull request #429 from camicroscope/develop
Browse files Browse the repository at this point in the history
For 3.7.7
  • Loading branch information
birm authored Jul 30, 2020
2 parents 8518102 + d03c79c commit c9d11cd
Show file tree
Hide file tree
Showing 11 changed files with 457 additions and 1,210 deletions.
8 changes: 6 additions & 2 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* **Version 1**
* [1.0.x](#camicroscope-10)

### caMicroscope [Unreleased](https://github.com/camicroscope/camicroscope/compare/v3.7.5...camicroscope:develop)
### caMicroscope [Unreleased](https://github.com/camicroscope/camicroscope/compare/v3.7.7...camicroscope:develop)
###### TBD
* TBD

### caMicroscope [3.7.6](https://github.com/camicroscope/camicroscope/compare/v3.7.5...camicroscope:develop)
### caMicroscope [3.7.7](https://github.com/camicroscope/camicroscope/compare/v3.7.6......camicroscope:v3.7.7)
###### 2020-06-24
* Bugfix for Heatmap Color Editing

### caMicroscope [3.7.6](https://github.com/camicroscope/camicroscope/compare/v3.7.5...camicroscope:v3.7.6)
###### 2020-06-24
* Segmentation Fixes
* Review Status Workflow and Indicators [#407](https://github.com/camicroscope/caMicroscope/pull/407)
Expand Down
7 changes: 5 additions & 2 deletions apps/heatmap/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,16 @@ function initCore() {
color: '#1034A6', // inputs[3].value
};

if ($D.heatMapData.provenance.analysis.setting) {
if (
$D.heatMapData.provenance.analysis.setting &&
$D.heatMapData.provenance.analysis.setting.colors &&
$D.heatMapData.provenance.analysis.setting.colors.length) {
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;
opt.steps = $D.heatMapData.provenance.analysis.setting.colors.length;
}
if ($D.heatMapData.provenance.analysis.setting.field) {
opt.currentFieldName = $D.heatMapData.provenance.analysis.setting.field;
Expand Down
2 changes: 1 addition & 1 deletion apps/landing/landing.html
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@

<header class="major">

<h2>caMicroscope Public</h2>
<h2>caMicroscope</h2>

</header>

Expand Down
98 changes: 0 additions & 98 deletions demo/demo.html

This file was deleted.

220 changes: 0 additions & 220 deletions demo/demo.js

This file was deleted.

Loading

0 comments on commit c9d11cd

Please sign in to comment.