Fixed Dotplot Sizing & Size Legend Issue (#27)

* Fixed Dotplot Sizing & Size Legend Issue * Bump up version * Bump up version
epiviz · Aug 31, 2023 · 002b0cc · 002b0cc
1 parent 687de67
commit 002b0cc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "epiviz.heatmap.gl",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "repository": "https://github.com/jkanche/epiviz.heatmap.gl",
   "homepage": "https://github.com/jkanche/epiviz.heatmap.gl",
   "author": {

diff --git a/src/DotplotGL.js b/src/DotplotGL.js
@@ -231,7 +231,8 @@ class DotplotGL extends BaseGL {
    */
   renderSizeLegend() {
     if (!this.sizeLegendData) return;
-    let { minSize, maxSize, steps, maxSizeInPx } = this.sizeLegendData;
+    let { minSize, maxSize, steps, maxSizeInPx, minSizeInPx } =
+      this.sizeLegendData;
     const [, maxX] = getMinMax(this.input.x);
     const [, maxY] = getMinMax(this.input.y);
     let xlen = maxX + 1,
@@ -261,8 +262,8 @@ class DotplotGL extends BaseGL {
     // Desired max size in pixels
     const maxPx = maxSizeInPx || maxSize;
 
-    // Calculate the desired minimum size in pixels proportionally
-    const minPx = (minSize * maxPx) / maxSize;
+    // Desired min size in pixels
+    const minPx = minSizeInPx || minSize;
 
     // Create a linear scale
     const sizeScale = scaleLinear()
@@ -382,7 +383,6 @@ class DotplotGL extends BaseGL {
             .style("right", "0px");
           break;
       }
-      console.log("before", this._spec.margins);
 
       this.updateMarginsToAccountForSizeLegend();
       this.plot.setSpecification(this._spec);

diff --git a/src/constants.js b/src/constants.js
@@ -18,5 +18,5 @@ export const DEFAULT_SIZE_LEGEND_SVG_PADDING = 10;
 export const DEFAULT_SIZE_LEGEND_CIRCLE_GAP = 10;
 export const DEFAULT_SIZE_LEGEND_CIRCLE_TEXT_GAP = 10;
 
-export const DEFAULT_MIN_RADIUS_FOR_DOTPLOT = 5;
-export const DEFAULT_MARGIN_BETWEEN_DOTS = 5;
+export const DEFAULT_MIN_RADIUS_FOR_DOTPLOT = 3;
+export const DEFAULT_MARGIN_BETWEEN_DOTS = 2;
diff --git a/src/utils.js b/src/utils.js
@@ -81,7 +81,10 @@ export const removeTooltip = (container) => {
 };
 
 export const getMaxRadiusForDotplot = (xlen, ylen, padding) => {
-  return Math.min(198 / (xlen + 1), 198 / (ylen + 1)) - padding;
+  return Math.max(
+    Math.min(198 / (xlen + 1), 198 / (ylen + 1)) - padding,
+    DEFAULT_MIN_RADIUS_FOR_DOTPLOT
+  );
 };
 
 export const getScaledRadiusForDotplot = (