IRSA-4183: Merge PR #1122 from IRSA-4183-grid-plane

IRSA-4183: fixed grid not using additional params

Author: robyww

src/firefly/js/metaConvert/MultiProductFileAnalyzer.js

@@ -127,8 +127,14 @@ export function makeAnalysisGetGridDataProduct(makeReq) {
         const promiseAry= reqAry.map( (r) => {
             return doUploadAndAnalysis({table,request:r,activateParams})
                 .then( (result) => {
-                    if (!get(result,'fileMenu.fileAnalysis')) return false;
-                    return gridEntryHasImages(result.fileMenu.fileAnalysis) && r;
+                    if (!result?.fileMenu?.fileAnalysis?.parts) return false;
+                    const {parts}= result.fileMenu.fileAnalysis;
+                    if (!gridEntryHasImages(parts)) return false;
+                    const newReq= r.makeCopy();
+                    parts
+                        .forEach( (p) => Object.entries(p.additionalImageParams ?? {} )
+                        .forEach(([k,v]) => newReq.setParam(k,v)));
+                    return newReq;
                 });
         });
 
@@ -323,7 +329,7 @@ function watchForUploadUpdate(action, cancelSelf, {url,dpId}) {
 }
 
 
-const gridEntryHasImages= (fileAnalysis) => fileAnalysis.parts.find( (p) => p.type===FileAnalysisType.Image);
+const gridEntryHasImages= (parts) => parts.find( (p) => p.type===FileAnalysisType.Image);
 
 function makeErrorResult(message, fileName,url) {
     return dpdtMessageWithDownload(`No displayable data available for this row${message?': '+message:''}`, fileName&&'Download: '+fileName, url);

src/firefly/js/ui/CloseButton.jsx

@@ -18,7 +18,7 @@ const middleStyle= {
     fontSize: '12pt',
     background: `url(${BUTTON_MIDDLE}) top left repeat-x`,
     color: 'white',
-    verticalAlign:'baseline'
+    verticalAlign:'bottom'
 };
 
 /**

src/firefly/js/visualize/ZoomUtil.js

@@ -12,7 +12,7 @@ import {convertAngle} from './VisUtil.js';
 
 export const FullType = new Enum(['ONLY_WIDTH', 'WIDTH_HEIGHT', 'ONLY_HEIGHT']);
 
-export const imageLevels= [.03125, .0625, .125,.1,.25,.3, .4, .5, .75, .8, .9, 1, 1.25, 1.5,2, 2.5,3, 3.5,
+export const imageLevels= [.0125, .025, .05,.1,.25,.3, .4, .5, .75, .8, .9, 1, 1.25, 1.5,2, 2.5,3, 3.5,
     4,5, 6, 7,8, 9, 10, 11, 12, 13, 14, 15, 16, 18,20,22,24,28, 32];
 export const imageLevelsReversed= [...imageLevels].reverse();
 

src/firefly/js/visualize/iv/ImageTileDrawer.js

@@ -24,7 +24,7 @@ export function initImageDrawer(targetCanvas) {
 
 
     return (plot, opacity,plotView, tileProcessInfo= {shouldProcess:false}) => {
-        if (!isImage(plot)) return;
+        if (!isImage(plot) || !plot.affTrans) return;
         abortLastDraw?.();
         const rootPlot= primePlot(plotView); // bounding box should us main plot not overlay plot
         const boundingBox= computeBounding(rootPlot,plotView.viewDim.width,plotView.viewDim.height);

src/firefly/js/visualize/ui/ImageMetaDataToolbarView.jsx

@@ -105,15 +105,15 @@ export function ImageMetaDataToolbarView({activePlotId, viewerId, viewerPlotIds=
                                          style={{marginLeft: 5}}
                                          onClick={() => showThreeColorOps(viewer,dataId)}/>
                 }
-                {layoutType===SINGLE && viewerPlotIds.length>1 &&
-                            <img style={leftImageStyle} src={PAGE_LEFT}
-                                 onClick={() => dispatchChangeActivePlotView(viewerPlotIds[prevIdx])} />
-                }
-                {layoutType===SINGLE && viewerPlotIds.length>1 &&
-                            <img style={{cursor:'pointer', paddingLeft:5, flex: '0 0 auto'}}
-                                 src={PAGE_RIGHT}
-                                 onClick={() => dispatchChangeActivePlotView(viewerPlotIds[nextIdx])} />
-                }
+                {/*{layoutType===SINGLE && viewerPlotIds.length>1 &&*/}
+                {/*            <img style={leftImageStyle} src={PAGE_LEFT}*/}
+                {/*                 onClick={() => dispatchChangeActivePlotView(viewerPlotIds[prevIdx])} />*/}
+                {/*}*/}
+                {/*{layoutType===SINGLE && viewerPlotIds.length>1 &&*/}
+                {/*            <img style={{cursor:'pointer', paddingLeft:5, flex: '0 0 auto'}}*/}
+                {/*                 src={PAGE_RIGHT}*/}
+                {/*                 onClick={() => dispatchChangeActivePlotView(viewerPlotIds[nextIdx])} />*/}
+                {/*}*/}
             </div>
             {showPager && <ImagePager pageSize={converter.maxPlots} tbl_id={activeTable.tbl_id} />}
             {(handleInlineTools || viewerPlotIds?.length>1) && <InlineRightToolbarWrapper visRoot={vr} pv={pv} dlAry={pvDlAry} />}