DM-7001: Merge pull request #127 from Caltech-IPAC/dm-7001-gator-related-bugs

DM-7001: Gator related bugs and region bug

Author: robyww

src/firefly/js/api/ApiExpandedView.jsx

@@ -60,12 +60,20 @@ export class ApiExpandedView extends Component {
         const view = expanded === LO_VIEW.tables ? tables
             : expanded === LO_VIEW.xyPlots ? xyPlots
             : images;
-        return expanded !== LO_VIEW.none &&
-            (
+        if (expanded === LO_VIEW.none) {
+            document.body.style.overflow= this.saveOverflow;
+            return false;
+        }
+        else {
+            this.saveOverflow= document.body.style.overflow;
+            document.body.style.overflow= 'hidden';
+            return (
                 <div className='api-expanded rootStyle'>
                     {view}
                 </div>
             );
+
+        }
     }
 }
 

src/firefly/js/api/ApiHighlevelBuild.js

@@ -319,6 +319,7 @@ function initCoverage(llApi, targetDiv,options= {}) {
     const {dispatchAddSaga}= llApi.action;
     const {renderDOM,debug}= llApi.util;
     const {watchImageMetaData,watchCoverage}= llApi.util.image;
+    highlevelImageInit(llApi);
 
 
     renderDOM(targetDiv, MultiImageViewer,

src/firefly/js/ui/PopupPanel.jsx

@@ -46,8 +46,10 @@ export var PopupPanel= React.createClass(
         var e= ReactDOM.findDOMNode(this);
 
         var activeLayoutType = this.props.layoutPosition;
-        var r= getPopupPosition(e,activeLayoutType);
-        this.setState({activeLayoutType, posX:r.left, posY:r.top });
+        setTimeout( () => {
+            var r= getPopupPosition(e,activeLayoutType);
+            this.setState({activeLayoutType, posX:r.left, posY:r.top });
+        },10);
 
     },
 

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

@@ -131,10 +131,10 @@ export function ExpandedTools({visRoot,closeFunc}) {
     }
     return (
         <div>
-            <div style={{display: 'flex', paddingBottom: 2, borderBottom: '1px solid rgba(0,0,0,.2)' }}>
+            <div style={{display: 'flex', flexWrap:'wrap',paddingBottom: 2, borderBottom: '1px solid rgba(0,0,0,.2)' }}>
                 {closeFunc && <CloseButton style={closeButtonStyle} onClick={closeFunc}/>}
                 <div style={{'flex': '1 1 auto'}}>
-                    <VisToolbar/>
+                    <VisToolbar messageUnder={Boolean(closeFunc)}/>
                 </div>
             </div>
             <div style={{width:'100%', height:70, marginTop: 7}} className='disable-select'>

src/firefly/js/visualize/reducer/HandlePlotCreation.js

@@ -102,7 +102,7 @@ function addPlot(state,action, replace, setActive) {
             if (!info) return pv;
             const {plotAry, overlayPlotViews}= info;
             if (setActive) activePlotId= pv.plotId;
-            return PlotView.replacePlots(pv,plotAry,overlayPlotViews,replace);
+            return PlotView.replacePlots(pv,plotAry,overlayPlotViews, state.expandedMode, replace);
         });
     }
     else {// used for single plot update
@@ -111,7 +111,7 @@ function addPlot(state,action, replace, setActive) {
         plotViewAry= plotViewAry.map( (pv) => { // map has side effect of setting active plotId
             if (pv.plotId!==plotId ) return pv;
             if (setActive) activePlotId= plotId;
-            return PlotView.replacePlots(pv,plotAry,overlayPlotViews, replace);
+            return PlotView.replacePlots(pv,plotAry,overlayPlotViews, state.expandedMode, replace);
          });
     }
     return clone(state, {plotViewAry,activePlotId});

src/firefly/js/visualize/reducer/PlotView.js

@@ -23,6 +23,7 @@ import {DEFAULT_THUMBNAIL_SIZE} from '../WebPlotRequest.js';
 import SimpleMemCache from '../../util/SimpleMemCache.js';
 import {CCUtil, CysConverter} from './../CsysConverter.js';
 import {defMenuItemKeys} from '../MenuItemKeys.js';
+import {ExpandType} from '../ImagePlotCntlr.js';
 
 // export const DATASET_INFO_CONVERTER = 'DATASET_INFO_CONVERTER';
 
@@ -185,12 +186,12 @@ export function changePrimePlot(pv, nextIdx) {
  *
  * @param pv
  * @param plotAry
- * @param expanded
  * @param overlayPlotViews
+ * @param expandedMode
  * @param keepPrimeIdx
  * @return {Object|*}
  */
-function replacePlots(pv, plotAry, overlayPlotViews=null,keepPrimeIdx=false) {
+function replacePlots(pv, plotAry, overlayPlotViews, expandedMode, keepPrimeIdx=false) {
 
     pv= Object.assign({},pv);
     pv.plotViewCtx= Object.assign({},pv.plotViewCtx);
@@ -228,7 +229,7 @@ function replacePlots(pv, plotAry, overlayPlotViews=null,keepPrimeIdx=false) {
     pv.plotViewCtx.containsMultiImageFits= pv.plots.every( (p) => p.plotState.isMultiImageFile());
     pv.plotViewCtx.containsMultipleCubes= pv.plots.every( (p) => p.plotState.getCubeCnt()>1);
     pv.plotViewCtx.rotateNorthLock= pv.plots[pv.primeIdx].plotState.getRotateType()===RotateType.NORTH;  // todo, study this more, understand why
-    pv.plotViewCtx.lastCollapsedZoomLevel= pv.plots[pv.primeIdx].zoomFactor;
+    if (expandedMode===ExpandType.COLLAPSE) pv.plotViewCtx.lastCollapsedZoomLevel= pv.plots[pv.primeIdx].zoomFactor;
 
     pv= initScrollCenterPoint(pv);
 

src/firefly/js/visualize/saga/CoverageWatcher.js

@@ -248,7 +248,7 @@ function updateCoverageWithData(table, options, tbl_id, allRowsTable, decimatedT
 
 function computeSize(options, decimatedTables,allRowsTable) {
     const ary= options.multiCoverage ? values(decimatedTables) : [allRowsTable];
-    const testAry= ary
+    var testAry= ary
         .filter( (t) => t && t!=='WORKING')
         .map( (t) => {
             var ptAry= [];
@@ -264,9 +264,19 @@ function computeSize(options, decimatedTables,allRowsTable) {
             }
             return flattenDeep(ptAry);
     } );
-    return computeCentralPointAndRadius(flattenDeep(testAry));
+    testAry= flattenDeep(testAry);
+    if (isOnePoint(testAry)) {
+        return {centralPoint:testAry[0], maxRadius: .05};
+    }
+    else {
+        return computeCentralPointAndRadius(testAry);
+    }
 }
 
+function isOnePoint(wpList) {
+    if (isEmpty(wpList)) return false;
+    return !wpList.some( (wp) => !pointEquals(wp,wpList[0]));
+}