From e3dece44e24eea32f3ff03b5f2c541b775a0486f Mon Sep 17 00:00:00 2001 From: roby Date: Thu, 28 Jul 2022 09:20:53 -0600 Subject: [PATCH 1/2] FIREFLY-1033,1035: multiple fixes - Firefly-1033: fixed: switch between hips and fits - Firefly-1035: fixed: when no files with coverage show only chage and tables:wq - Firefly-1037: more updates to acknowledgement more --- src/firefly/js/ui/VersionInfo.jsx | 19 ++++++------------- src/firefly/js/visualize/WebPlot.js | 2 +- .../js/visualize/rawData/RawDataOps.js | 1 + .../js/visualize/ui/TriViewImageSection.jsx | 5 ++--- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/firefly/js/ui/VersionInfo.jsx b/src/firefly/js/ui/VersionInfo.jsx index f16aaf6048..29394c4635 100644 --- a/src/firefly/js/ui/VersionInfo.jsx +++ b/src/firefly/js/ui/VersionInfo.jsx @@ -86,28 +86,21 @@ function VersionInfoFull() { ); } - const Acknowledgement= () => ( -
- - Firefly development at  - +
+ Firefly development by  IPAC - +  at  + Caltech  has been supported by NASA, principally through  - IRSA - , and by the National Science Foundation, through the  - Vera C. Rubin Observatory - . Firefly is open-source software, available on  - GitHub - and +  and  DockerHub - . + .
); diff --git a/src/firefly/js/visualize/WebPlot.js b/src/firefly/js/visualize/WebPlot.js index 341648de9e..e26776c037 100644 --- a/src/firefly/js/visualize/WebPlot.js +++ b/src/firefly/js/visualize/WebPlot.js @@ -614,7 +614,7 @@ function getInitZoomLevel(viewDim, req, dataWidth, dataHeight, pixelScaleDeg) { case ZoomType.TO_WIDTH: return width / dataWidth; case ZoomType.ARCSEC_PER_SCREEN_PIX: - return pixelScaleDeg / req.getZoomArcsecPerScreenPix(); + return pixelScaleDeg / req.getZoomArcsecPerScreenPix()*3600; case ZoomType.LEVEL: case ZoomType.STANDARD: default: diff --git a/src/firefly/js/visualize/rawData/RawDataOps.js b/src/firefly/js/visualize/rawData/RawDataOps.js index f7f4c4f77d..89976b242c 100644 --- a/src/firefly/js/visualize/rawData/RawDataOps.js +++ b/src/firefly/js/visualize/rawData/RawDataOps.js @@ -212,6 +212,7 @@ function clearLocalStretchData(plot) { } function isNoisyImage(plot) { + if (isNaN(plot?.webFitsData?.[Band.NO_BAND.value]?.largeBinPercent)) return false; return (!isThreeColor(plot) && plot.webFitsData[Band.NO_BAND.value].largeBinPercent>.03); } diff --git a/src/firefly/js/visualize/ui/TriViewImageSection.jsx b/src/firefly/js/visualize/ui/TriViewImageSection.jsx index c6cada0f75..d545d07299 100644 --- a/src/firefly/js/visualize/ui/TriViewImageSection.jsx +++ b/src/firefly/js/visualize/ui/TriViewImageSection.jsx @@ -215,7 +215,7 @@ function onActiveTable (layoutInfo, action) { let {coverageLockedOn, showCoverage, showMeta, metaDataTableId} = images; const showFits= shouldShowFits(); - showImages= showFits||coverageLockedOn; + showImages= showFits; if (!tbl_id) { images = {showMeta: false, showCoverage: false, showFits, metaDataTableId: null}; @@ -243,9 +243,8 @@ function onActiveTable (layoutInfo, action) { showImages = true; } else { showCoverage = false; - showImages= showFits||coverageLockedOn; + showImages= showFits; } - if (anyHasMeta) { metaDataTableId = isMetaDataTable(tbl_id) ? tbl_id : findFirstMetaTable(tblList); showMeta = true; From 15ac3b5934cbac9ba22bdb22f8593127ce03dc2d Mon Sep 17 00:00:00 2001 From: roby Date: Thu, 28 Jul 2022 14:39:26 -0600 Subject: [PATCH 2/2] IRSA-4722: Fixed data products viewer three color hide issue --- docs/release-notes.md | 15 ++++- .../js/metaConvert/ImageDataProductsUtil.js | 2 +- .../js/visualize/ui/ColorBandChooserPopup.jsx | 56 ++++++++++++------- 3 files changed, 51 insertions(+), 22 deletions(-) diff --git a/docs/release-notes.md b/docs/release-notes.md index 8093bdaa17..e8c1eefdce 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -8,8 +8,10 @@ ## Version 2022.2 +- 2022.2.1 (April 2022) + - docker tag: `latest`, `2022.2`, `2022.2.1` - 2022.2 - (July 2022) - - docker tag: `latest`, `2022.2`, `2022.2.0` + - docker tag: `2022.2.0` ### _Notes_ #### This release has notable UI, Infrastructure, and API enhancements @@ -34,6 +36,16 @@ - Fixed: WAVE_TAB: The algorithm is producing incorrect results [Firefly-989](https://github.com/Caltech-IPAC/firefly/pull/1224) - Multiple table related bugs + +##### _Patches 2022.2_ +- 2022.2.1 + - Added IPAC Logo to version dialog([Firefly-1037](https://github.com/Caltech-IPAC/firefly/pull/1225)) + - Stretch dropdown shows checkbox if stretch selected ([Firefly-1029](https://github.com/Caltech-IPAC/firefly/pull/1225)) + - Fixed: TAP column table showing filters ([PR](https://github.com/Caltech-IPAC/firefly/pull/1244)) + - Fixed: Cube planes all change stretch ([Firefly-1038](https://github.com/Caltech-IPAC/firefly/pull/1225)) + + + ##### _Pull Requests in this release_ - [All Bug Fixes](https://github.com/caltech-ipac/firefly/pulls?q=is%3apr+milestone%3a2022.2+label%3abug) - [All PRs](https://github.com/caltech-ipac/firefly/pulls?q=is%3apr++milestone%3a2022.2+) @@ -77,6 +89,7 @@ ##### _Patches 2022.1_ - 2022.1.1 - Fixed: Not packaging proprietary data correctly ([IRSA-4570,IRSA-4571](https://github.com/Caltech-IPAC/firefly/pull/1209)) + ## Version 2021.4 (December 2021) diff --git a/src/firefly/js/metaConvert/ImageDataProductsUtil.js b/src/firefly/js/metaConvert/ImageDataProductsUtil.js index fefb3b1df5..7889b8ded1 100644 --- a/src/firefly/js/metaConvert/ImageDataProductsUtil.js +++ b/src/firefly/js/metaConvert/ImageDataProductsUtil.js @@ -237,7 +237,7 @@ function replotImageDataProducts(activePlotId, imageViewerId, tbl_id, reqAry, th dispatchPlotImage( { plotId:threeCPlotId, viewerId:imageViewerId, wpRequest:plotThreeReqAry, threeColor:true, - pvOptions: {userCanDeletePlots: true, menuItemKeys:{imageSelect : false}}, + pvOptions: {userCanDeletePlots: false, menuItemKeys:{imageSelect : false}}, attributes: { tbl_id } }); } diff --git a/src/firefly/js/visualize/ui/ColorBandChooserPopup.jsx b/src/firefly/js/visualize/ui/ColorBandChooserPopup.jsx index d7398660fa..3cac88124e 100644 --- a/src/firefly/js/visualize/ui/ColorBandChooserPopup.jsx +++ b/src/firefly/js/visualize/ui/ColorBandChooserPopup.jsx @@ -11,9 +11,9 @@ import {InputGroup} from '../../ui/InputGroup.jsx'; import {ListBoxInputField} from '../../ui/ListBoxInputField.jsx'; import DialogRootContainer from '../../ui/DialogRootContainer.jsx'; import {PopupPanel} from '../../ui/PopupPanel.jsx'; -import {showInfoPopup} from '../../ui/PopupUtil.jsx'; +import {INFO_POPUP, showInfoPopup} from '../../ui/PopupUtil.jsx'; import {getMultiViewRoot,dispatchUpdateCustom, getViewer} from '../MultiViewCntlr.js'; -import {dispatchShowDialog, dispatchHideDialog} from '../../core/ComponentCntlr.js'; +import {dispatchShowDialog, dispatchHideDialog, isDialogVisible} from '../../core/ComponentCntlr.js'; import {Band, allBandAry} from '../Band.js'; @@ -38,35 +38,46 @@ function ColorBandChooserPanel ({viewerId, bandData, dataId}) { const options= Object.keys(threeOp).map( (k) => ({value:k, label:threeOp[k].title})); options.push({value:'NONE', label:'Disable'}); - var redVal= Object.keys(threeOp).find( (k) => Boolean(threeOp[k].color===Band.RED)); - var greenVal= Object.keys(threeOp).find( (k) => Boolean(threeOp[k].color===Band.GREEN)); - var blueVal= Object.keys(threeOp).find( (k) => Boolean(threeOp[k].color===Band.BLUE)); + const {threeColorVisible}= getViewer(getMultiViewRoot(), viewerId)?.customData[dataId]; + + let redVal= Object.keys(threeOp).find( (k) => Boolean(threeOp[k].color===Band.RED)); + let greenVal= Object.keys(threeOp).find( (k) => Boolean(threeOp[k].color===Band.GREEN)); + let blueVal= Object.keys(threeOp).find( (k) => Boolean(threeOp[k].color===Band.BLUE)); if (!redVal) redVal= 'NONE'; if (!greenVal) greenVal= 'NONE'; if (!blueVal) blueVal= 'NONE'; return ( - -
- - +
+
+ - - - + +
+
+
+ update3Color(request,bandData, viewerId, dataId)} + closeOnValid={true} + dialogId='ColorBandChooserPopup' /> + + {threeColorVisible && hideThreeColor(viewerId, dataId)} + closeOnValid={true} dialogId='ColorBandChooserPopup' />}
- update3Color(request,bandData, viewerId, dataId)} - closeOnValid={false} - dialogId='ColorBandChooserPopup' /> ); @@ -110,6 +121,11 @@ function validate(request) { return {valid:true}; } +function hideThreeColor(viewerId, dataId) { + const v= getViewer(getMultiViewRoot(), viewerId); + dispatchUpdateCustom(viewerId,{...v.customData, [dataId]:{...v.customData[dataId], threeColorVisible:false}}); +} + function loadThreeColor(request, bandData, viewerId, dataId) { const v= getViewer(getMultiViewRoot(), viewerId);