-
@@ -73,19 +74,22 @@
Exposure Mode
-
-
-
-
-
@@ -123,23 +131,23 @@
Subframe
-
-
-
-
+
+
-
@@ -36,18 +36,18 @@
+
+
@@ -64,7 +64,7 @@
+
-
Shutter
diff --git a/desktop/src/app/filterwheel/filterwheel.component.ts b/desktop/src/app/filterwheel/filterwheel.component.ts
index 6e813c7b7..e0beff8f5 100644
--- a/desktop/src/app/filterwheel/filterwheel.component.ts
+++ b/desktop/src/app/filterwheel/filterwheel.component.ts
@@ -1,4 +1,4 @@
-import { Component, HostListener, NgZone, OnDestroy, OnInit } from '@angular/core'
+import { AfterViewInit, Component, HostListener, NgZone, OnDestroy } from '@angular/core'
import { Title } from '@angular/platform-browser'
import { ApiService } from '../../shared/services/api.service'
import { ElectronService } from '../../shared/services/electron.service'
@@ -10,7 +10,7 @@ import { FilterWheel } from '../../shared/types'
templateUrl: './filterwheel.component.html',
styleUrls: ['./filterwheel.component.scss']
})
-export class FilterWheelComponent implements OnInit, OnDestroy {
+export class FilterWheelComponent implements AfterViewInit, OnDestroy {
filterWheels: FilterWheel[] = []
filterWheel?: FilterWheel
@@ -48,7 +48,7 @@ export class FilterWheelComponent implements OnInit, OnDestroy {
})
}
- async ngOnInit() {
+ async ngAfterViewInit() {
this.filterWheels = await this.api.attachedFilterWheels()
}
@@ -65,12 +65,15 @@ export class FilterWheelComponent implements OnInit, OnDestroy {
const filterWheel = await this.api.filterWheel(this.filterWheel.name)
Object.assign(this.filterWheel, filterWheel)
+
+ this.loadPreference()
this.update()
+ this.savePreference()
} else {
this.title.setTitle(`Filter Wheel`)
}
- this.electron.ipcRenderer.send('FILTER_WHEEL_CHANGED', this.filterWheel)
+ this.electron.send('FILTER_WHEEL_CHANGED', this.filterWheel)
}
async connect() {
@@ -117,6 +120,8 @@ export class FilterWheelComponent implements OnInit, OnDestroy {
this.filterToMove = this.filterToEdit
this.api.filterWheelSyncNames(this.filterWheel!, this.filterNames)
+
+ this.electron.send('FILTER_WHEEL_RENAMED', this.filterWheel)
}
}
diff --git a/desktop/src/app/focuser/focuser.component.html b/desktop/src/app/focuser/focuser.component.html
index 109cd4d52..7fe430b8d 100644
--- a/desktop/src/app/focuser/focuser.component.html
+++ b/desktop/src/app/focuser/focuser.component.html
@@ -32,34 +32,27 @@
+
+
-
-
-
-
-
+
-
-
-
-
+
diff --git a/desktop/src/app/home/home.component.ts b/desktop/src/app/home/home.component.ts
index 5f9908873..28d5f2a81 100644
--- a/desktop/src/app/home/home.component.ts
+++ b/desktop/src/app/home/home.component.ts
@@ -1,24 +1,24 @@
-import { Component, HostListener, NgZone, OnDestroy, OnInit } from '@angular/core'
+import { AfterViewInit, Component, HostListener, NgZone, OnDestroy } from '@angular/core'
import { MessageService } from 'primeng/api'
import { ApiService } from '../../shared/services/api.service'
import { BrowserWindowService } from '../../shared/services/browser-window.service'
import { ElectronService } from '../../shared/services/electron.service'
import { PreferenceService } from '../../shared/services/preference.service'
-import { Camera, FilterWheel, Focuser, HomeWindowType } from '../../shared/types'
+import { Camera, Device, FilterWheel, Focuser, HomeWindowType, Mount } from '../../shared/types'
@Component({
selector: 'app-home',
templateUrl: './home.component.html',
styleUrls: ['./home.component.scss'],
})
-export class HomeComponent implements OnInit, OnDestroy {
+export class HomeComponent implements AfterViewInit, OnDestroy {
host = ''
port = 7624
connected = false
cameras: Camera[] = []
- mounts: Camera[] = []
+ mounts: Mount[] = []
focusers: Focuser[] = []
filterWheels: FilterWheel[] = []
domes: Camera[] = []
@@ -70,57 +70,106 @@ export class HomeComponent implements OnInit, OnDestroy {
|| this.hasFilterWheel || this.hasDome || this.hasRotator || this.hasSwitch
}
+ private startListening(
+ type: 'CAMERA' | 'MOUNT' | 'FOCUSER' | 'FILTER_WHEEL',
+ onAdd: (device: T) => number,
+ onRemove: (device: T) => number,
+ ) {
+ this.api.indiStartListening(`${type}_ATTACHED`)
+ this.api.indiStartListening(`${type}_DETACHED`)
+
+ this.electron.ipcRenderer.on(`${type}_ATTACHED`, (_, device: T) => {
+ this.ngZone.run(() => {
+ if (onAdd(device) === 1) {
+ this.electron.send(`${type}_CHANGED`, device)
+ }
+ })
+ })
+
+ this.electron.ipcRenderer.on(`${type}_DETACHED`, (_, device: T) => {
+ this.ngZone.run(() => {
+ if (onRemove(device) === 0) {
+ this.electron.send(`${type}_CHANGED`, undefined)
+ }
+ })
+ })
+ }
+
constructor(
private electron: ElectronService,
private browserWindow: BrowserWindowService,
private api: ApiService,
private message: MessageService,
private preference: PreferenceService,
- ngZone: NgZone,
+ private ngZone: NgZone,
) {
- this.api.indiStartListening('CAMERA_ATTACHED')
- this.api.indiStartListening('CAMERA_DETACHED')
-
- electron.ipcRenderer.on('CAMERA_ATTACHED', (_, camera: Camera) => {
- ngZone.run(() => this.cameras.push(camera))
- })
-
- electron.ipcRenderer.on('CAMERA_DETACHED', (_, camera: Camera) => {
- ngZone.run(() => this.cameras.splice(this.cameras.findIndex(e => e.name === camera.name), 1))
- })
-
- this.api.indiStartListening('FOCUSER_ATTACHED')
- this.api.indiStartListening('FOCUSER_DETACHED')
-
- electron.ipcRenderer.on('FOCUSER_ATTACHED', (_, focuser: Focuser) => {
- ngZone.run(() => this.focusers.push(focuser))
- })
-
- electron.ipcRenderer.on('FOCUSER_DETACHED', (_, focuser: Focuser) => {
- ngZone.run(() => this.focusers.splice(this.focusers.findIndex(e => e.name === focuser.name), 1))
- })
-
- this.api.indiStartListening('FILTER_WHEEL_ATTACHED')
- this.api.indiStartListening('FILTER_WHEEL_DETACHED')
-
- electron.ipcRenderer.on('FILTER_WHEEL_ATTACHED', (_, filterWheel: FilterWheel) => {
- ngZone.run(() => this.filterWheels.push(filterWheel))
- })
-
- electron.ipcRenderer.on('FILTER_WHEEL_DETACHED', (_, filterWheel: FilterWheel) => {
- ngZone.run(() => this.filterWheels.splice(this.filterWheels.findIndex(e => e.name === filterWheel.name), 1))
- })
- }
-
- async ngOnInit() {
+ this.startListening('CAMERA',
+ (device) => {
+ return this.cameras.push(device)
+ },
+ (device) => {
+ this.cameras.splice(this.cameras.findIndex(e => e.name === device.name), 1)
+ return this.cameras.length
+ },
+ )
+
+ this.startListening('MOUNT',
+ (device) => {
+ return this.mounts.push(device)
+ },
+ (device) => {
+ this.mounts.splice(this.mounts.findIndex(e => e.name === device.name), 1)
+ return this.mounts.length
+ },
+ )
+
+ this.startListening('FOCUSER',
+ (device) => {
+ return this.focusers.push(device)
+ },
+ (device) => {
+ this.focusers.splice(this.focusers.findIndex(e => e.name === device.name), 1)
+ return this.focusers.length
+ },
+ )
+
+ this.startListening('FILTER_WHEEL',
+ (device) => {
+ return this.filterWheels.push(device)
+ },
+ (device) => {
+ this.filterWheels.splice(this.filterWheels.findIndex(e => e.name === device.name), 1)
+ return this.filterWheels.length
+ },
+ )
+ }
+
+ async ngAfterViewInit() {
this.updateConnection()
this.host = this.preference.get('home.host', 'localhost')
this.port = this.preference.get('home.port', 7624)
this.cameras = await this.api.attachedCameras()
+ this.mounts = await this.api.attachedMounts()
this.focusers = await this.api.attachedFocusers()
this.filterWheels = await this.api.attachedFilterWheels()
+
+ if (this.cameras.length > 0) {
+ this.electron.send('CAMERA_CHANGED', this.cameras[0])
+ }
+
+ if (this.mounts.length > 0) {
+ this.electron.send('MOUNT_CHANGED', this.mounts[0])
+ }
+
+ if (this.focusers.length > 0) {
+ this.electron.send('FOCUSER_CHANGED', this.focusers[0])
+ }
+
+ if (this.filterWheels.length > 0) {
+ this.electron.send('FILTER_WHEEL_CHANGED', this.filterWheels[0])
+ }
}
@HostListener('window:unload')
@@ -156,6 +205,9 @@ export class HomeComponent implements OnInit, OnDestroy {
async open(type: HomeWindowType) {
switch (type) {
+ case 'MOUNT':
+ this.browserWindow.openMount({ bringToFront: true })
+ break
case 'CAMERA':
this.browserWindow.openCamera({ bringToFront: true })
break
@@ -175,7 +227,7 @@ export class HomeComponent implements OnInit, OnDestroy {
this.browserWindow.openINDI(undefined, { bringToFront: true })
break
case 'IMAGE':
- const path = await this.electron.ipcRenderer.sendSync('OPEN_FITS')
+ const path = await this.electron.sendSync('OPEN_FITS')
if (path) this.browserWindow.openImage(path, undefined, 'PATH')
break
case 'ABOUT':
diff --git a/desktop/src/app/image/image.component.html b/desktop/src/app/image/image.component.html
index 5a4167056..18871938c 100644
--- a/desktop/src/app/image/image.component.html
+++ b/desktop/src/app/image/image.component.html
@@ -32,7 +32,7 @@
-
Mount
@@ -137,18 +137,33 @@
-
-
+
@@ -80,7 +80,7 @@ export class ImageComponent implements OnInit, AfterViewInit, OnDestroy {
private panZoom?: PanZoom
private imageURL!: string
- private imageInfo?: SavedCameraImage
+ private imageInfo?: ImageInfo
private imageMouseX = 0
private imageMouseY = 0
private imageParams: ImageParams = {}
@@ -117,7 +117,7 @@ export class ImageComponent implements OnInit, AfterViewInit, OnDestroy {
label: 'Save as...',
icon: 'mdi mdi-content-save',
command: async () => {
- const path = await this.electron.ipcRenderer.sendSync('SAVE_FITS_AS')
+ const path = await this.electron.sendSync('SAVE_FITS_AS')
if (path) this.api.saveImageAs(this.imageParams.path!, path)
},
},
@@ -244,9 +244,7 @@ export class ImageComponent implements OnInit, AfterViewInit, OnDestroy {
electron.ipcRenderer.on('PARAMS_CHANGED', (_, data: ImageParams) => {
this.loadImageFromParams(data)
})
- }
- ngOnInit() {
this.solverPathOrUrl = this.preference.get('image.solver.pathOrUrl', '')
this.solverRadius = this.preference.get('image.solver.radius', 4)
this.solverDownsampleFactor = this.preference.get('image.solver.downsampleFactor', 1)
@@ -284,8 +282,8 @@ export class ImageComponent implements OnInit, AfterViewInit, OnDestroy {
await this.loadImageFromPath(this.imageParams.path)
} else if (this.imageParams.camera) {
try {
- this.imageInfo = await this.api.latestImageOfCamera(this.imageParams.camera)
- await this.loadImageFromPath(this.imageInfo.path)
+ const savedImage = await this.api.latestImageOfCamera(this.imageParams.camera)
+ await this.loadImageFromPath(savedImage.path)
} catch (e) {
console.error(e)
}
@@ -310,6 +308,7 @@ export class ImageComponent implements OnInit, AfterViewInit, OnDestroy {
this.imageInfo = info
this.scnrMenuItem.disabled = info.mono
+
if (info.rightAscension) this.solverCenterRA = info.rightAscension
if (info.declination) this.solverCenterDEC = info.declination
diff --git a/desktop/src/app/indi/indi.component.ts b/desktop/src/app/indi/indi.component.ts
index 68f49b94c..1d2f0c373 100644
--- a/desktop/src/app/indi/indi.component.ts
+++ b/desktop/src/app/indi/indi.component.ts
@@ -15,7 +15,7 @@ export interface INDIParams {
templateUrl: './indi.component.html',
styleUrls: ['./indi.component.scss'],
})
-export class INDIComponent implements OnInit, AfterViewInit, OnDestroy {
+export class INDIComponent implements AfterViewInit, OnDestroy {
devices: Device[] = []
properties: INDIProperty[] = []
@@ -64,8 +64,6 @@ export class INDIComponent implements OnInit, AfterViewInit, OnDestroy {
})
}
- ngOnInit() { }
-
async ngAfterViewInit() {
this.route.queryParams.subscribe(e => {
const params = JSON.parse(decodeURIComponent(e.params)) as INDIParams
@@ -74,6 +72,7 @@ export class INDIComponent implements OnInit, AfterViewInit, OnDestroy {
this.devices = [
...await this.api.attachedCameras(),
+ ...await this.api.attachedMounts(),
...await this.api.attachedFocusers(),
...await this.api.attachedFilterWheels(),
]
diff --git a/desktop/src/app/indi/property/indi-property.component.ts b/desktop/src/app/indi/property/indi-property.component.ts
index acf9ac98f..e2133f1b9 100644
--- a/desktop/src/app/indi/property/indi-property.component.ts
+++ b/desktop/src/app/indi/property/indi-property.component.ts
@@ -1,4 +1,4 @@
-import { AfterContentInit, AfterViewInit, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'
+import { AfterContentInit, Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core'
import { INDIProperty, INDIPropertyItem, INDISendProperty, INDISendPropertyItem } from '../../../shared/types'
@Component({
@@ -6,7 +6,7 @@ import { INDIProperty, INDIPropertyItem, INDISendProperty, INDISendPropertyItem
templateUrl: './indi-property.component.html',
styleUrls: ['./indi-property.component.scss'],
})
-export class INDIPropertyComponent implements OnInit, AfterContentInit, OnDestroy {
+export class INDIPropertyComponent implements AfterContentInit, OnDestroy {
@Input()
property!: INDIProperty
@@ -17,8 +17,6 @@ export class INDIPropertyComponent implements OnInit, AfterContentInit, OnDestro
@Output()
readonly onSend = new EventEmitter()
- ngOnInit() { }
-
ngAfterContentInit() {
for (const item of this.property.items) {
if (!item.valueToSend) {
diff --git a/desktop/src/app/mount/mount.component.html b/desktop/src/app/mount/mount.component.html
new file mode 100644
index 000000000..f4d2e6ff6
--- /dev/null
+++ b/desktop/src/app/mount/mount.component.html
@@ -0,0 +1,189 @@
+()
+ private computeCoordinateSubscription: Subscription[] = []
+ private readonly moveToDirection = [false, false]
+
+ readonly targetCoordinateOptions: MenuItem[] = [
+ {
+ icon: 'mdi mdi-check',
+ label: 'Go To',
+ command: () => {
+ this.targetCoordinateOption = this.targetCoordinateOptions[0]
+ this.goTo()
+ },
+ },
+ {
+ icon: 'mdi mdi-check',
+ label: 'Slew To',
+ command: () => {
+ this.targetCoordinateOption = this.targetCoordinateOptions[1]
+ this.slewTo()
+ },
+ },
+ {
+ icon: 'mdi mdi-sync',
+ label: 'Sync',
+ command: () => {
+ this.targetCoordinateOption = this.targetCoordinateOptions[2]
+ this.sync()
+ },
+ },
+ {
+ icon: 'mdi mdi-target',
+ label: 'Locations',
+ items: [
+ {
+ icon: 'mdi mdi-target',
+ label: 'Current location',
+ },
+ {
+ icon: 'mdi mdi-target',
+ label: 'Current location (J2000)',
+ },
+ {
+ icon: 'mdi mdi-target',
+ label: 'Zenith',
+ },
+ {
+ icon: 'mdi mdi-target',
+ label: 'North celestial pole',
+ },
+ {
+ icon: 'mdi mdi-target',
+ label: 'South celestial pole',
+ },
+ {
+ icon: 'mdi mdi-target',
+ label: 'Galactic center',
+ },
+ ],
+ },
+ ]
+
+ targetCoordinateOption = this.targetCoordinateOptions[0]
+
+ constructor(
+ private title: Title,
+ private api: ApiService,
+ private browserWindow: BrowserWindowService,
+ private electron: ElectronService,
+ private preference: PreferenceService,
+ ngZone: NgZone,
+ ) {
+ title.setTitle('Mount')
+
+ this.api.indiStartListening('MOUNT')
+
+ electron.ipcRenderer.on('MOUNT_UPDATED', (_, mount: Mount) => {
+ if (mount.name === this.mount?.name) {
+ ngZone.run(() => {
+ Object.assign(this.mount!, mount)
+ this.update()
+ })
+ }
+ })
+
+ this.computeCoordinateSubscription[0] = this.computeCoordinatePublisher
+ .pipe(debounceTime(1000))
+ .subscribe(() => this.computeCoordinates())
+
+ this.computeCoordinateSubscription[1] = interval(5000)
+ .subscribe(() => this.computeCoordinatePublisher.next())
+ }
+
+ async ngAfterViewInit() {
+ this.mounts = await this.api.attachedMounts()
+ }
+
+ ngOnDestroy() {
+ this.api.indiStopListening('MOUNT')
+
+ this.computeCoordinateSubscription[0]?.unsubscribe()
+ this.computeCoordinateSubscription[1]?.unsubscribe()
+ }
+
+ async mountChanged() {
+ if (this.mount) {
+ this.title.setTitle(`Mount ・ ${this.mount!.name}`)
+
+ const mount = await this.api.mount(this.mount.name)
+ Object.assign(this.mount, mount)
+
+ this.loadPreference()
+ this.update()
+ this.savePreference()
+ } else {
+ this.title.setTitle(`Mount`)
+ }
+
+ this.electron.send('MOUNT_CHANGED', this.mount)
+ }
+
+ connect() {
+ if (this.connected) {
+ this.api.mountDisconnect(this.mount!)
+ } else {
+ this.api.mountConnect(this.mount!)
+ }
+ }
+
+ goTo() {
+ this.api.mountGoTo(this.mount!, this.targetRightAscension, this.targetDeclination, this.targetCoordinateType === 'J2000')
+ }
+
+ slewTo() {
+ this.api.mountSlewTo(this.mount!, this.targetRightAscension, this.targetDeclination, this.targetCoordinateType === 'J2000')
+ }
+
+ sync() {
+ this.api.mountSync(this.mount!, this.targetRightAscension, this.targetDeclination, this.targetCoordinateType === 'J2000')
+ }
+
+ targetCoordinateOptionClicked() {
+ if (this.targetCoordinateOption === this.targetCoordinateOptions[0]) {
+ this.goTo()
+ } else if (this.targetCoordinateOption === this.targetCoordinateOptions[1]) {
+ this.slewTo()
+ } else if (this.targetCoordinateOption === this.targetCoordinateOptions[2]) {
+ this.sync()
+ }
+ }
+
+ moveTo(direction: string, pressed: boolean, event: MouseEvent) {
+ if (event.button === 0) {
+ if (this.moveToDirection[0] !== pressed) {
+ switch (direction[0]) {
+ case 'N':
+ this.api.mountMoveNorth(this.mount!, pressed)
+ break
+ case 'S':
+ this.api.mountMoveSouth(this.mount!, pressed)
+ break
+ case 'W':
+ this.api.mountMoveWest(this.mount!, pressed)
+ break
+ case 'E':
+ this.api.mountMoveEast(this.mount!, pressed)
+ break
+ }
+
+ this.moveToDirection[0] = pressed
+ }
+
+ if (this.moveToDirection[1] !== pressed) {
+ switch (direction[1]) {
+ case 'W':
+ this.api.mountMoveWest(this.mount!, pressed)
+ break
+ case 'E':
+ this.api.mountMoveEast(this.mount!, pressed)
+ break
+ default:
+ return
+ }
+
+ this.moveToDirection[1] = pressed
+ }
+ }
+ }
+
+ trackingToggled() {
+ if (this.connected) {
+ this.api.mountTracking(this.mount!, this.tracking)
+ }
+ }
+
+ trackModeChanged() {
+ if (this.connected) {
+ this.api.mountTrackMode(this.mount!, this.trackMode)
+ }
+ }
+
+ slewRateChanged() {
+ if (this.connected && this.slewRate) {
+ this.api.mountSlewRate(this.mount!, this.slewRate)
+ }
+ }
+
+ park() {
+ if (this.connected) {
+ this.api.mountPark(this.mount!)
+ }
+ }
+
+ unpark() {
+ if (this.connected) {
+ this.api.mountUnpark(this.mount!)
+ }
+ }
+
+ home() {
+ if (this.connected) {
+ this.api.mountHome(this.mount!)
+ }
+ }
+
+ private async update() {
+ if (this.mount) {
+ this.connected = this.mount.connected
+ this.slewing = this.mount.slewing
+ this.parking = this.mount.parking
+ this.parked = this.mount.parked
+ this.canPark = this.mount.canPark
+ this.canHome = this.mount.canHome
+ this.trackModes = this.mount.trackModes
+ this.trackMode = this.mount.trackMode
+ this.slewRates = this.mount.slewRates
+ this.slewRate = this.mount.slewRate
+ this.rightAscension = this.mount.rightAscension
+ this.declination = this.mount.declination
+ this.pierSide = this.mount.pierSide
+ this.tracking = this.mount.tracking
+
+ this.computeCoordinatePublisher.next()
+ }
+ }
+
+ private async computeCoordinates() {
+ if (this.mount && this.mount.connected) {
+ const computedCoordinates = await this.api.mountComputeCoordinates(this.mount!, false, '', '', true, true, true)
+ this.rightAscensionJ2000 = computedCoordinates.rightAscension
+ this.declinationJ2000 = computedCoordinates.declination
+ this.azimuth = computedCoordinates.azimuth
+ this.altitude = computedCoordinates.altitude
+ this.constellation = computedCoordinates.constellation
+ this.meridianAt = computedCoordinates.meridianAt
+ this.timeLeftToMeridianFlip = computedCoordinates.timeLeftToMeridianFlip
+ this.lst = computedCoordinates.lst
+ }
+ }
+
+ private loadPreference() {
+
+ }
+
+ private savePreference() {
+
+ }
+}
diff --git a/desktop/src/shared/services/api.service.ts b/desktop/src/shared/services/api.service.ts
index a5633dc3a..eb4efcf60 100644
--- a/desktop/src/shared/services/api.service.ts
+++ b/desktop/src/shared/services/api.service.ts
@@ -1,12 +1,11 @@
import { HttpClient } from '@angular/common/http'
import { Injectable } from '@angular/core'
-import * as moment from 'moment'
+import moment from 'moment'
import { firstValueFrom } from 'rxjs'
import {
- BodyPosition, Calibration, Camera, CameraStartCapture, Constellation, DeepSkyObject, Device,
- FilterWheel, Focuser,
- HipsSurvey, INDIEventType, INDIProperty, INDISendProperty, ImageAnnotation, ImageChannel, Location, MinorPlanet,
- PlateSolverType, SCNRProtectionMethod, SavedCameraImage, SkyObjectType, Star, Twilight
+ BodyPosition, Calibration, Camera, CameraStartCapture, ComputedCoordinates, Constellation, DeepSkyObject, Device,
+ FilterWheel, Focuser, HipsSurvey, INDIEventType, INDIProperty, INDISendProperty, ImageAnnotation, ImageChannel, ImageInfo, Location, MinorPlanet,
+ Mount, PlateSolverType, SCNRProtectionMethod, SavedCameraImage, SkyObjectType, SlewRate, Star, TrackMode, Twilight
} from '../types'
@Injectable({ providedIn: 'root' })
@@ -94,6 +93,85 @@ export class ApiService {
return this.get(`latestImageOfCamera?name=${camera.name}`)
}
+ attachedMounts() {
+ return this.get(`attachedMounts`)
+ }
+
+ mount(name: string) {
+ return this.get(`mount?name=${name}`)
+ }
+
+ mountConnect(mount: Mount) {
+ return this.post(`mountConnect?name=${mount.name}`)
+ }
+
+ mountDisconnect(mount: Mount) {
+ return this.post(`mountDisconnect?name=${mount.name}`)
+ }
+
+ mountTracking(mount: Mount, enable: boolean) {
+ return this.post(`mountTracking?name=${mount.name}&enable=${enable}`)
+ }
+
+ mountSync(mount: Mount, rightAscension: string, declination: string, j2000: boolean) {
+ return this.post(`mountSync?name=${mount.name}&rightAscension=${rightAscension}&declination=${declination}&j2000=${j2000}`)
+ }
+
+ mountSlewTo(mount: Mount, rightAscension: string, declination: string, j2000: boolean) {
+ return this.post(`mountSlewTo?name=${mount.name}&rightAscension=${rightAscension}&declination=${declination}&j2000=${j2000}`)
+ }
+
+ mountGoTo(mount: Mount, rightAscension: string, declination: string, j2000: boolean) {
+ return this.post(`mountGoTo?name=${mount.name}&rightAscension=${rightAscension}&declination=${declination}&j2000=${j2000}`)
+ }
+
+ mountPark(mount: Mount) {
+ return this.post(`mountPark?name=${mount.name}`)
+ }
+
+ mountUnpark(mount: Mount) {
+ return this.post(`mountUnpark?name=${mount.name}`)
+ }
+
+ mountHome(mount: Mount) {
+ return this.post(`mountHome?name=${mount.name}`)
+ }
+
+ mountAbort(mount: Mount) {
+ return this.post(`mountAbort?name=${mount.name}`)
+ }
+
+ mountTrackMode(mount: Mount, mode: TrackMode) {
+ return this.post(`mountTrackMode?name=${mount.name}&mode=${mode}`)
+ }
+
+ mountSlewRate(mount: Mount, rate: SlewRate) {
+ return this.post(`mountSlewRate?name=${mount.name}&rate=${rate.name}`)
+ }
+
+ mountMoveNorth(mount: Mount, enable: boolean) {
+ return this.post(`mountMoveNorth?name=${mount.name}&enable=${enable}`)
+ }
+
+ mountMoveSouth(mount: Mount, enable: boolean) {
+ return this.post(`mountMoveSouth?name=${mount.name}&enable=${enable}`)
+ }
+
+ mountMoveEast(mount: Mount, enable: boolean) {
+ return this.post(`mountMoveEast?name=${mount.name}&enable=${enable}`)
+ }
+
+ mountMoveWest(mount: Mount, enable: boolean) {
+ return this.post(`mountMoveWest?name=${mount.name}&enable=${enable}`)
+ }
+
+ mountComputeCoordinates(mount: Mount, j2000: boolean, rightAscension?: string, declination?: string,
+ equatorial: boolean = true, horizontal: boolean = true, meridian: boolean = false,
+ ) {
+ return this.post(`mountComputeCoordinates?name=${mount.name}&rightAscension=${rightAscension || ''}&declination=${declination || ''}` +
+ `&j2000=${j2000}&equatorial=${equatorial}&horizontal=${horizontal}&meridian=${meridian}`)
+ }
+
attachedFocusers() {
return this.get(`attachedFocusers`)
}
@@ -177,7 +255,7 @@ export class ApiService {
responseType: 'blob'
}))
- const info = JSON.parse(response.headers.get('X-Image-Info')!) as SavedCameraImage
+ const info = JSON.parse(response.headers.get('X-Image-Info')!) as ImageInfo
return { info, blob: response.body! }
}
diff --git a/desktop/src/shared/services/browser-window.service.ts b/desktop/src/shared/services/browser-window.service.ts
index 0001080a5..b1d011519 100644
--- a/desktop/src/shared/services/browser-window.service.ts
+++ b/desktop/src/shared/services/browser-window.service.ts
@@ -15,6 +15,14 @@ export class BrowserWindowService {
await this.electron.ipcRenderer.invoke('OPEN_WINDOW', data)
}
+ openMount(options: OpenWindowOptions = {}) {
+ this.openWindow({
+ ...options,
+ id: 'mount', path: 'mount', icon: options.icon || 'mount',
+ width: options.width || 400, height: options.height || 440,
+ })
+ }
+
openCamera(options: OpenWindowOptions = {}) {
this.openWindow({
...options,
@@ -27,7 +35,7 @@ export class BrowserWindowService {
this.openWindow({
...options,
id: 'focuser', path: 'focuser', icon: options.icon || 'focus',
- width: options.width || 380, height: options.height || 276,
+ width: options.width || 360, height: options.height || 225,
})
}
@@ -35,7 +43,7 @@ export class BrowserWindowService {
this.openWindow({
...options,
id: 'filterWheel', path: 'filterWheel', icon: options.icon || 'filter-wheel',
- width: options.width || 340, height: options.height || 204,
+ width: options.width || 320, height: options.height || 182,
})
}
diff --git a/desktop/src/shared/services/electron.service.ts b/desktop/src/shared/services/electron.service.ts
index 678a494f0..9ba42277b 100644
--- a/desktop/src/shared/services/electron.service.ts
+++ b/desktop/src/shared/services/electron.service.ts
@@ -52,4 +52,12 @@ export class ElectronService {
get isElectron() {
return !!(window && window.process && window.process.type)
}
+
+ send(channel: string, ...data: any[]) {
+ this.ipcRenderer.send(channel, ...data)
+ }
+
+ sendSync(channel: string, ...data: any[]) {
+ return this.ipcRenderer.sendSync(channel, ...data)
+ }
}
diff --git a/desktop/src/shared/types.ts b/desktop/src/shared/types.ts
index c77ee0c9d..6542db6d8 100644
--- a/desktop/src/shared/types.ts
+++ b/desktop/src/shared/types.ts
@@ -1,79 +1,124 @@
export interface Device {
- name: string
- connected: boolean
-}
-
-export interface Thermometer {
- hasThermometer: boolean
- temperature: number
-}
-
-export interface Camera extends Device, Thermometer {
- exposuring: boolean
- hasCoolerControl: boolean
- coolerPower: number
- cooler: boolean
- hasDewHeater: boolean
- dewHeater: boolean
- frameFormats: string[]
- canAbort: boolean
- cfaOffsetX: number
- cfaOffsetY: number
- cfaType: CfaPattern
- exposureMin: number
- exposureMax: number
- exposureState: PropertyState
- exposure: number
- hasCooler: boolean
- canSetTemperature: boolean
- canSubFrame: boolean
- x: number
- minX: number
- maxX: number
- y: number
- minY: number
- maxY: number
- width: number
- minWidth: number
- maxWidth: number
- height: number
- minHeight: number
- maxHeight: number
- canBin: boolean
- maxBinX: number
- maxBinY: number
- binX: number
- binY: number
- gain: number
- gainMin: number
- gainMax: number
- offset: number
- offsetMin: number
- offsetMax: number
- hasGuiderHead: boolean
- pixelSizeX: number
- pixelSizeY: number
- canPulseGuide: boolean
- pulseGuiding: boolean
+ readonly name: string
+ readonly connected: boolean
+}
+
+export interface Thermometer extends Device {
+ readonly hasThermometer: boolean
+ readonly temperature: number
+}
+
+export interface GuideOutput extends Device {
+ readonly canPulseGuide: boolean
+ readonly pulseGuiding: boolean
+}
+
+export interface Camera extends GuideOutput, Thermometer {
+ readonly exposuring: boolean
+ readonly hasCoolerControl: boolean
+ readonly coolerPower: number
+ readonly cooler: boolean
+ readonly hasDewHeater: boolean
+ readonly dewHeater: boolean
+ readonly frameFormats: string[]
+ readonly canAbort: boolean
+ readonly cfaOffsetX: number
+ readonly cfaOffsetY: number
+ readonly cfaType: CfaPattern
+ readonly exposureMin: number
+ readonly exposureMax: number
+ readonly exposureState: PropertyState
+ readonly exposure: number
+ readonly hasCooler: boolean
+ readonly canSetTemperature: boolean
+ readonly canSubFrame: boolean
+ readonly x: number
+ readonly minX: number
+ readonly maxX: number
+ readonly y: number
+ readonly minY: number
+ readonly maxY: number
+ readonly width: number
+ readonly minWidth: number
+ readonly maxWidth: number
+ readonly height: number
+ readonly minHeight: number
+ readonly maxHeight: number
+ readonly canBin: boolean
+ readonly maxBinX: number
+ readonly maxBinY: number
+ readonly binX: number
+ readonly binY: number
+ readonly gain: number
+ readonly gainMin: number
+ readonly gainMax: number
+ readonly offset: number
+ readonly offsetMin: number
+ readonly offsetMax: number
+ readonly hasGuiderHead: boolean
+ readonly pixelSizeX: number
+ readonly pixelSizeY: number
+ readonly canPulseGuide: boolean
+ readonly pulseGuiding: boolean
+}
+
+export interface Parkable {
+ readonly canPark: boolean
+ readonly parking: boolean
+ readonly parked: boolean
+}
+
+export interface GPS extends Device {
+ readonly hasGPS: boolean
+ readonly longitude: number
+ readonly latitude: number
+ readonly elevation: number
+ readonly dateTime: number
+ readonly offsetInMinutes: number
+}
+
+export interface Mount extends GPS, GuideOutput, Parkable {
+ readonly name: string
+ readonly connected: boolean
+ readonly slewing: boolean
+ readonly tracking: boolean
+ readonly canAbort: boolean
+ readonly canSync: boolean
+ readonly canGoTo: boolean
+ readonly canHome: boolean
+ readonly slewRates: SlewRate[]
+ readonly slewRate?: SlewRate
+ readonly trackModes: TrackMode[]
+ readonly trackMode: TrackMode
+ readonly pierSide: PierSide
+ readonly guideRateWE: number
+ readonly guideRateNS: number
+ readonly rightAscension: string
+ readonly declination: string
+}
+
+export interface SlewRate {
+ readonly name: string
+ readonly label: string
}
export interface Focuser extends Device, Thermometer {
- moving: boolean
- position: number
- canAbsoluteMove: boolean
- canRelativeMove: boolean
- canAbort: boolean
- canReverse: boolean
- reverse: boolean
- canSync: boolean
- hasBackslash: boolean
- maxPosition: number
+ readonly moving: boolean
+ readonly position: number
+ readonly canAbsoluteMove: boolean
+ readonly canRelativeMove: boolean
+ readonly canAbort: boolean
+ readonly canReverse: boolean
+ readonly reverse: boolean
+ readonly canSync: boolean
+ readonly hasBacklash: boolean
+ readonly maxPosition: number
}
export interface FilterWheel extends Device {
- count: number
- position: number
- moving: boolean
+ readonly count: number
+ readonly position: number
+ readonly moving: boolean
}
export interface CameraStartCapture {
@@ -117,6 +162,9 @@ export interface SavedCameraImage {
height: number
mono: boolean
savedAt: number
+}
+
+export interface ImageInfo extends SavedCameraImage {
stretchShadow: number
stretchHighlight: number
stretchMidtone: number
@@ -340,6 +388,17 @@ export interface Calibration {
radius: number
}
+export interface ComputedCoordinates {
+ rightAscension: string
+ declination: string
+ azimuth: string
+ altitude: string
+ constellation: Constellation
+ meridianAt: string
+ timeLeftToMeridianFlip: string
+ lst: string
+}
+
export enum ExposureTimeUnit {
MINUTE = 'm',
SECOND = 's',
@@ -519,17 +578,27 @@ export type PlateSolverType = 'ASTROMETRY_NET_LOCAL' |
'WATNEY'
export const INDI_EVENT_TYPES = [
- 'ALL', 'DEVICE', 'CAMERA', 'FOCUSER', 'FILTER_WHEEL',
+ 'ALL', 'DEVICE', 'CAMERA', 'MOUNT', 'FOCUSER', 'FILTER_WHEEL',
'DEVICE_PROPERTY_CHANGED', 'DEVICE_PROPERTY_DELETED',
'DEVICE_MESSAGE_RECEIVED', 'CAMERA_IMAGE_SAVED',
'CAMERA_UPDATED', 'CAMERA_CAPTURE_FINISHED',
'CAMERA_ATTACHED', 'CAMERA_DETACHED',
+ 'MOUNT_UPDATED', 'MOUNT_ATTACHED', 'MOUNT_DETACHED',
'FOCUSER_UPDATED', 'FOCUSER_ATTACHED', 'FOCUSER_DETACHED',
'FILTER_WHEEL_UPDATED', 'FILTER_WHEEL_ATTACHED', 'FILTER_WHEEL_DETACHED',
] as const
export type INDIEventType = (typeof INDI_EVENT_TYPES)[number]
+export const INTERNAL_EVENT_TYPES = [
+ 'SELECTED_CAMERA', 'SELECTED_FOCUSER', 'SELECTED_FILTER_WHEEL',
+ 'SELECTED_MOUNT',
+ 'CAMERA_CHANGED', 'FOCUSER_CHANGED', 'MOUNT_CHANGED',
+ 'FILTER_WHEEL_CHANGED', 'FILTER_WHEEL_RENAMED',
+] as const
+
+export type InternalEventType = (typeof INTERNAL_EVENT_TYPES)[number]
+
export type ImageSource = 'FRAMING' | 'PATH' | 'CAMERA'
export const HIPS_SURVEY_TYPES = [
@@ -562,3 +631,9 @@ export const HIPS_SURVEY_TYPES = [
] as const
export type HipsSurveyType = (typeof HIPS_SURVEY_TYPES)[number]
+
+export type PierSide = 'EAST' | 'WEST' | 'NEITHER'
+
+export type TargetCoordinateType = 'J2000' | 'JNOW'
+
+export type TrackMode = 'SIDEREAL' | ' LUNAR' | 'SOLAR' | 'KING' | 'CUSTOM'
diff --git a/nebulosa-horizons/src/main/kotlin/nebulosa/horizons/HorizonsElement.kt b/nebulosa-horizons/src/main/kotlin/nebulosa/horizons/HorizonsElement.kt
index 1754dcd8d..77ed4cda0 100644
--- a/nebulosa-horizons/src/main/kotlin/nebulosa/horizons/HorizonsElement.kt
+++ b/nebulosa-horizons/src/main/kotlin/nebulosa/horizons/HorizonsElement.kt
@@ -3,7 +3,7 @@ package nebulosa.horizons
import java.time.LocalDateTime
import java.time.ZoneOffset
-data class HorizonsElement(val time: LocalDateTime) : HashMap(7), Comparable {
+data class HorizonsElement(val dateTime: LocalDateTime) : HashMap(7), Comparable {
fun asString(quantity: HorizonsQuantity, defaultValue: String = "", index: Int = 0): String {
return if (quantity.numberOfColumns > 1) this[quantity]?.split(',')?.get(index) ?: defaultValue
@@ -19,30 +19,30 @@ data class HorizonsElement(val time: LocalDateTime) : HashMap, dateTime: LocalDateTime): HorizonsElement? {
val seconds = dateTime.toEpochSecond(ZoneOffset.UTC)
- return ephemeris.find { it.time.toEpochSecond(ZoneOffset.UTC) >= seconds }
+ return ephemeris.find { it.dateTime.toEpochSecond(ZoneOffset.UTC) >= seconds }
}
}
}
diff --git a/nebulosa-horizons/src/main/kotlin/nebulosa/horizons/HorizonsEphemeris.kt b/nebulosa-horizons/src/main/kotlin/nebulosa/horizons/HorizonsEphemeris.kt
index 31cc830ef..a73a01105 100644
--- a/nebulosa-horizons/src/main/kotlin/nebulosa/horizons/HorizonsEphemeris.kt
+++ b/nebulosa-horizons/src/main/kotlin/nebulosa/horizons/HorizonsEphemeris.kt
@@ -12,10 +12,10 @@ data class HorizonsEphemeris(private val elements: MutableList)
ClosedRange, List by elements {
override val start
- get() = elements.first().time
+ get() = elements.first().dateTime
override val endInclusive
- get() = elements.last().time
+ get() = elements.last().dateTime
override fun isEmpty() = elements.isEmpty()
diff --git a/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/FocuserDevice.kt b/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/FocuserDevice.kt
index afff28afe..b60e6ded4 100644
--- a/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/FocuserDevice.kt
+++ b/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/FocuserDevice.kt
@@ -21,7 +21,7 @@ internal open class FocuserDevice(
override var canReverse = false
override var reverse = false
override var canSync = false
- override var hasBackslash = false
+ override var hasBacklash = false
override var maxPosition = 0
override var hasThermometer = false
@@ -188,7 +188,7 @@ internal open class FocuserDevice(
return "Focuser(name=$name, moving=$moving, position=$position," +
" canAbsoluteMove=$canAbsoluteMove, canRelativeMove=$canRelativeMove," +
" canAbort=$canAbort, canReverse=$canReverse, reverse=$reverse," +
- " canSync=$canSync, hasBackslash=$hasBackslash," +
+ " canSync=$canSync, hasBacklash=$hasBacklash," +
" maxPosition=$maxPosition, hasThermometer=$hasThermometer," +
" temperature=$temperature)"
}
diff --git a/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/GPSDevice.kt b/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/GPSDevice.kt
index 52da93688..684a2b49d 100644
--- a/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/GPSDevice.kt
+++ b/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/GPSDevice.kt
@@ -24,7 +24,7 @@ internal class GPSDevice(
override var longitude = Angle.ZERO
override var latitude = Angle.ZERO
override var elevation = Distance.ZERO
- override var time = OffsetDateTime.MIN!!
+ override var dateTime = OffsetDateTime.MIN!!
override fun handleMessage(message: INDIProtocol) {
when (message) {
@@ -45,7 +45,7 @@ internal class GPSDevice(
val utcTime = GPS.extractTime(message["UTC"]!!.value) ?: return
val utcOffset = message["OFFSET"]!!.value.toDoubleOrNull() ?: 0.0
- time = OffsetDateTime.of(utcTime, ZoneOffset.ofTotalSeconds((utcOffset * 60.0).toInt()))
+ dateTime = OffsetDateTime.of(utcTime, ZoneOffset.ofTotalSeconds((utcOffset * 60.0).toInt()))
handler.fireOnEventReceived(GPSTimeChanged(this))
}
@@ -61,6 +61,6 @@ internal class GPSDevice(
override fun toString(): String {
return "GPS(hasGPS=$hasGPS, longitude=$longitude, latitude=$latitude," +
- " elevation=$elevation, time=$time)"
+ " elevation=$elevation, dateTime=$dateTime)"
}
}
diff --git a/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/mount/MountDevice.kt b/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/mount/MountDevice.kt
index 9c24063c6..f1e1cc666 100644
--- a/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/mount/MountDevice.kt
+++ b/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/mount/MountDevice.kt
@@ -17,11 +17,7 @@ import nebulosa.math.Angle.Companion.deg
import nebulosa.math.Angle.Companion.hours
import nebulosa.math.Distance
import nebulosa.math.Distance.Companion.m
-import nebulosa.nova.astrometry.Constellation
-import nebulosa.nova.position.GeographicPosition
-import nebulosa.nova.position.Geoid
import nebulosa.nova.position.ICRF
-import nebulosa.time.UTC
import java.time.OffsetDateTime
import java.time.ZoneOffset
@@ -50,11 +46,6 @@ internal open class MountDevice(
override var guideRateNS = 0.0
override var rightAscension = Angle.ZERO
override var declination = Angle.ZERO
- override var rightAscensionJ2000 = Angle.ZERO
- override var declinationJ2000 = Angle.ZERO
- override var azimuth = Angle.ZERO
- override var altitude = Angle.ZERO
- override var constellation = Constellation.PSC
override var canPulseGuide = false
override var pulseGuiding = false
@@ -63,9 +54,7 @@ internal open class MountDevice(
override var longitude = Angle.ZERO
override var latitude = Angle.ZERO
override var elevation = Distance.ZERO
- override var time = OffsetDateTime.now()!!
-
- @Volatile private var centerPosition: GeographicPosition? = null
+ override var dateTime = OffsetDateTime.now()!!
override fun handleMessage(message: INDIProtocol) {
when (message) {
@@ -188,8 +177,6 @@ internal open class MountDevice(
longitude = message["LONG"]!!.value.deg
elevation = message["ELEV"]!!.value.m
- centerPosition = Geoid.IERS2010.latLon(longitude, latitude, elevation)
-
handler.fireOnEventReceived(MountGeographicCoordinateChanged(this))
}
}
@@ -200,7 +187,7 @@ internal open class MountDevice(
val utcTime = GPS.extractTime(message["UTC"]!!.value) ?: return
val utcOffset = message["OFFSET"]!!.value.toDoubleOrNull() ?: 0.0
- time = OffsetDateTime.of(utcTime, ZoneOffset.ofTotalSeconds((utcOffset * 3600.0).toInt()))
+ dateTime = OffsetDateTime.of(utcTime, ZoneOffset.ofTotalSeconds((utcOffset * 3600.0).toInt()))
handler.fireOnEventReceived(MountTimeChanged(this))
}
@@ -264,7 +251,7 @@ internal open class MountDevice(
}
}
- override fun trackingMode(mode: TrackMode) {
+ override fun trackMode(mode: TrackMode) {
sendNewSwitch("TELESCOPE_TRACK_MODE", "TRACK_$mode" to true)
}
@@ -322,35 +309,12 @@ internal open class MountDevice(
sendNewNumber("GEOGRAPHIC_COORD", "LAT" to latitude.degrees, "LONG" to longitude.degrees, "ELEV" to elevation.meters)
}
- override fun time(time: OffsetDateTime) {
- val offsetHours = time.offset.totalSeconds / 3600.0
+ override fun dateTime(dateTime: OffsetDateTime) {
+ val offsetHours = dateTime.offset.totalSeconds / 3600.0
val offsetMinutes = (offsetHours - offsetHours.toInt()) * 60.0 % 60.0
val offset = "%02d:%02d".format(offsetHours.toInt(), offsetMinutes.toInt())
- sendNewText("TIME_UTC", "UTC" to GPS.formatTime(time.toLocalDateTime()), "OFFSET" to offset)
- }
-
- override fun computeCoordinates(j2000: Boolean, horizontal: Boolean, epoch: UTC) {
- val center = centerPosition ?: return
-
- val icrf = ICRF.equatorial(rightAscension, declination, time = epoch, epoch = epoch, center = center)
- constellation = Constellation.find(icrf)
-
- if (j2000) {
- val raDec = icrf.equatorialJ2000()
- rightAscensionJ2000 = raDec.longitude.normalized
- declinationJ2000 = raDec.latitude
-
- handler.fireOnEventReceived(MountEquatorialJ2000CoordinatesChanged(this))
- }
-
- if (horizontal) {
- val altAz = icrf.horizontal()
- azimuth = altAz.longitude.normalized
- altitude = altAz.latitude
-
- handler.fireOnEventReceived(MountHorizontalCoordinatesChanged(this))
- }
+ sendNewText("TIME_UTC", "UTC" to GPS.formatTime(dateTime.toLocalDateTime()), "OFFSET" to offset)
}
override fun close() {
diff --git a/nebulosa-indi-device/src/main/kotlin/nebulosa/indi/device/focuser/Focuser.kt b/nebulosa-indi-device/src/main/kotlin/nebulosa/indi/device/focuser/Focuser.kt
index a9fb59e02..12d4b4787 100644
--- a/nebulosa-indi-device/src/main/kotlin/nebulosa/indi/device/focuser/Focuser.kt
+++ b/nebulosa-indi-device/src/main/kotlin/nebulosa/indi/device/focuser/Focuser.kt
@@ -21,7 +21,7 @@ interface Focuser : Device, Thermometer {
val canSync: Boolean
- val hasBackslash: Boolean
+ val hasBacklash: Boolean
val maxPosition: Int
diff --git a/nebulosa-indi-device/src/main/kotlin/nebulosa/indi/device/gps/GPS.kt b/nebulosa-indi-device/src/main/kotlin/nebulosa/indi/device/gps/GPS.kt
index d190169d0..1f7bd73a5 100644
--- a/nebulosa-indi-device/src/main/kotlin/nebulosa/indi/device/gps/GPS.kt
+++ b/nebulosa-indi-device/src/main/kotlin/nebulosa/indi/device/gps/GPS.kt
@@ -17,7 +17,7 @@ interface GPS : Device {
val elevation: Distance
- val time: OffsetDateTime
+ val dateTime: OffsetDateTime
companion object {
@@ -33,8 +33,8 @@ interface GPS : Device {
}
@JvmStatic
- fun formatTime(time: LocalDateTime): String {
- return time.format(UTC_TIME_FORMAT_1)
+ fun formatTime(dateTime: LocalDateTime): String {
+ return dateTime.format(UTC_TIME_FORMAT_1)
}
@JvmStatic val DRIVERS = setOf(
diff --git a/nebulosa-indi-device/src/main/kotlin/nebulosa/indi/device/mount/Mount.kt b/nebulosa-indi-device/src/main/kotlin/nebulosa/indi/device/mount/Mount.kt
index 5eb13b8c0..1561eb03d 100644
--- a/nebulosa-indi-device/src/main/kotlin/nebulosa/indi/device/mount/Mount.kt
+++ b/nebulosa-indi-device/src/main/kotlin/nebulosa/indi/device/mount/Mount.kt
@@ -5,8 +5,6 @@ import nebulosa.indi.device.gps.GPS
import nebulosa.indi.device.guide.GuideOutput
import nebulosa.math.Angle
import nebulosa.math.Distance
-import nebulosa.nova.astrometry.Constellation
-import nebulosa.time.UTC
import java.time.OffsetDateTime
interface Mount : GuideOutput, GPS, Parkable {
@@ -43,16 +41,6 @@ interface Mount : GuideOutput, GPS, Parkable {
val declination: Angle
- val rightAscensionJ2000: Angle
-
- val declinationJ2000: Angle
-
- val azimuth: Angle
-
- val altitude: Angle
-
- val constellation: Constellation
-
fun tracking(enable: Boolean)
fun sync(ra: Angle, dec: Angle)
@@ -71,7 +59,7 @@ interface Mount : GuideOutput, GPS, Parkable {
fun abortMotion()
- fun trackingMode(mode: TrackMode)
+ fun trackMode(mode: TrackMode)
fun slewRate(rate: SlewRate)
@@ -85,9 +73,7 @@ interface Mount : GuideOutput, GPS, Parkable {
fun coordinates(longitude: Angle, latitude: Angle, elevation: Distance)
- fun time(time: OffsetDateTime)
-
- fun computeCoordinates(j2000: Boolean = true, horizontal: Boolean = true, epoch: UTC = UTC.now())
+ fun dateTime(dateTime: OffsetDateTime)
companion object {
diff --git a/nebulosa-nova/src/main/kotlin/nebulosa/nova/astrometry/Constellation.kt b/nebulosa-nova/src/main/kotlin/nebulosa/nova/astrometry/Constellation.kt
index e319de1ae..459c9f9cf 100644
--- a/nebulosa-nova/src/main/kotlin/nebulosa/nova/astrometry/Constellation.kt
+++ b/nebulosa-nova/src/main/kotlin/nebulosa/nova/astrometry/Constellation.kt
@@ -458,14 +458,14 @@ enum class Constellation(
@JvmStatic private val RA: DoubleArray
@JvmStatic private val DEC: DoubleArray
@JvmStatic private val RA_TO_INDEX: ByteArray
- @JvmStatic private val ENTRIES = values()
@JvmStatic private val EPOCH = TT(TimeBesselianEpoch.B1875)
init {
- val s = bufferedResource("CONSTELLATIONS.dat")!!
- RA = s.readDoubleArrayLe(235)
- DEC = s.readDoubleArrayLe(199)
- RA_TO_INDEX = s.readByteArray(202 * 236)
+ with(bufferedResource("CONSTELLATIONS.dat")!!) {
+ RA = readDoubleArrayLe(235)
+ DEC = readDoubleArrayLe(199)
+ RA_TO_INDEX = readByteArray(202 * 236)
+ }
}
@JvmStatic
@@ -474,7 +474,7 @@ enum class Constellation(
val i = RA.binarySearch(ra.normalized.hours).let { if (it < 0) -it - 1 else it }
val j = DEC.binarySearch(dec.degrees).let { if (it < 0) -it - 1 else it }
val k = RA_TO_INDEX[i * 202 + j].toInt() and 0xFF
- return ENTRIES[k]
+ return Constellation.entries[k]
}
}
}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d057ceb33..21a70dd00 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -12,7 +12,7 @@ buildCache {
dependencyResolutionManagement {
versionCatalogs {
create("libs") {
- library("okio", "com.squareup.okio:okio:3.4.0")
+ library("okio", "com.squareup.okio:okio:3.5.0")
library("okhttp", "com.squareup.okhttp3:okhttp:5.0.0-alpha.11")
library("okhttp-logging", "com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.11")
library("fits", "gov.nasa.gsfc.heasarc:nom-tam-fits:1.18.0")
-
diff --git a/desktop/src/app/image/image.component.ts b/desktop/src/app/image/image.component.ts
index e59d7e21a..3318f2757 100644
--- a/desktop/src/app/image/image.component.ts
+++ b/desktop/src/app/image/image.component.ts
@@ -1,4 +1,4 @@
-import { AfterViewInit, Component, ElementRef, HostListener, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core'
+import { AfterViewInit, Component, ElementRef, HostListener, NgZone, OnDestroy, ViewChild } from '@angular/core'
import { Title } from '@angular/platform-browser'
import { ActivatedRoute } from '@angular/router'
import createPanZoom, { PanZoom } from 'panzoom'
@@ -10,7 +10,7 @@ import { BrowserWindowService } from '../../shared/services/browser-window.servi
import { ElectronService } from '../../shared/services/electron.service'
import { PreferenceService } from '../../shared/services/preference.service'
import {
- Calibration, Camera, FITSHeaderItem, ImageAnnotation, ImageChannel, ImageSource, PlateSolverType,
+ Calibration, Camera, FITSHeaderItem, ImageAnnotation, ImageChannel, ImageInfo, ImageSource, PlateSolverType,
SCNRProtectionMethod, SCNR_PROTECTION_METHODS, SavedCameraImage
} from '../../shared/types'
@@ -26,7 +26,7 @@ export interface ImageParams {
templateUrl: './image.component.html',
styleUrls: ['./image.component.scss'],
})
-export class ImageComponent implements OnInit, AfterViewInit, OnDestroy {
+export class ImageComponent implements AfterViewInit, OnDestroy {
@ViewChild('image')
private readonly image!: ElementRef
- Shadow: {{ stretchShadowhHighlight[0] }}
- Highlight: {{ stretchShadowhHighlight[1] }}
+
+
+
Midtone: {{ stretchMidtone }}
+
+
+
+
+
\ No newline at end of file
diff --git a/desktop/src/app/mount/mount.component.scss b/desktop/src/app/mount/mount.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/desktop/src/app/mount/mount.component.ts b/desktop/src/app/mount/mount.component.ts
new file mode 100644
index 000000000..a94277ff2
--- /dev/null
+++ b/desktop/src/app/mount/mount.component.ts
@@ -0,0 +1,313 @@
+import { AfterViewInit, Component, NgZone, OnDestroy } from '@angular/core'
+import { Title } from '@angular/platform-browser'
+import { MenuItem } from 'primeng/api'
+import { Subject, Subscription, debounceTime, interval } from 'rxjs'
+import { ApiService } from '../../shared/services/api.service'
+import { BrowserWindowService } from '../../shared/services/browser-window.service'
+import { ElectronService } from '../../shared/services/electron.service'
+import { PreferenceService } from '../../shared/services/preference.service'
+import { Constellation, Mount, PierSide, SlewRate, TargetCoordinateType, TrackMode } from '../../shared/types'
+
+@Component({
+ selector: 'app-mount',
+ templateUrl: './mount.component.html',
+ styleUrls: ['./mount.component.scss'],
+})
+export class MountComponent implements AfterViewInit, OnDestroy {
+
+ mounts: Mount[] = []
+ mount?: Mount
+ connected = false
+ slewing = false
+ parking = false
+ parked = false
+ trackModes: TrackMode[] = ['SIDEREAL']
+ trackMode: TrackMode = 'SIDEREAL'
+ slewRates: SlewRate[] = []
+ slewRate?: SlewRate
+ tracking = false
+ canPark = false
+ canHome = false
+
+ rightAscensionJ2000 = '00h00m00s'
+ declinationJ2000 = `00°00'00"`
+ rightAscension = '00h00m00s'
+ declination = `00°00'00"`
+ azimuth = `000°00'00"`
+ altitude = `+00°00'00"`
+ lst = '00:00:00'
+ constellation: Constellation = 'AND'
+ timeLeftToMeridianFlip = '00:00:00'
+ meridianAt = '00:00:00'
+ pierSide: PierSide = 'NEITHER'
+ targetCoordinateType: TargetCoordinateType = 'JNOW'
+ targetRightAscension = '00h00m00s'
+ targetDeclination = `00°00'00"`
+
+ private readonly computeCoordinatePublisher = new Subject
+
+
+
+
+
+
+
+
+ {{ parking ? 'parking' : (parked ? 'parked' : (slewing ? 'slewing' : 'idle')) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Target coordinates:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Tracking
+
+
+
+
+
+
+
+
+
+