Thchang/2366 support image coordinates

src/components/ImageView/Overlay/OverlayComponent.tsx

@@ -5,7 +5,7 @@ import * as _ from "lodash";
 import {observer} from "mobx-react";
 
 import {CursorInfo, ImageItem, ImageType, SPECTRAL_TYPE_STRING} from "models";
-import {AppStore, OverlayStore, PreferenceStore} from "stores";
+import {AppStore, OverlayStore, PreferenceStore, SystemType} from "stores";
 
 import "./OverlayComponent.scss";
 
@@ -70,11 +70,11 @@ export class OverlayComponent extends React.Component<OverlayComponentProps> {
                 const scaleMapping = AST.scaleMap2D(1.0, 1.0 / frame.aspectRatio);
                 const newFrame = AST.frame(2, "Domain=PIXEL");
                 AST.addFrame(tempWcsInfo, 1, scaleMapping, newFrame);
-                AST.setI(tempWcsInfo, "Base", 3);
-                AST.setI(tempWcsInfo, "Current", 2);
+                AST.setI(tempWcsInfo, "Base", frame.validWcs ? 3 : 2);
+                AST.setI(tempWcsInfo, "Current", frame.validWcs ? 2 : 1);
             }
 
-            if (frame.isOffsetCoord) {
+            if (frame.isOffsetCoord && AppStore.Instance.overlayStore.global.explicitSystem !== SystemType.Image) {
                 const fovSizeInArcsec = frame.getWcsSizeInArcsec(frame.fovSize);
                 const viewSize = fovSizeInArcsec.x > fovSizeInArcsec.y ? fovSizeInArcsec.y : fovSizeInArcsec.x;
                 const factor = 2; // jump factor
@@ -214,7 +214,7 @@ export class OverlayComponent extends React.Component<OverlayComponentProps> {
             const formatStringX = this.props.overlaySettings.numbers.formatStringX;
             const formatStyingY = this.props.overlaySettings.numbers.formatStringY;
             const explicitSystem = this.props.overlaySettings.global.explicitSystem;
-            if (formatStringX !== undefined && formatStyingY !== undefined && explicitSystem !== undefined) {
+            if (formatStringX !== undefined && formatStyingY !== undefined && explicitSystem !== undefined && explicitSystem !== SystemType.Image) {
                 AST.set(frame.wcsInfo, `Format(${frame.dirX})=${formatStringX}, Format(${frame.dirY})=${formatStyingY}, System=${explicitSystem},` + dirAxesSetting);
             }
         }

src/components/ImageView/Toolbar/ToolbarComponent.tsx

@@ -33,7 +33,8 @@ export class ToolbarComponent extends React.Component<ToolbarComponentProps> {
         [SystemType.FK4, "FK4"],
         [SystemType.Galactic, "GAL"],
         [SystemType.Ecliptic, "ECL"],
-        [SystemType.ICRS, "ICRS"]
+        [SystemType.ICRS, "ICRS"],
+        [SystemType.Image, "IMG"]
     ]);
 
     private static readonly CoordinateSystemTooltip = new Map<SystemType, string>([
@@ -174,6 +175,7 @@ export class ToolbarComponent extends React.Component<ToolbarComponentProps> {
                 <MenuItem text={ToolbarComponent.CoordinateSystemName.get(SystemType.Galactic)} onClick={() => this.handleCoordinateSystemClicked(SystemType.Galactic)} />
                 <MenuItem text={ToolbarComponent.CoordinateSystemName.get(SystemType.Ecliptic)} onClick={() => this.handleCoordinateSystemClicked(SystemType.Ecliptic)} />
                 <MenuItem text={ToolbarComponent.CoordinateSystemName.get(SystemType.ICRS)} onClick={() => this.handleCoordinateSystemClicked(SystemType.ICRS)} />
+                <MenuItem text={ToolbarComponent.CoordinateSystemName.get(SystemType.Image)} onClick={() => this.handleCoordinateSystemClicked(SystemType.Image)} />
                 <FormGroup inline={false} className="offset-group">
                     <Switch className="offset-switch" disabled={frame.isPVImage || frame.isSwappedZ || frame.isUVImage} checked={frame.isOffsetCoord} onChange={frame.toggleOffsetCoord} label="Offset" />
                     <Collapse isOpen={frame.isOffsetCoord}>

src/components/Shared/CoordNumericInput/CoordNumericInput.tsx

@@ -1,6 +1,6 @@
 import {Position, Tooltip} from "@blueprintjs/core";
 
-import {AppStore, NUMBER_FORMAT_LABEL} from "stores";
+import {AppStore, NUMBER_FORMAT_LABEL, SystemType} from "stores";
 import {CoordinateMode} from "stores/Frame";
 
 import {SafeNumericInput} from "..";
@@ -131,6 +131,14 @@ export const CoordNumericInput = ({coord, inputType, value, onChange, valueWcs,
     if (coord === CoordinateMode.Image) {
         return <ImageCoordNumericInput inputType={inputType} value={value} onChange={onChange} disabled={disabled} customPlaceholder={customPlaceholder} />;
     } else {
-        return <WcsCoordNumericInput inputType={inputType} valueWcs={valueWcs} onChangeWcs={onChangeWcs} disabled={disabled || wcsDisabled} customPlaceholder={customPlaceholder} />;
+        return (
+            <WcsCoordNumericInput
+                inputType={inputType}
+                valueWcs={valueWcs}
+                onChangeWcs={onChangeWcs}
+                disabled={disabled || wcsDisabled || AppStore.Instance.overlayStore.global.system === SystemType.Image}
+                customPlaceholder={customPlaceholder}
+            />
+        );
     }
 };

src/stores/AppStore/AppStore.ts

@@ -1987,6 +1987,8 @@ export class AppStore {
                             this.contourDataSource = frame;
                         }
                     }
+
+                    this.overlayStore.setDefaultsFromFrame(this.activeFrame);
                 } else {
                     this.widgetsStore.updateImageWidgetTitle(this.layoutStore.dockedLayout);
                 }

src/stores/CatalogOnlineQuery/CatalogOnlineQueryConfigStore.ts

@@ -258,7 +258,7 @@ export class CatalogOnlineQueryConfigStore {
 
     @computed get searchRadiusInDegree(): number {
         const activeFrame = this.activeFrame;
-        if (activeFrame) {
+        if (activeFrame?.validWcs && OverlayStore.Instance.global.explicitSystem !== SystemType.Image) {
             const requiredFrameView = activeFrame.requiredFrameView;
             const diagonal1 = this.calculateDistanceFromPixelCoord({x: requiredFrameView.xMax, y: requiredFrameView.yMax}, {x: requiredFrameView.xMin, y: requiredFrameView.yMin}, true);
             const diagonal2 = this.calculateDistanceFromPixelCoord({x: requiredFrameView.xMin, y: requiredFrameView.yMax}, {x: requiredFrameView.xMax, y: requiredFrameView.yMin}, true);

src/stores/Frame/FrameStore.ts

@@ -1511,8 +1511,12 @@ export class FrameStore {
 
     updateWcsSystem = (formatStringX: string, formatStyingY: string, explicitSystem: SystemType) => {
         if (formatStringX !== undefined && formatStyingY !== undefined && explicitSystem !== undefined) {
-            if (!(this.isPVImage && this.spectralAxis?.valid) && !(this.isSwappedZ && this.spectralAxis?.valid)) {
-                if (this.validWcs && this.wcsInfo) {
+            if (!(this.isPVImage && this.spectralAxis?.valid) && !(this.isSwappedZ && this.spectralAxis?.valid) && this.validWcs && this.wcsInfo) {
+                if (explicitSystem === SystemType.Image) {
+                    // Use base frame for image coordinates
+                    AST.setI(this.wcsInfo, "Current", 1);
+                } else {
+                    AST.setI(this.wcsInfo, "Current", 2);
                     AST.set(this.wcsInfo, `Format(${this.dirX})=${formatStringX}, Format(${this.dirY})=${formatStyingY}, System=${explicitSystem}`);
                 }
             }
@@ -1925,7 +1929,7 @@ export class FrameStore {
         let cursorPosWCS, cursorPosFormatted;
         let precisionX = 0;
         let precisionY = 0;
-        if (this.validWcs || this.isYX || this.isPVImage || this.isUVImage || this.isSwappedZ) {
+        if ((this.validWcs || this.isYX || this.isPVImage || this.isUVImage || this.isSwappedZ) && this.overlayStore.global.explicitSystem !== SystemType.Image) {
             // We need to compare X and Y coordinates in both directions
             // to avoid a confusing drop in precision at rounding threshold
             const offsetBlock = [
@@ -2181,8 +2185,8 @@ export class FrameStore {
     @action private createWcsInfoShifted = () => {
         if (this.spatialReference) {
             this.spatialReference.createWcsInfoShifted();
-        } else {
-            if (this.wcsInfo && this.offsetCenter) {
+        } else if (this.wcsInfo && this.offsetCenter) {
+            if (AppStore.Instance.overlayStore.global.explicitSystem !== SystemType.Image) {
                 const centerInRad = getUnformattedWCSPoint(this.wcsInfo, this.offsetCenter);
 
                 if (centerInRad) {
@@ -2194,6 +2198,8 @@ export class FrameStore {
                         }
                     }
                 }
+            } else {
+                this.wcsInfoShifted = AST.createShiftmapPixelFrameset(this.wcsInfo, this.offsetCenter.x, this.offsetCenter.y);
             }
         }
     };

src/stores/OverlayStore/OverlayStore.ts

@@ -32,7 +32,8 @@ export enum SystemType {
     FK4 = "FK4",
     FK5 = "FK5",
     Galactic = "GALACTIC",
-    ICRS = "ICRS"
+    ICRS = "ICRS",
+    Image = "Cartesian"
 }
 
 export enum NumberFormatType {
@@ -99,9 +100,11 @@ export class OverlayGlobalSettings {
         astString.add("Labelling", this.labelType);
         astString.add("Color", AstColorsIndex.GLOBAL);
         astString.add("Tol", toFixed(this.tolerance / 100, 2), this.tolerance >= 0.001); // convert to fraction
-        astString.add("System", this.explicitSystem);
+        if (typeof this.explicitSystem !== "undefined" && this.explicitSystem !== SystemType.Image) {
+            astString.add("System", this.explicitSystem);
+        }
 
-        if ((frame?.isXY || frame?.isYX) && !frame?.isPVImage && typeof this.explicitSystem !== "undefined") {
+        if ((frame?.isXY || frame?.isYX) && !frame?.isPVImage && typeof this.explicitSystem !== "undefined" && this.explicitSystem !== SystemType.Image) {
             if (this.system === SystemType.FK4) {
                 astString.add("Equinox", "1950");
             } else {
@@ -1021,7 +1024,7 @@ export class OverlayStore {
         autorun(() => {
             this.setFormatsFromSystem();
             AppStore.Instance.frames.forEach(frame => {
-                if (frame?.validWcs && frame?.wcsInfoForTransformation && this.global.explicitSystem) {
+                if (frame?.validWcs && frame?.wcsInfoForTransformation && this.global.explicitSystem && this.global.explicitSystem !== SystemType.Image) {
                     AST.set(frame.wcsInfoForTransformation, `System=${this.global.explicitSystem}`);
                 }
             });

wasm_src/ast_wrapper/ast_wrapper.cc

@@ -52,6 +52,9 @@ EMSCRIPTEN_KEEPALIVE AstFrameSet* getFrameFromFitsChan(AstFitsChan* fitschan, bo
         return nullptr;
     }
 
+    AstFrame* pixFrame = static_cast<AstFrame*> astGetFrame(frameSet, 1);
+    astSet(pixFrame, "Label(1)=X Coordinate,Label(2)=Y Coordinate");
+
     // work around for missing CTYPE1 & CTYPE2
     if (checkSkyDomain) {
         const char *domain = astGetC(frameSet, "Domain");
@@ -104,7 +107,7 @@ EMSCRIPTEN_KEEPALIVE AstFrameSet* getSkyFrameSet(AstFrameSet* frameSet)
     }
 
     // Create 2D base frame
-    AstFrame *baseframe = astFrame(2, "Title=Pixel Coordinates,Domain=GRID,Label(1)=Pixel axis 1,Label(2)=Pixel axis 2");
+    AstFrame *baseframe = astFrame(2, "Title=Pixel Coordinates,Domain=GRID,Label(1)=X Coordinate,Label(2)=Y Coordinate");
     if (!baseframe)
     {
         cout << "Create 2D base frame failed." << endl;
@@ -180,10 +183,10 @@ EMSCRIPTEN_KEEPALIVE AstFrameSet* createTransformedFrameset(AstFrameSet* wcsinfo
         return nullptr;
     }
 
-    AstFrame* pixFrame = static_cast<AstFrame*> astGetFrame(wcsinfo, 1);
+    AstFrame* pixFrame = static_cast<AstFrame*> astGetFrame(wcsinfo, AST__BASE);
     AstFrame* pixFrameCopy = static_cast<AstFrame*> astCopy(pixFrame);
-    AstFrame* skyFrame = static_cast<AstFrame*> astGetFrame(wcsinfo, 2);
-    AstMapping* pixToSkyMapping = static_cast<AstMapping*> astGetMapping(wcsinfo, 1, 2);
+    AstFrame* skyFrame = static_cast<AstFrame*> astGetFrame(wcsinfo, AST__CURRENT);
+    AstMapping* pixToSkyMapping = static_cast<AstMapping*> astGetMapping(wcsinfo, AST__BASE, AST__CURRENT);
     AstFrameSet* wcsInfoTransformed = astFrameSet(pixFrame, "");
 
     // 2D shifts
@@ -219,11 +222,22 @@ EMSCRIPTEN_KEEPALIVE AstFrameSet* createShiftmapFrameset(AstFrameSet* wcsinfo, d
     return wcsinfoShifted;
 }
 
+EMSCRIPTEN_KEEPALIVE AstFrameSet* createShiftmapPixelFrameset(AstFrameSet* wcsinfo, double offsetX, double offsetY)
+{
+    AstFrameSet* wcsinfoShifted = static_cast<AstFrameSet*> astCopy(wcsinfo);
+
+    // 2D shifts
+    double offset[] = {-offsetX, -offsetY};
+    AstShiftMap* shiftMap = astShiftMap(2, offset, "");
+
+    astAddFrame(wcsinfoShifted, AST__BASE, shiftMap, astFrame(2, "Label(1)=X Coordinate,Label(2)=Y Coordinate,Domain=GRID"));
+
+    return wcsinfoShifted;
+}
+
 EMSCRIPTEN_KEEPALIVE AstFrameSet* initDummyFrame()
 {
-    double offsets[] = {-1, -1};
-    AstFrameSet* frameSet = astFrameSet(astFrame(2, ""), "");
-    astAddFrame(frameSet, 1, astShiftMap(2, offsets, ""), astFrame(2, "Label(1)=X Coordinate,Label(2)=Y Coordinate,Domain=PIXEL"));
+    AstFrameSet* frameSet = astFrameSet(astFrame(2, "Label(1)=X Coordinate,Label(2)=Y Coordinate,Domain=GRID"), "");
     return frameSet;
 }
 

wasm_src/ast_wrapper/index.d.ts

@@ -57,6 +57,7 @@ export function setI(obj: AstObject, attrib: string, value: number): void;
 export function setD(obj: AstObject, attrib: string, value: number): void;
 export function createTransformedFrameset(frameSet: FrameSet, offsetX: number, offsetY: number, angle: number, originX: number, originY: number, scaleX: number, scaleY: number);
 export function createShiftmapFrameset(frameSet: FrameSet, offsetX: number, offsetY: number);
+export function createShiftmapPixelFrameset(frameSet: FrameSet, offsetX: number, offsetY: number);
 // Not exported fillTransformGrid()
 export function makeSwappedFrameSet(originFrameSet: FrameSet, dirAxis: number, spectralAxis: number, pixelZ: number, nsample: number): FrameSet;
 

wasm_src/ast_wrapper/post.ts

@@ -130,6 +130,7 @@ Module.setI = Module.cwrap("setI", null, ["number", "string", "number"]);
 Module.setD = Module.cwrap("setD", null, ["number", "string", "number"]);
 Module.createTransformedFrameset = Module.cwrap("createTransformedFrameset", "number", ["number", "number", "number", "number", "number", "number", "number", "number"]);
 Module.createShiftmapFrameset = Module.cwrap("createShiftmapFrameset", "number", ["number", "number"]);
+Module.createShiftmapPixelFrameset = Module.cwrap("createShiftmapPixelFrameset", "number", ["number", "number"]);
 Module.fillTransformGrid = Module.cwrap("fillTransformGrid", "number", ["number", "number", "number", "number", "number", "number", "number", "number"]);
 Module.pointList = Module.cwrap("pointList", "number", ["number", "number", "number", "number", "number"]);
 Module.axPointList = Module.cwrap("axPointList", "number", ["number", "number", "number", "number", "number", "number", "number"]);