Skip to content

Commit beffa4c

Browse files
committed
Bug Fix: image save dialog not coming up
- image save dialog now works - fixed obsure case of exception with ShapeDataObj drawText - updated version to 2021.2.1
1 parent 3c4ee47 commit beffa4c

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

config/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//---------------------------------------------
44
BuildMajor = 2021
55
BuildMinor = 2
6-
BuildRev = 0
6+
BuildRev = 1
77
BuildNumber = 0
88
BuildType = "Final"
99

docs/release-notes.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
- To Access current (unstable) development - (Version _next_, unreleased) use docker tag: `nightly`
66

77
## Version 2021.2
8+
- 2021.2.1 (May 2021)
9+
- docker tag: `latest`, `release-2021.2`, `release-2021.2.1`
810
- 2021.2.0 (May 2021)
9-
- docker tag: `latest`, `release-2021.2`, `release-2021.2.0`
11+
- docker tag: `release-2021.2.0`
1012
- original release
1113

1214
### _Notes_
@@ -30,6 +32,11 @@
3032
##### _API_
3133
- Coverage can handle tables with HMS columns ([Firefly-678](https://github.com/Caltech-IPAC/firefly/pull/1069))
3234

35+
##### _Patches 2021.2_
36+
- 2021.2.1
37+
- Fixed: save image dialog failing to appear
38+
39+
3340
##### _Pull Request in this release_
3441
- [Bug Fixes](https://github.com/caltech-ipac/firefly/pulls?q=is%3apr+milestone%3a2021.2+label%3abug)
3542
- [All PRs](https://github.com/caltech-ipac/firefly/pulls?q=is%3apr++milestone%3a2021.2+)
@@ -68,7 +75,6 @@
6875
- firefox >= 79
6976
- edge >= 83
7077

71-
7278
##### _Pull Request in this release_
7379
- [bug fixes](https://github.com/caltech-ipac/firefly/pulls?q=is%3apr+milestone%3a2021.1+label%3abug)
7480
- [all prs](https://github.com/caltech-ipac/firefly/pulls?q=is%3apr++milestone%3a2021.1+)

src/firefly/js/ui/FitsDownloadDialog.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ const FitsDownloadDialogForm= memo( ({isWs, popupId, groupKey}) => {
163163
const [{pv,plot,hasOperation,threeC,colors,currentFileNames}]= useState(getInitState);
164164
const fields=useBindFieldGroupToStore(groupKey);
165165
const band = threeC ? getFieldVal(groupKey, 'threeBandColor', colors[0]) : Band.NO_BAND.key;
166-
const currentType = isImage(plot) ? (fields.fileType?.value ?? 'fits') : 'png';
166+
const currentType = isImage(plot) ? (fields?.fileType?.value ?? 'fits') : 'png';
167167
const fileName = (currentType === 'fits') ? currentFileNames[band] : currentFileNames[currentType];
168168
const totalChildren = (isWs ? 3 : 2) + (hasOperation ? 1 : 0) + (threeC ? 1 : 0);// fileType + save as + (fileLocation)
169169
const childH = (totalChildren*(20+mTOP));

src/firefly/js/visualize/draw/ShapeDataObj.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,14 +855,15 @@ function drawCircle(drawObj, ctx, plot, drawParams) {
855855
*/
856856
export function drawText(drawObj, ctx, plot, inPt, drawParams) {
857857
if (!inPt) return false;
858+
const pv = getPlotViewById(visRoot(), plot.plotId);
859+
if (!pv) return false;
858860

859861
const {text, textOffset, renderOptions, rotationAngle, isLonLine, textBaseline= 'top',
860862
textAngle=0, offsetOnScreen=false}= drawObj;
861863
let { textAlign='start'} = drawObj;
862864
//the angle of the grid line
863865
let angle=0;
864866
let pvAngle=undefined;
865-
const pv = getPlotViewById(visRoot(), plot.plotId);
866867

867868
if (rotationAngle){
868869
const lineAngle = parseFloat( rotationAngle.substring(0, rotationAngle.length-3));

0 commit comments

Comments
 (0)