Heatmap - support using the same XY space for multiple plots

tgoldina · tgoldina · commit 9624608c6f85 · 2017-08-11T12:39:44.000-07:00
diff --git a/src/firefly/html/demo/ffapi-slate-test2.html b/src/firefly/html/demo/ffapi-slate-test2.html
@@ -53,8 +53,10 @@
 </div>
 <pre>
     try:
-    148.88822;69.06529;EQ_J2000
-    202.48417;47.23056;EQ_J2000
+    148.88822;69.06529;EQ_J2000 # Galaxy M81
+    202.48417;47.23056;EQ_J2000 # Galaxy M51
+    136.9316774;+1.1195886;galactic # W5 star-forming region
+    10.68479;41.26906;EQ_J2000 # Galaxy M31
 </pre>
 
 
@@ -74,16 +76,16 @@
 Add Some plotly Charts
 <ul>
     <li>
-        <a href='javascript:loadNewCharts(0,0,2,2)'>Show new Plotly </a> <span class='smallCoords'>at row: 0, col: 4, w:2 h: 2</span>
+        <a href='javascript:loadNewCharts(0,0,2,2)'>Show Scatter </a> <span class='smallCoords'>at row: 0, col: 4, w:2 h: 2</span>
     </li>
     <li>
-        <a href='javascript:loadNewHeatmapCharts(2,0,2,3)'>Show new Heat Map </a> <span class='smallCoords'>at row: 2, col: 0, w:2 h: 3</span>
+        <a href='javascript:loadNewHeatmapCharts(2,0,2,3)'>Show Heatmap </a> <span class='smallCoords'>at row: 2, col: 0, w:2 h: 3</span>
     </li>
     <li>
         <a href='javascript:loadHistogramCharts(2,2,2,3)'>Show Histogram</a> <span class='smallCoords'>at row: 2, col: 2, w:2 h: 3</span>
     </li>
     <li>
-        <a href='javascript:load3DChart(2,4,2,3)'>3d Charts</a> <span class='smallCoords'>at row: 2, col: 4, w:2 h: 3</span>
+        <a href='javascript:load3DChart(2,4,2,3)'>Show 3d Scatter</a> <span class='smallCoords'>at row: 2, col: 4, w:2 h: 3</span>
     </li>
 </ul>
 
@@ -94,7 +96,7 @@
         <a href="javascript:load3C(getSTarget(),0,2,2,2)">3 Color</a> in cell <span class='smallCoords'>at row: 0, col: 2, w:2 h: 2</span>
     </li>
 </ul>
-
+</body>
 
 
 <script type="text/javascript">
@@ -147,7 +149,7 @@
                     WorldPt    : sTarget,
                     RangeValues : firefly.util.image.RangeValues.serializeSimple('Sigma',-2,8,'Linear'),
                     SizeInDeg  : '1'
-                },
+                }
             ];
 
 
@@ -160,15 +162,23 @@
         function loadNewCharts(r,c,w,h) {
             firefly.getViewer().addCell(r,c,w,h, 'xyPlots', 'newChartContainer');
 
-            trace1 = {
-                x: "tables::wiseCatTbl,ra",
-                y: "tables::wiseCatTbl,dec",
+            var trace1 = {
+                x: "tables::wiseCatTbl,w1mpro-w2mpro",
+                y: "tables::wiseCatTbl,w2mpro-w3mpro",
                 mode: 'markers',
-                type: 'scatter'
+                type: 'scatter',
+                marker: {size: 4, opacity: 0.5}
             };
 
-            firefly.getViewer().showPlot({chartId: 'newChart1', data: [trace1], fireflyData: [{dataType: 'fireflyScatter'}]},
-                  'newChartContainer');
+            var layoutS = {
+                title: 'Color-Color',
+                xaxis: {title: 'w1mpro-w2mpro (mag)'},
+                yaxis: {title: 'w2mpro-w3mpro (mag)'}
+            };
+
+            firefly.getViewer().showPlot(
+                    {chartId: 'newChart1', layout: layoutS, data: [trace1], fireflyData: [{dataType: 'fireflyScatter'}]},
+                    'newChartContainer');
         }
 
         function loadNewHeatmapCharts(r,c,w,h) {
@@ -199,22 +209,40 @@
                     colorscale: 'Greens'
                 }
             ];
+            // use firefly algorithm to create heatmap data
             var	fireflyDataHM = [
                 {dataType: 'fireflyHeatmap'},
                 {dataType: 'fireflyHeatmap'},
                 {dataType: 'fireflyHeatmap'}
             ];
+            var layoutHM = {
+                title: 'Magnitude-magnitude densities',
+                xaxis: {title: 'w1 photometry (mag)'},
+                yaxis: {title: ''}
+            };
+            // user boundaries - so that heatmaps will be calculated in the same XY space
+            var fireflyLayoutHM = {
+                xaxis: {
+                    min: 5,
+                    max: 20
+                },
+                yaxis: {
+                    min: 4,
+                    max: 18
+                }
+            };
 
-            firefly.getViewer().showPlot({chartId: 'newChart2', data: dataHM, fireflyData:fireflyDataHM },
-                'heatMapContainer');
+            firefly.getViewer().showPlot(
+                    {chartId: 'newChart2', layout: layoutHM,  data: dataHM, fireflyData:fireflyDataHM, fireflyLayout:fireflyLayoutHM},
+                    'heatMapContainer');
         }
 
         function loadHistogramCharts(r,c,w,h) {
             firefly.getViewer().addCell(r,c,w,h, 'xyPlots', 'histContainer');
 
             var dataH = [
-                {name: 'dec-0.02', marker: {color: 'rgba(153, 51, 153, 0.8)'}},
-                {name: 'dec+0.02', marker: {color: 'rgba(102,153,0, 0.7)'}}
+                {name: 'w1mpro', marker: {color: 'rgba(153, 51, 153, 0.8)'}},
+                {name: 'w2mpro', marker: {color: 'rgba(102,153,0, 0.7)'}}
             ];
 
             var fireflyDataH = [
@@ -225,7 +253,7 @@
                         algorithm: 'fixedSizeBins',
                         fixedBinSizeSelection: 'numBins',
                         numBins: 30,
-                        columnOrExpr: 'dec-0.02'
+                        columnOrExpr: 'w1mpro'
                     }
                 },
                 {
@@ -235,17 +263,26 @@
                         algorithm: 'fixedSizeBins',
                         fixedBinSizeSelection: 'numBins',
                         numBins: 40,
-                        columnOrExpr: 'dec+0.02'   // same column but shifted
+                        columnOrExpr: 'w2mpro'   // same column but shifted
                     }
                 }
             ];
-            firefly.getViewer().showPlot({chartId: 'firefly-hist-tbl', data: dataH, fireflyData: fireflyDataH},
-                'histContainer');
+
+            var layoutHist = {
+                title: 'Photometry histogram',
+                xaxis: {title: 'photometry (mag)'},
+                yaxis: {title: ''}
+            };
+
+            firefly.getViewer().showPlot(
+                    {chartId: 'firefly-hist-tbl', layout: layoutHist, data: dataH, fireflyData: fireflyDataH},
+                    'histContainer');
         }
 
         function load3DChart(r,c,w,h) {
             firefly.getViewer().addCell(r,c,w,h, 'xyPlots', '3dChartContainer');
 
+
             var data3d = [
                 {
                     type: 'scatter3d',
@@ -265,29 +302,34 @@
                 }
             ];
 
-            layout3d = {
-                title: 'Scatter 3D on w1mpro, w2mpro and w3mpro',
-                scene: {
+            var tfont = {size: 11};
+            var layout3d = {
+                title: 'Photometry in band 1, 2, 3',
+                scene:{
                     xaxis: {
-                        title: 'w1'
+                        title: 'w1 (mag)',
+                        titlefont: tfont
                     },
                     yaxis: {
-                        title: 'w2'
+                        title: 'w2 (mag)',
+                        titlefont: tfont
                     },
                     zaxis: {
-                        title: 'w3'
+                        title: 'w3 (mag)',
+                        titlefont: tfont
                     }
                 }
             };
 
-            firefly.getViewer().showPlot({chartId: 'newChart3', data: data3d, layout: layout3d },
-                '3dChartContainer');
+            firefly.getViewer().showPlot(
+                    {chartId: 'newChart3', layout: layout3d, data: data3d },
+                    '3dChartContainer');
         }
 
 
         function showATable(sTarget,r,c,w,h) {
             firefly.getViewer().addCell(r,c,w,h, 'tables');
-            var req=  firefly.util.table.makeIrsaCatalogRequest('another wise catalog', 'WISE', 'allwise_p3as_psd',
+            var req=  firefly.util.table.makeIrsaCatalogRequest('WISE catalog', 'WISE', 'allwise_p3as_psd',
                 {   position: sTarget,
                     SearchMethod: 'Cone',
                     radius: 1200,
@@ -343,11 +385,12 @@
         };
 
    }
-   
+
 </script>
 
 <!-- to try a container: <script  type="text/javascript" src="http://localhost:8090/firefly/firefly_loader.js"></script>-->
 
 <script  type="text/javascript" src="../firefly_loader.js"></script>
 
 
+</html>
diff --git a/src/firefly/java/edu/caltech/ipac/firefly/server/util/QueryUtil.java b/src/firefly/java/edu/caltech/ipac/firefly/server/util/QueryUtil.java
@@ -790,13 +790,17 @@ public static DataGroup doDecimation(DataGroup dg, DecimateInfo decimateInfo) th
         }
 
         if (doDecimation) {
-
             boolean checkLimits = false;
             if (checkDeciLimits) {
-                if (xDeciMin > xMin) { xMin = xDeciMin; checkLimits = true; }
-                if (xDeciMax < xMax) { xMax = xDeciMax; checkLimits = true; }
-                if (yDeciMin > yMin) { yMin = yDeciMin; checkLimits = true; }
-                if (yDeciMax < yMax) { yMax = yDeciMax; checkLimits = true; }
+                if (xDeciMin > xMin || xDeciMax < xMax || yDeciMin > yMin || yDeciMax < yMax) {
+                    checkLimits = true;
+                }
+
+                // use boundaries provided in decimate info, if available
+                if (!Double.isNaN(decimateInfo.getXMin())) { xMin = xDeciMin; }
+                if (!Double.isNaN(decimateInfo.getXMax())) { xMax = xDeciMax; }
+                if (!Double.isNaN(decimateInfo.getYMin())) { yMin = yDeciMin; }
+                if (!Double.isNaN(decimateInfo.getYMax())) { yMax = yDeciMax; }
             }
 
             if (outRows < deciEnableSize) {
diff --git a/src/firefly/js/charts/ChartsCntlr.js b/src/firefly/js/charts/ChartsCntlr.js
@@ -313,13 +313,13 @@ export function makeChartDataFetch (getChartDataType) {
 
 function chartAdd(action) {
     return (dispatch) => {
-        const {chartId, chartType, viewerId='main', data, fireflyData} = action.payload;
+        const {chartId, chartType, viewerId='main', data, fireflyData, fireflyLayout} = action.payload;
         clearChartConn({chartId});
         dispatch(action);
         if (chartType === 'plot.ly') {
             dispatchAddViewer(viewerId,true,'plot2d',true);
             dispatchAddViewerItems(viewerId, [chartId], 'plot2d');
-            handleTableSourceConnections({chartId, data, fireflyData});
+            handleTableSourceConnections({chartId, data, fireflyData, fireflyLayout});
         }
     };
 }
diff --git a/src/firefly/js/charts/dataTypes/FireflyHeatmap.js b/src/firefly/js/charts/dataTypes/FireflyHeatmap.js
@@ -29,8 +29,11 @@ export function getTraceTSEntries({traceTS, chartId, traceNum}) {
         xyratio = xbins/ybins;
     }
 
-    //TODO: take into account zoom? and boundaries
-    const {xmin, xmax, ymin, ymax} = {};
+    //should we take into account zoom?
+    const xmin = get(fireflyLayout, 'xaxis.min');
+    const xmax = get(fireflyLayout, 'xaxis.max');
+    const ymin = get(fireflyLayout, 'yaxis.min');
+    const ymax = get(fireflyLayout, 'yaxis.max');
 
     const options = {
         xColOrExpr: get(mappings, 'x'),
diff --git a/src/firefly/js/charts/dataTypes/FireflyScatter.js b/src/firefly/js/charts/dataTypes/FireflyScatter.js
@@ -155,8 +155,8 @@ function addOtherChanges({changes, xLabel, xTipLabel, xUnit, yLabel, yTipLabel,
         const yval = y[idx];
         const xerr = hasXErrors ? formatError(xval, xErr[idx], xErrLow[idx], xErrHigh[idx]) : '';
         const yerr = hasYErrors ? formatError(yval, yErr[idx], yErrLow[idx], yErrHigh[idx]) : '';
-        return `<span> ${xTipLabel} = ${xval}${xerr} ${xUnit} <br>` +
-            ` ${yTipLabel} = ${yval}${yerr} ${yUnit} </span>`;
+        return `<span> ${xTipLabel} = ${parseFloat(xval)}${xerr} ${xUnit} <br>` +
+            ` ${yTipLabel} = ${parseFloat(yval)}${yerr} ${yUnit} </span>`;
     });
     changes[`data.${traceNum}.text`] = text;
     changes[`data.${traceNum}.hoverinfo`] = 'text';
diff --git a/src/firefly/js/tables/Decimate.js b/src/firefly/js/tables/Decimate.js
@@ -29,7 +29,7 @@ export const serializeDecimateInfo = function(xColumnName, yColumnName, maxPoint
     const orderedNumericProps = [maxPoints, xyRatio, xMin, xMax, yMin, yMax, deciEnableLimit];
     const deciStrStart = `${DECIMATE_TAG}=${xColumnName},${yColumnName}`;
     return orderedNumericProps.reduce((sres, val)=>{
-        return sres + ',' + (Number.isFinite(val) ? val : '');
+        return sres + ',' + (Number.isFinite(Number.parseFloat(val)) ? val : '');
     }, deciStrStart);
 };
 
