switched meanings of 'scaled' and 'unscaled' tracks

higlass · Apr 23, 2018 · 70922ce · 70922ce
1 parent 6ff1038
commit 70922ce
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/index.html b/src/index.html
@@ -9,7 +9,7 @@
     }
   </style>
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-  <link rel="stylesheet" href="../node_modules/higlass/dist/styles/hglib.css">
+  <link rel="stylesheet" href="hglib.css">
 
   <script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.5.4/react.min.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.5.4/react-dom.min.js"></script>
@@ -27,7 +27,7 @@
 And some other text
 <div style="height: 1500px"></div>
 </body>
-<script src="../node_modules/higlass/dist/scripts/hglib.js"></script>
+<script src="hglib.js"></script>
 <script>
 
   var viewConfig =
@@ -61,7 +61,7 @@
                   "trackBorderColor": "black",
                   "heatmapValueScaling": "log",
                   "name": "all.KL.bed.multires.mv5",
-                  "scaledHeight": true,
+                  "scaledHeight": false,
                   "backgroundColor": "white",
                   "sortLargestOnTop": true,
                   "colorScale": [
@@ -132,7 +132,7 @@
                   "trackBorderColor": "black",
                   "heatmapValueScaling": "log",
                   "name": "all.KL.bed.multires.mv5",
-                  "scaledHeight": false,
+                  "scaledHeight": true,
                   "backgroundColor": "white",
                   "colorScale": [
                     "#FF0000",

diff --git a/src/scripts/StackedBarTrack.js b/src/scripts/StackedBarTrack.js
@@ -39,11 +39,11 @@ const StackedBarTrack = (HGC, ...args) => {
       const matrix = this.unFlatten(tile);
 
       if (this.options.scaledHeight === true) {
-        this.drawVerticalBars(graphics, this.mapOriginalColors(matrix),
-          tileX, tileWidth, this.maxAndMin.max, this.maxAndMin.min, tile);
+        this.drawNormalizedBars(graphics, this.scaleMatrix(this.mapOriginalColors(matrix)), tileX, tileWidth, tile);
       }
       else {
-        this.drawNormalizedBars(graphics, this.scaleMatrix(this.mapOriginalColors(matrix)), tileX, tileWidth, tile);
+        this.drawVerticalBars(graphics, this.mapOriginalColors(matrix),
+          tileX, tileWidth, this.maxAndMin.max, this.maxAndMin.min, tile);
       }
 
       this.makeMouseOverData(tile);
@@ -395,7 +395,7 @@ StackedBarTrack.config = {
     trackBorderColor: 'black',
     backgroundColor: 'white',
     barBorder: true,
-    scaledHeight: true,
+    scaledHeight: false,
     sortLargestOnTop: true,
     colorScale: [
       "#FF0000",