firefly-793: cleanup

Author: robyww

src/firefly/js/visualize/PlotViewUtil.js

@@ -1042,45 +1042,6 @@ export const pvEqualExScroll= memorizeLastCall((pv1,pv2) => {
     return result;
 },4);
 
-export const pvEqualForRender= (pv1,pv2) => {
-    if (pv1 === pv2) return true;
-    let result= true;
-    if (!pv1 || !pv2 ||
-        pv1.plotId !== pv2.plotId ||
-        pv1.primeIdx!==pv2.primeIdx ||
-        pv1.serverCall!==pv2.serverCall ||
-        pv1.visible!==pv2.visible ||
-        pv1.scrollX!==pv2.scrollX ||
-        pv1.scrollY!==pv2.scrollY ||
-        pv1.rotation!==pv2.rotation ||
-        pv1.flipY!==pv2.flipY ||
-        pv1.flipX!==pv2.flipX ||
-        !shallowequal(pv1.viewDim,pv2.viewDim) ||
-        !shallowequal(pv1.affTrans,pv2.affTrans) ||
-        pv1.plottingStatusMsg !== pv2.plottingStatusMsg) {
-        result= false;
-    }
-    if (result && pv1.plots !== pv2.plots) {
-        const p1 = primePlot(pv1);
-        const p2 = primePlot(pv2);
-        if (p1 !== p2) {
-            if (p1.plotImageId !== p2.plotImageId ||  //
-                isHiPS(p1) !== isHiPS(p2) ||
-                p1.attributes !== p2.attributes ||
-                p1.zoomFactor !== p2.zoomFactor ||
-                p1.imageCoordSys !== p2.imageCoordSys ||
-                p1.dataRequested!==p2.dataRequested ||
-                p1.blankColor!==p2.blankColor ||
-                p1.dataWidth!==p2.dataWidth ||
-                p1.dataHeight!==p2.dataHeight ||
-                !shallowequal(p1.screenSize,p2.screenSize) ||
-                p1.rawData!==p2.rawData ||
-                p1.plotState !== p2.plotState) result= false;
-        }
-    }
-    if (result && !shallowequal(pv1.overlayPlotViews, pv2.overlayPlotViews)) result= false;
-    return result;
-};
 
 
 //===============================================================

src/firefly/js/visualize/draw/CanvasWrapper.jsx

@@ -4,9 +4,7 @@
 
 import React, {Component} from 'react';
 import PropTypes from 'prop-types';
-import {pick} from 'lodash';
 import {Drawer} from './Drawer.js';
-import shallowequal from 'shallowequal';
 import {makeDrawingDef} from './DrawingDef.js';
 import {CANVAS_DL_ID_START} from '../PlotViewUtil.js';
 
@@ -90,7 +88,6 @@ export function makeDummyDrawLayer(drawData) {
     };
 }
 
-const pickList= ['drawData','drawingDef', 'plotIdAry', 'visiblePlotIdAry'];
 
 class CanvasWrapper extends Component {
 
@@ -121,14 +118,8 @@ class CanvasWrapper extends Component {
     updateDrawLayer(props,force=false) {
         const {plot,drawLayer,width,height,getDrawLayer}= props;
         let dl= getDrawLayer ? getDrawLayer() : drawLayer;
-        if (!force &&
-            Math.floor(width)===this.lastWidth && Math.floor(height)===this.lastHeight &&
-            shallowequal(pick(dl,pickList),pick(this.lastDrawLayer,pickList))) {
-            return;
-        }
+        if (!force && dl===this.lastDrawLayer) return;
         this.lastDrawLayer= dl;
-        this.lastWidth= Math.floor(width);
-        this.lastHeight= Math.floor(height);
         if (Array.isArray(dl)) dl= makeDummyDrawLayer(dl);
 
         window.requestAnimationFrame(() => {

src/firefly/js/visualize/draw/DrawerComponent.jsx

@@ -10,7 +10,7 @@ import {dlRoot} from '../DrawLayerCntlr.js';
 import {useStoreConnector} from 'firefly/ui/SimpleComponent.jsx';
 
 
-const isVisible= (drawLayer,plotId) => drawLayer.visiblePlotIdAry.includes(plotId);
+const isVisible= (drawLayer,plotId) => drawLayer?.visiblePlotIdAry.includes(plotId);
 
 function findDrawLayerInStore(prevDrawLayer, drawLayerId) {
     if (!drawLayerId) return undefined;

src/firefly/js/visualize/iv/ImageViewer.jsx

@@ -2,11 +2,11 @@
  * License information at https://github.com/Caltech-IPAC/firefly/blob/master/License.txt
  */
 
-import React, {memo, useEffect, useRef} from 'react';
+import React, {memo, useState, useEffect, useRef} from 'react';
 import PropTypes from 'prop-types';
 import {omit} from 'lodash';
 import shallowequal from 'shallowequal';
-import {getPlotViewById, getAllDrawLayersForPlot, pvEqualForRender} from '../PlotViewUtil.js';
+import {getPlotViewById,getAllDrawLayersForPlot} from '../PlotViewUtil.js';
 import {ImageViewerView} from './ImageViewerDecorate.jsx';
 import {visRoot, ExpandType} from '../ImagePlotCntlr.js';
 import {extensionRoot} from '../../core/ExternalAccessCntlr.js';
@@ -17,7 +17,7 @@ import {useStoreConnector} from '../../ui/SimpleComponent';
 import {dlRoot} from '../DrawLayerCntlr';
 
 
-const visRootOmitList= ['plotViewAry','activePlotId', 'processedTiles', 'plotRequestDefaults'];
+const omitList= ['plotViewAry','activePlotId'];
 
 function hasVisRootChanged(plotId,newVisRoot,oldVisRoot) {
     if (newVisRoot===oldVisRoot) return false;
@@ -26,16 +26,14 @@ function hasVisRootChanged(plotId,newVisRoot,oldVisRoot) {
         (newVisRoot.activePlotId===plotId || oldVisRoot.activePlotId===plotId)) {
         return true;
     }
-
-    if (!pvEqualForRender(getPlotViewById(oldVisRoot,plotId),getPlotViewById(newVisRoot,plotId))) return true;
-    return !shallowequal(omit(newVisRoot,visRootOmitList), omit(oldVisRoot,visRootOmitList));  // compare certain keys in visRoot
+    if (getPlotViewById(newVisRoot,plotId)!==getPlotViewById(oldVisRoot,plotId)) return true;
+    return !shallowequal(omit(newVisRoot,omitList), omit(oldVisRoot,omitList));  // compare certain keys in visRoot
 }
 
 function hasStateChanged(plotId, newState,oldState) {
     if (!oldState) return true;
     if (newState===oldState) return false;
-    if (newState?.plotView?.localZoomStart) return false;
-    // if (!shallowequal(newState.drawLayersAry,oldState.drawLayersAry)) return true;
+    if (!shallowequal(newState.drawLayersAry,oldState.drawLayersAry)) return true;
     if (newState.extRoot!==oldState.extRoot || newState.taskCount!==oldState.taskCount) return true;
     return hasVisRootChanged(plotId,newState.vr,oldState.vr);
 }
@@ -65,29 +63,29 @@ const TEN_SECONDS= 10000;
 
 export const ImageViewer= memo( ({showWhenExpanded=false, plotId, handleInlineTools=true, inlineTitle, aboveTitle}) => {
 
-    const {current:mouseRef} = useRef({mousePlotId:undefined});
+    const [mousePlotId, setMousePlotId] = useState(lastMouseCtx().plotId);
     const [{plotView,vr,drawLayersAry,taskCount}] = useStoreConnector( (oldState) => getStoreState(plotId,oldState) );
     const {current:timeoutRef} = useRef({timeId:undefined});
 
     useEffect(() => {
         let alive= true;
         const removeListener= addImageMouseListener((mState) => {
-            mouseRef.mousePlotId= mState.plotId;
+            setMousePlotId(mState.plotId);
             timeoutRef.timeId && clearTimeout(timeoutRef.timeId);
             timeoutRef.timeId= undefined;
-            if (mState.mouseState!==MouseState.EXIT || mouseRef.mousePlotId!==plotId) return;
+            if (mState.mouseState!==MouseState.EXIT || mousePlotId!==plotId) return;
             timeoutRef.timeId= setTimeout(
                     () => {
                         timeoutRef.timeId= undefined;
-                        if (alive && lastMouseCtx().plotId===plotId) mouseRef.mousePlotId= undefined;
+                        if (alive && lastMouseCtx().plotId===plotId) setMousePlotId(undefined);
                     }, TEN_SECONDS); // 10 seconds
         });
         return () => {
             alive= false;
             timeoutRef.timeId && clearTimeout(timeoutRef.timeId);
             removeListener();
         };
-    }, [plotId]);
+    }, [mousePlotId, plotId]);
 
 
     if (!showWhenExpanded  && vr.expandedMode!==ExpandType.COLLAPSE) return false;
@@ -97,7 +95,7 @@ export const ImageViewer= memo( ({showWhenExpanded=false, plotId, handleInlineTo
         <ImageViewerView plotView={plotView}
                          drawLayersAry={drawLayersAry}
                          visRoot={vr}
-                         mousePlotId={mouseRef.mousePlotId}
+                         mousePlotId={mousePlotId}
                          handleInlineTools={handleInlineTools}
                          inlineTitle={inlineTitle}
                          aboveTitle={aboveTitle}