Thchang/2366 support image coordinates

src/components/Dialogs/OnlineDataQueryDialog/CatalogOnlineQueryComponent.tsx

@@ -144,9 +144,7 @@ export class CatalogQueryComponent extends React.Component {
                 </FormGroup>
                 <FormGroup inline={false} label="Center coordinates" disabled={disable}>
                     <Select
-                        items={Object.keys(SystemType)
-                            .map(key => SystemType[key])
-                            .filter(sys => sys !== SystemType.Image)}
+                        items={Object.values(SystemType).filter(sys => sys !== SystemType.Image)}
                         activeItem={null}
                         onItemSelect={type => appStore.overlayStore.global.setSystem(type)}
                         itemRenderer={this.renderSysTypePopOver}

src/components/Dialogs/WorkspaceDialog/WorkspaceDialogComponent.tsx

@@ -8,7 +8,7 @@ import moment from "moment/moment";
 
 import {DraggableDialogComponent} from "components/Dialogs";
 import {WorkspaceListItem} from "models";
-import {AppStore, DialogId, HelpType} from "stores";
+import {AlertStore, AppStore, DialogId, HelpType} from "stores";
 
 import {AppToaster, ErrorToast, SuccessToast} from "../../Shared";
 
@@ -67,6 +67,12 @@ export const WorkspaceDialogComponent = observer(() => {
                 return;
             }
 
+            // TODO: to be removed after storing SystemType in workspace
+            if (appStore.overlayStore.isImgCoordinates && appStore.frames.map(frame => frame.spatialReference !== null).includes(true)) {
+                AlertStore.Instance.showAlert("Not supporting save workspace with spatial matching in image cooordinates");
+                return;
+            }
+
             setIsFetching(true);
             try {
                 const res = await appStore.saveWorkspace(name);

src/stores/AppStore/AppStore.ts

@@ -603,6 +603,9 @@ export class AppStore {
                 this.setSpectralMatchingEnabled(newFrame, true);
             }
             if (this.preferenceStore.autoWCSMatching & WCSMatchingType.SPATIAL && this.spatialReference !== newFrame) {
+                if (this.overlayStore.isImgCoordinates) {
+                    AST.setI(newFrame.wcsInfo, "Current", 1);
+                }
                 this.setSpatialMatchingEnabled(newFrame, true);
             }
             if (this.preferenceStore.autoWCSMatching & WCSMatchingType.RASTER && this.rasterScalingReference !== newFrame) {

src/stores/Catalog/CatalogStore.ts

@@ -324,6 +324,9 @@ export class CatalogStore {
             let yFraction = CatalogStore.GetFractionFromUnit(yUnit.toLocaleLowerCase());
 
             let wcsCopy = AST.copy(wcsInfo);
+            if (wcsCopy !== 0 && AppStore.Instance.overlayStore.isImgCoordinates) {
+                AST.setI(wcsCopy, "Current", 2);
+            }
             let system = "System=" + catalogFrame;
             AST.set(wcsCopy, system);
             if (catalogFrame === CatalogSystemType.FK4) {

src/stores/OverlayStore/OverlayStore.ts

@@ -2,7 +2,7 @@ import * as AST from "ast_wrapper";
 import {action, autorun, computed, makeObservable, observable} from "mobx";
 
 import {WCSType} from "models";
-import {AppStore, PreferenceStore} from "stores";
+import {AlertStore, AppStore, PreferenceStore} from "stores";
 import {FrameStore, OverlayBeamStore, WCS_PRECISION} from "stores/Frame";
 import {clamp, getColorForTheme, toFixed} from "utilities";
 
@@ -153,8 +153,17 @@ export class OverlayGlobalSettings {
         this.labelType = labelType;
     }
 
-    @action setSystem(system: SystemType) {
-        this.system = system;
+    @action async setSystem(system: SystemType) {
+        const frames = AppStore.Instance.frames;
+        if ((this.system === SystemType.Image) !== (system === SystemType.Image) && frames.map(f => f.spatialReference !== null).includes(true)) {
+            const confirm = await AlertStore.Instance.showInteractiveAlert("Switching system between world and image coordinates will disable spatial matching.");
+            if (confirm) {
+                frames.forEach(f => f.clearSpatialReference());
+                this.system = system;
+            }
+        } else {
+            this.system = system;
+        }
     }
 
     @action setDefaultSystem(system: SystemType) {

wasm_src/ast_wrapper/ast_wrapper.cc

@@ -53,7 +53,7 @@ EMSCRIPTEN_KEEPALIVE AstFrameSet* getFrameFromFitsChan(AstFitsChan* fitschan, bo
     }
 
     AstFrame* pixFrame = static_cast<AstFrame*> astGetFrame(frameSet, 1);
-    astSet(pixFrame, "Label(1)=X Coordinate,Label(2)=Y Coordinate");
+    astSet(pixFrame, "Label(1)=X coordinate (pixel),Label(2)=Y coordinate (pixel)");
 
     // work around for missing CTYPE1 & CTYPE2
     if (checkSkyDomain) {
@@ -107,7 +107,7 @@ EMSCRIPTEN_KEEPALIVE AstFrameSet* getSkyFrameSet(AstFrameSet* frameSet)
     }
 
     // Create 2D base frame
-    AstFrame *baseframe = astFrame(2, "Title=Pixel Coordinates,Domain=GRID,Label(1)=X Coordinate,Label(2)=Y Coordinate");
+    AstFrame *baseframe = astFrame(2, "Title=Pixel Coordinates,Domain=GRID,Label(1)=X coordinate (pixel),Label(2)=Y coordinate (pixel)");
     if (!baseframe)
     {
         cout << "Create 2D base frame failed." << endl;
@@ -222,7 +222,7 @@ EMSCRIPTEN_KEEPALIVE AstFrameSet* createShiftmapFrameset(AstFrameSet* wcsinfo, d
     // 2D pixel shifts
     double pixelOffset[] = {-pixelOffsetX, -pixelOffsetY};
     AstShiftMap* pixelShiftMap = astShiftMap(2, pixelOffset, "");
-    astAddFrame(wcsinfoShifted, AST__BASE, pixelShiftMap, astFrame(2, "Label(1)=X Coordinate,Label(2)=Y Coordinate,Domain=GRID"));
+    astAddFrame(wcsinfoShifted, AST__BASE, pixelShiftMap, astFrame(2, "Label(1)=X offset coordinate (pixel),Label(2)=Y offset coordinate (pixel),Domain=GRID"));
 
     return wcsinfoShifted;
 }
@@ -231,7 +231,7 @@ EMSCRIPTEN_KEEPALIVE AstFrameSet* initDummyFrame()
 {
     double offsets[] = {0, 0};
     AstFrameSet* frameSet = astFrameSet(astFrame(2, ""), "");
-    astAddFrame(frameSet, 1, astShiftMap(2, offsets, ""), astFrame(2, "Label(1)=X Coordinate,Label(2)=Y Coordinate,Domain=PIXEL"));
+    astAddFrame(frameSet, 1, astShiftMap(2, offsets, ""), astFrame(2, "Label(1)=X coordinate (pixel),Label(2)=Y coordinate (pixel),Domain=PIXEL"));
     return frameSet;
 }