Skip to content

Commit e3dece4

Browse files
committed
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
1 parent 67cfdbe commit e3dece4

File tree

4 files changed

+10
-17
lines changed

4 files changed

+10
-17
lines changed

src/firefly/js/ui/VersionInfo.jsx

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,28 +86,21 @@ function VersionInfoFull() {
8686
);
8787
}
8888

89-
9089
const Acknowledgement= () => (
91-
<div style={{padding:'10px 5px 3px 5px', width:600, fontSize:'smaller'}}>
92-
<span>
93-
Firefly development at&nbsp;
94-
</span>
90+
<div style={{padding:'10px 5px 3px 5px', width:520, fontSize:'85%', lineHeight:1.3}}>
91+
Firefly development by&nbsp;
9592
<a href='https://ipac.caltech.edu' target='ipac-window'>IPAC</a>
96-
<span>
93+
&nbsp;at&nbsp;
94+
<a href='https://www.caltech.edu' target='caltech-window'>Caltech</a>
9795
&nbsp;has been supported by NASA, principally through&nbsp;
98-
</span>
9996
<a href='https://irsa.ipac.caltech.edu' target='ipac-window'>IRSA</a>
100-
<span>
10197
, and by the National Science Foundation, through the&nbsp;
102-
</span>
10398
<a href='https://www.lsst.org/' target='rubin-window'>Vera C. Rubin Observatory</a>
104-
<span>
10599
. Firefly is open-source software, available on&nbsp;
106-
</span>
107100
<a href='https://github.com/Caltech-IPAC/firefly' target='github-window'>GitHub</a>
108-
<span> and </span>
101+
&nbsp;and&nbsp;
109102
<a href='https://hub.docker.com/repository/docker/ipac/firefly' target='dockerhub-window'>DockerHub</a>
110-
<span>.</span>
103+
.
111104
</div>
112105

113106
);

src/firefly/js/visualize/WebPlot.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ function getInitZoomLevel(viewDim, req, dataWidth, dataHeight, pixelScaleDeg) {
614614
case ZoomType.TO_WIDTH:
615615
return width / dataWidth;
616616
case ZoomType.ARCSEC_PER_SCREEN_PIX:
617-
return pixelScaleDeg / req.getZoomArcsecPerScreenPix();
617+
return pixelScaleDeg / req.getZoomArcsecPerScreenPix()*3600;
618618
case ZoomType.LEVEL:
619619
case ZoomType.STANDARD:
620620
default:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ function clearLocalStretchData(plot) {
212212
}
213213

214214
function isNoisyImage(plot) {
215+
if (isNaN(plot?.webFitsData?.[Band.NO_BAND.value]?.largeBinPercent)) return false;
215216
return (!isThreeColor(plot) && plot.webFitsData[Band.NO_BAND.value].largeBinPercent>.03);
216217
}
217218

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ function onActiveTable (layoutInfo, action) {
215215
let {coverageLockedOn, showCoverage, showMeta, metaDataTableId} = images;
216216

217217
const showFits= shouldShowFits();
218-
showImages= showFits||coverageLockedOn;
218+
showImages= showFits;
219219

220220
if (!tbl_id) {
221221
images = {showMeta: false, showCoverage: false, showFits, metaDataTableId: null};
@@ -243,9 +243,8 @@ function onActiveTable (layoutInfo, action) {
243243
showImages = true;
244244
} else {
245245
showCoverage = false;
246-
showImages= showFits||coverageLockedOn;
246+
showImages= showFits;
247247
}
248-
249248
if (anyHasMeta) {
250249
metaDataTableId = isMetaDataTable(tbl_id) ? tbl_id : findFirstMetaTable(tblList);
251250
showMeta = true;

0 commit comments

Comments
 (0)