Bug fix: negative data min, not transfere from server correctly

  - Also: use negative data min to recognize noisy data and don't compress as agressively

Author: robyww

src/firefly/java/edu/caltech/ipac/firefly/server/visualize/VisJsonSerializer.java

@@ -290,8 +290,8 @@ else if (data instanceof  JSONObject jo) {
     private static JSONObject serializeWebFitsData(WebFitsData wfData) {
         if (wfData==null) return null;
         JSONObject map = new JSONObject();
-        putDoubleOver0(map, "dataMin", wfData.dataMin());
-        putDoubleOver0(map,"dataMax", wfData.dataMax());
+        putDoubleNot0(map, "dataMin", wfData.dataMin());
+        putDoubleNot0(map,"dataMax", wfData.dataMax());
         putStr(map, "fluxUnits", wfData.fluxUnits());
         putNum(map, "getFitsFileSize", wfData.fitsFileSize());
         return map;
@@ -456,6 +456,7 @@ private static boolean getBoolean(JSONObject j, String key) throws IllegalArgume
     private static void addJsonObj(JSONArray a, JSONObject v) {a.add(v);}
 
     private static void putDoubleOver0(JSONObject m, String key, double v) {if (v>0.0) putDouble(m,key,v);}
+    private static void putDoubleNot0(JSONObject m, String key, double v) {if (v!=0.0) putDouble(m,key,v);}
     private static void putNumOver0(JSONObject m, String key, int v) {if (v>0) putNum(m,key,v);}
     private static void putStrNotNull(JSONObject m, String key, String v) {if (v!=null) putStr(m,key,v);}
     private static void putBoolIfTrue(JSONObject m, String key, boolean v) {if (v) putBool(m,key,v);}

src/firefly/js/visualize/rawData/RawDataOps.js

@@ -220,6 +220,9 @@ function getFirstDataCompress(plot, mask) {
     if (mask) return 'FULL';
     const {dataWidth, dataHeight}= plot;
     const size= dataWidth*dataHeight;
+    if (!isThreeColor(plot) && plot.webFitsData[Band.NO_BAND.value].dataMin<0) { //these type of image don't seem to compress very well
+        return (size < 100*MEG) ? 'FULL' : 'HALF';
+    }
     if (size < 6*MEG) return 'FULL';
     if (size < 10*MEG) return 'HALF';
     return 'QUARTER';
@@ -277,7 +280,7 @@ export async function loadStretchData(pv, plot, dispatcher) {
         if (fatal) {
             Logger('RawDataOps').warn(`dispatch the the plot failed on BYTE_DATA_REFRESH: ${dataCompress}`);
             if (dataCompress!=='FULL') {
-                await requestAgain(reqId, plotId, plot, 5, 'FULL', workerKey, dispatcher);
+                await requestAgain(reqId, plotId, plot, 1, 'FULL', workerKey, dispatcher);
             }
             else {
                 dispatcher({ type: ImagePlotCntlr.PLOT_IMAGE_FAIL,
@@ -289,7 +292,7 @@ export async function loadStretchData(pv, plot, dispatcher) {
 
     if (plotInvalid()) return;
     let currPlot= primePlot(visRoot(),plotId);
-    const waitTime= currPlot.zoomFactor<.3 ? 5000 : 1500; // wait 5 sec if small zoom level is otherwise 1.5 sec
+    const waitTime= currPlot.zoomFactor<.3 ? 4000 : 100; // wait 4 sec if small zoom level is otherwise 1 sec
     const nextDataCompress= getNextDataCompress(dataCompress,currPlot);
     const secondSuccess= await requestAgain(reqId, plotId, currPlot, waitTime, nextDataCompress, workerKey, dispatcher);
     if (secondSuccess && nextDataCompress==='HALF' &&  dataSize < MAX_FULL_DATA_SIZE) {

src/firefly/js/visualize/ui/ColorPanelReducer.js

@@ -122,7 +122,7 @@ function computeLowerRangeField(fields,rv,fitsData,lowerWhich='lowerWhich', lowe
             break;
         case ABSOLUTE:
             retval= {
-                validator:  fitsData.dataMin && fitsData.dataMax ?
+                validator:  !isNaN(fitsData.dataMin) && !isNaN(fitsData.dataMax) ?
                     Validate.floatRange.bind(null,fitsData.dataMin, fitsData.dataMax, 3, 'Lower range') : undefined,
                 value : resetDefault ? fitsData.dataMin : fields[lowerRange].value
             };
@@ -158,7 +158,7 @@ function computeUpperRangeField(fields,rv,fitsData) {
 
         case ABSOLUTE:
             retval= {
-                validator: fitsData.dataMin && fitsData.dataMax ?
+                validator: !isNaN(fitsData.dataMin) && !isNaN(fitsData.dataMax) ?
                     Validate.floatRange.bind(null,fitsData.dataMin, fitsData.dataMax, 3, 'Upper range') : undefined,
                 value : resetDefault ? fitsData.dataMax : fields.upperRange.value
             };