+
+
{
if (event.device.name === this.guideOutput?.name) {
ngZone.run(() => {
@@ -304,9 +302,7 @@ export class GuiderComponent implements AfterViewInit, OnDestroy {
}
@HostListener('window:unload')
- ngOnDestroy() {
- this.api.stopListening('GUIDING')
- }
+ ngOnDestroy() { }
private processGuiderStatus(event: Guider) {
this.connected = event.connected
diff --git a/desktop/src/app/home/home.component.html b/desktop/src/app/home/home.component.html
index 34efe5ad5..80d5f0ecb 100644
--- a/desktop/src/app/home/home.component.html
+++ b/desktop/src/app/home/home.component.html
@@ -14,9 +14,9 @@
-
@@ -55,18 +55,18 @@
Focuser
-
-
- 
- Dome
-
-
Rotator
+
+
+
+ Dome
+
+
@@ -87,8 +87,8 @@
-
- 
+
+ 
Sequencer
diff --git a/desktop/src/app/home/home.component.scss b/desktop/src/app/home/home.component.scss
index 3952ec4ba..ab73ace58 100644
--- a/desktop/src/app/home/home.component.scss
+++ b/desktop/src/app/home/home.component.scss
@@ -1,4 +1,6 @@
p-button ::ng-deep {
+ display: contents;
+
&.open {
min-height: 56px;
max-height: 56px;
diff --git a/desktop/src/app/home/home.component.ts b/desktop/src/app/home/home.component.ts
index 41f75c781..f5a7b6950 100644
--- a/desktop/src/app/home/home.component.ts
+++ b/desktop/src/app/home/home.component.ts
@@ -1,4 +1,5 @@
import { AfterContentInit, Component, HostListener, NgZone, OnDestroy, ViewChild } from '@angular/core'
+import path from 'path'
import { MenuItem, MessageService } from 'primeng/api'
import { DeviceMenuComponent } from '../../shared/components/devicemenu/devicemenu.component'
import { DialogMenuComponent } from '../../shared/components/dialogmenu/dialogmenu.component'
@@ -7,6 +8,7 @@ import { BrowserWindowService } from '../../shared/services/browser-window.servi
import { ElectronService } from '../../shared/services/electron.service'
import { LocalStorageService } from '../../shared/services/local-storage.service'
import { Camera, Device, FilterWheel, Focuser, HomeWindowType, Mount } from '../../shared/types'
+import { compareDevice } from '../../shared/utils/comparators'
import { AppComponent } from '../app.component'
type MappedDevice = {
@@ -16,6 +18,9 @@ type MappedDevice = {
'WHEEL': FilterWheel
}
+export const HOME_KEY = 'home'
+export const IMAGE_DIR_KEY = 'home.image.directory'
+
export interface HomePreference {
host?: string
port?: number
@@ -178,7 +183,7 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
async ngAfterContentInit() {
this.updateConnection()
- const preference = this.storage.get
('home', {})
+ const preference = this.storage.get(HOME_KEY, {})
this.host = preference.host ?? 'localhost'
this.port = preference.port ?? 7624
@@ -204,7 +209,7 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
port: this.port,
}
- this.storage.set('home', preference)
+ this.storage.set(HOME_KEY, preference)
}
} catch (e) {
console.error(e)
@@ -227,7 +232,7 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
if (devices.length === 0) return
if (devices.length === 1) return this.openDeviceWindow(type, devices[0] as any)
- for (const device of devices) {
+ for (const device of [...devices].sort(compareDevice)) {
this.deviceModel.push({
icon: 'mdi mdi-connection',
label: device.name,
@@ -259,10 +264,12 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
private async openImage(force: boolean = false) {
if (force || this.cameras.length === 0) {
- const path = await this.electron.openFITS()
+ const defaultPath = this.storage.get(IMAGE_DIR_KEY, '')
+ const fitsPath = await this.electron.openFITS({ defaultPath })
- if (path) {
- this.browserWindow.openImage({ path, source: 'PATH' })
+ if (fitsPath) {
+ this.storage.set(IMAGE_DIR_KEY, path.dirname(fitsPath))
+ this.browserWindow.openImage({ path: fitsPath, source: 'PATH' })
}
} else {
const camera = await this.imageMenu.show(this.cameras)
@@ -285,7 +292,7 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
this.browserWindow.openGuider({ bringToFront: true })
break
case 'SKY_ATLAS':
- this.browserWindow.openSkyAtlas({ bringToFront: true })
+ this.browserWindow.openSkyAtlas({ bringToFront: true, data: undefined })
break
case 'FRAMING':
this.browserWindow.openFraming({ bringToFront: true, data: undefined })
@@ -293,6 +300,9 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
case 'ALIGNMENT':
this.browserWindow.openAlignment({ bringToFront: true })
break
+ case 'SEQUENCER':
+ this.browserWindow.openSequencer({ bringToFront: true })
+ break
case 'INDI':
this.browserWindow.openINDI({ data: undefined, bringToFront: true })
break
@@ -313,7 +323,9 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
this.connected = await this.api.connectionStatus()
} catch {
this.connected = false
+ }
+ if (!this.connected) {
this.cameras = []
this.mounts = []
this.focusers = []
diff --git a/desktop/src/app/image/image.component.html b/desktop/src/app/image/image.component.html
index adb915555..039a14070 100644
--- a/desktop/src/app/image/image.component.html
+++ b/desktop/src/app/image/image.component.html
@@ -168,52 +168,52 @@
+ [value]="solverData?.rightAscensionJ2000 ?? '00h00m00s'" />
+ [value]="solverData?.declinationJ2000 ?? '+000°00\'00"'" />
-
+
-
+
+ [value]="(solverData?.width?.toFixed(2) ?? '0.0') + ' x ' + (solverData?.height?.toFixed(2) ?? '0.0')" />
-
+
@@ -318,13 +318,15 @@
-
X: {{ mouseCoordinate.x }}
-
Y: {{ mouseCoordinate.y }}
-
α: {{ mouseCoordinate.alpha }}
-
δ: {{ mouseCoordinate.delta }}
-
l: {{ mouseCoordinate.l }}
-
b: {{ mouseCoordinate.b }}
+
+
+
X: {{ mouseCoordinate.x }}
+
Y: {{ mouseCoordinate.y }}
+
α: {{ mouseCoordinate.alpha }}
+
δ: {{ mouseCoordinate.delta }}
+
l: {{ mouseCoordinate.l }}
+
b: {{ mouseCoordinate.b }}
+
\ No newline at end of file
diff --git a/desktop/src/app/image/image.component.ts b/desktop/src/app/image/image.component.ts
index 95649657b..478372cbc 100644
--- a/desktop/src/app/image/image.component.ts
+++ b/desktop/src/app/image/image.component.ts
@@ -15,12 +15,15 @@ import { LocalStorageService } from '../../shared/services/local-storage.service
import { PrimeService } from '../../shared/services/prime.service'
import {
Angle, AstronomicalObject, Camera, CheckableMenuItem, DeepSkyObject, DetectedStar, EquatorialCoordinateJ2000, FITSHeaderItem,
- ImageAnnotation, ImageCalibrated, ImageChannel, ImageInfo, ImageSource,
- Mount, SCNRProtectionMethod, SCNR_PROTECTION_METHODS, Star, ToggleableMenuItem
+ ImageAnnotation, ImageChannel, ImageInfo, ImageSolved, ImageSource, Mount, SCNRProtectionMethod, SCNR_PROTECTION_METHODS, Star, ToggleableMenuItem
} from '../../shared/types'
import { CoordinateInterpolator, InterpolatedCoordinate } from '../../shared/utils/coordinate-interpolation'
import { AppComponent } from '../app.component'
+export function imagePreferenceKey(camera?: Camera) {
+ return camera ? `image.${camera.name}` : 'image'
+}
+
export interface ImagePreference {
solverRadius?: number
}
@@ -83,7 +86,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
solverCenterRA = ''
solverCenterDEC = ''
solverRadius = 4
- solverCalibration?: ImageCalibrated
+ solverData?: ImageSolved
crossHair = false
annotations: ImageAnnotation[] = []
@@ -115,7 +118,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
label: 'Save as...',
icon: 'mdi mdi-content-save',
command: async () => {
- const path = await this.electron.send('SAVE_FITS_AS')
+ const path = await this.electron.send('SAVE_FITS')
if (path) this.api.saveImageAs(this.imageData.path!, path)
},
}
@@ -357,12 +360,13 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
) {
app.title = 'Image'
- electron.on('CAMERA_EXPOSURE_FINISHED', async (event) => {
- if (event.camera.name === this.imageData.camera?.name) {
+ electron.on('CAMERA_CAPTURE_ELAPSED', async (event) => {
+ if (event.state === 'EXPOSURE_FINISHED' && event.camera.name === this.imageData.camera?.name) {
await this.closeImage()
ngZone.run(() => {
this.imageData.path = event.savePath
+ this.clearOverlay()
this.loadImage()
})
}
@@ -456,12 +460,12 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
this.disableAutoStretch()
}
- this.calibrateMenuItem.disabled = !data.camera
-
if (!data.camera) {
this.disableCalibrate()
}
+ this.clearOverlay()
+
this.loadImage()
}
@@ -477,8 +481,6 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
private async loadImage() {
if (this.imageData.path) {
- this.clearOverlay()
-
await this.loadImageFromPath(this.imageData.path)
}
@@ -516,8 +518,8 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
this.stretchMidtone = Math.trunc(info.stretchMidtone * 65536)
}
- this.annotationMenuItem.disabled = !info.calibrated
- this.pointMountHereMenuItem.disabled = !info.calibrated
+ this.annotationMenuItem.disabled = !info.solved
+ this.pointMountHereMenuItem.disabled = !info.solved
this.fitsHeaders = info.headers
if (this.imageURL) window.URL.revokeObjectURL(this.imageURL)
@@ -620,7 +622,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
this.solving = true
try {
- this.solverCalibration = await this.api.solveImage(this.imageData.path!, this.solverBlind,
+ this.solverData = await this.api.solveImage(this.imageData.path!, this.solverBlind,
this.solverCenterRA, this.solverCenterDEC, this.solverRadius)
this.savePreference()
@@ -630,7 +632,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
this.pointMountHereMenuItem.disabled = false
} catch {
this.solved = false
- this.solverCalibration = undefined
+ this.solverData = undefined
this.annotationMenuItem.disabled = true
this.pointMountHereMenuItem.disabled = true
} finally {
@@ -658,7 +660,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
}
frame(coordinate: EquatorialCoordinateJ2000) {
- this.browserWindow.openFraming({ data: { rightAscension: coordinate.rightAscensionJ2000, declination: coordinate.declinationJ2000 } })
+ this.browserWindow.openFraming({ data: { rightAscension: coordinate.rightAscensionJ2000, declination: coordinate.declinationJ2000, fov: this.solverData!.width / 60, rotation: this.solverData!.orientation } })
}
imageLoaded() {
@@ -682,14 +684,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
}
private loadPreference(camera?: Camera) {
- let preference: ImagePreference
-
- if (camera) {
- preference = this.storage.get
(`image.${camera.name}`, {})
- } else {
- preference = this.storage.get('image', {})
- }
-
+ const preference = this.storage.get(imagePreferenceKey(camera), {})
this.solverRadius = preference.solverRadius ?? this.solverRadius
}
@@ -698,11 +693,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
solverRadius: this.solverRadius
}
- if (this.imageData.camera) {
- this.storage.set(`image.${this.imageData.camera.name}`, preference)
- } else {
- this.storage.set('image', preference)
- }
+ this.storage.set(imagePreferenceKey(this.imageData.camera), preference)
}
private async executeMount(action: (mount: Mount) => void) {
diff --git a/desktop/src/app/indi/indi.component.html b/desktop/src/app/indi/indi.component.html
index 8d27baf9c..9a0c7baab 100644
--- a/desktop/src/app/indi/indi.component.html
+++ b/desktop/src/app/indi/indi.component.html
@@ -2,23 +2,24 @@
-
diff --git a/desktop/src/app/indi/indi.component.scss b/desktop/src/app/indi/indi.component.scss
index 232c4e990..7746ea400 100644
--- a/desktop/src/app/indi/indi.component.scss
+++ b/desktop/src/app/indi/indi.component.scss
@@ -1,8 +1,16 @@
+:host {
+ ::ng-deep {
+ .p-listbox-list-wrapper {
+ max-height: calc(100vh - 175px) !important;
+ }
+ }
+}
+
.properties {
- height: calc(100vh - 80px);
+ height: calc(100vh - 100px);
overflow-y: auto;
}
.properties::-webkit-scrollbar {
display: none;
-}
+}
\ No newline at end of file
diff --git a/desktop/src/app/indi/indi.component.ts b/desktop/src/app/indi/indi.component.ts
index 057e361b1..cd38566f0 100644
--- a/desktop/src/app/indi/indi.component.ts
+++ b/desktop/src/app/indi/indi.component.ts
@@ -4,6 +4,7 @@ import { MenuItem } from 'primeng/api'
import { ApiService } from '../../shared/services/api.service'
import { ElectronService } from '../../shared/services/electron.service'
import { Device, INDIProperty, INDIPropertyItem, INDISendProperty } from '../../shared/types'
+import { compareDevice, compareText } from '../../shared/utils/comparators'
import { AppComponent } from '../app.component'
@Component({
@@ -31,8 +32,6 @@ export class INDIComponent implements AfterViewInit, OnDestroy {
) {
app.title = 'INDI'
- this.api.startListening('INDI')
-
electron.on('DEVICE_PROPERTY_CHANGED', event => {
ngZone.run(() => {
this.addOrUpdateProperty(event.property!)
@@ -62,7 +61,11 @@ export class INDIComponent implements AfterViewInit, OnDestroy {
async ngAfterViewInit() {
this.route.queryParams.subscribe(e => {
- this.device = JSON.parse(decodeURIComponent(e.data)) as Device
+ const device = JSON.parse(decodeURIComponent(e.data))
+
+ if ("name" in device && device.name) {
+ this.device = device
+ }
})
this.devices = [
@@ -70,17 +73,28 @@ export class INDIComponent implements AfterViewInit, OnDestroy {
...await this.api.mounts(),
...await this.api.focusers(),
...await this.api.wheels(),
- ]
+ ].sort(compareDevice)
+
+ this.device = this.devices[0]
}
@HostListener('window:unload')
ngOnDestroy() {
- this.api.stopListening('INDI')
+ if (this.device) {
+ this.api.indiStopListening(this.device)
+ }
}
- async deviceChanged() {
+ async deviceChanged(device: Device) {
+ if (this.device) {
+ this.api.indiStopListening(this.device)
+ }
+
+ this.device = device
+
this.updateProperties()
- this.messages = await this.api.indiLog(this.device!)
+ this.api.indiStartListening(device)
+ this.messages = await this.api.indiLog(device)
}
changeGroup(group: string) {
@@ -89,7 +103,7 @@ export class INDIComponent implements AfterViewInit, OnDestroy {
}
send(property: INDISendProperty) {
- this.api.sendIndiProperty(this.device!, property)
+ this.api.indiSendProperty(this.device!, property)
}
private updateGroups() {
@@ -116,7 +130,7 @@ export class INDIComponent implements AfterViewInit, OnDestroy {
if (this.groups.length === 0 || groupsChanged) {
this.groups = Array.from(groups)
- .sort((a, b) => a.localeCompare(b))
+ .sort(compareText)
.map(e =>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
diff --git a/desktop/src/app/mount/mount.component.html b/desktop/src/app/mount/mount.component.html
index 4f43fe5b1..37d4664f3 100644
--- a/desktop/src/app/mount/mount.component.html
+++ b/desktop/src/app/mount/mount.component.html
@@ -1,12 +1,10 @@
-
@@ -119,47 +122,47 @@
@@ -198,4 +201,5 @@
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/desktop/src/app/mount/mount.component.ts b/desktop/src/app/mount/mount.component.ts
index 8b3f56339..6eed27e7f 100644
--- a/desktop/src/app/mount/mount.component.ts
+++ b/desktop/src/app/mount/mount.component.ts
@@ -2,12 +2,18 @@ import { AfterContentInit, Component, HostListener, NgZone, OnDestroy } from '@a
import { ActivatedRoute } from '@angular/router'
import { MenuItem } from 'primeng/api'
import { Subject, Subscription, interval, throttleTime } from 'rxjs'
+import { SEPARATOR_MENU_ITEM } from '../../shared/constants'
import { ApiService } from '../../shared/services/api.service'
import { BrowserWindowService } from '../../shared/services/browser-window.service'
import { ElectronService } from '../../shared/services/electron.service'
import { LocalStorageService } from '../../shared/services/local-storage.service'
import { Angle, ComputedLocation, Constellation, Mount, PierSide, SlewRate, TargetCoordinateType, TrackMode, Union } from '../../shared/types'
import { AppComponent } from '../app.component'
+import { SkyAtlasTab } from '../atlas/atlas.component'
+
+export function mountPreferenceKey(mount: Mount) {
+ return `mount.${mount.name}`
+}
export interface MountPreference {
targetCoordinateType?: TargetCoordinateType
@@ -35,6 +41,7 @@ export class MountComponent implements AfterContentInit, OnDestroy {
tracking = false
canPark = false
canHome = false
+ slewingDirection?: string
rightAscensionJ2000: Angle = '00h00m00s'
declinationJ2000: Angle = `00°00'00"`
@@ -60,6 +67,47 @@ export class MountComponent implements AfterContentInit, OnDestroy {
private computeCoordinateSubscriptions: Subscription[] = []
private readonly moveToDirection = [false, false]
+ readonly ephemerisModel: MenuItem[] = [
+ {
+ icon: 'mdi mdi-image',
+ label: 'Frame',
+ command: () => {
+ this.browserWindow.openFraming({ data: { rightAscension: this.rightAscensionJ2000, declination: this.declinationJ2000 } })
+ },
+ },
+ SEPARATOR_MENU_ITEM,
+ {
+ icon: 'mdi mdi-magnify',
+ label: 'Find stars around the coordinates',
+ command: () => {
+ this.browserWindow.openSkyAtlas({
+ bringToFront: true,
+ data: { tab: SkyAtlasTab.STAR, filter: { rightAscension: this.rightAscensionJ2000, declination: this.declinationJ2000 } }
+ })
+ },
+ },
+ {
+ icon: 'mdi mdi-magnify',
+ label: 'Find DSOs around the coordinates',
+ command: () => {
+ this.browserWindow.openSkyAtlas({
+ bringToFront: true,
+ data: { tab: SkyAtlasTab.DSO, filter: { rightAscension: this.rightAscensionJ2000, declination: this.declinationJ2000 } }
+ })
+ },
+ },
+ {
+ icon: 'mdi mdi-magnify',
+ label: 'Find around the coordinates on Simbad',
+ command: () => {
+ this.browserWindow.openSkyAtlas({
+ bringToFront: true,
+ data: { tab: SkyAtlasTab.SIMBAD, filter: { rightAscension: this.rightAscensionJ2000, declination: this.declinationJ2000 } }
+ })
+ },
+ },
+ ]
+
readonly targetCoordinateModel: MenuItem[] = [
{
icon: 'mdi mdi-telescope',
@@ -156,8 +204,6 @@ export class MountComponent implements AfterContentInit, OnDestroy {
) {
app.title = 'Mount'
- api.startListening('MOUNT')
-
electron.on('MOUNT_UPDATED', event => {
if (event.device.name === this.mount?.name) {
ngZone.run(() => {
@@ -167,6 +213,14 @@ export class MountComponent implements AfterContentInit, OnDestroy {
}
})
+ electron.on('MOUNT_DETACHED', event => {
+ if (event.device.name === this.mount?.name) {
+ ngZone.run(() => {
+ this.connected = false
+ })
+ }
+ })
+
this.computeCoordinateSubscriptions[0] = this.computeCoordinatePublisher
.pipe(throttleTime(5000))
.subscribe(() => this.computeCoordinates())
@@ -195,8 +249,6 @@ export class MountComponent implements AfterContentInit, OnDestroy {
this.computeCoordinateSubscriptions
.forEach(e => e.unsubscribe())
-
- this.api.stopListening('MOUNT')
}
async mountChanged(mount?: Mount) {
@@ -250,6 +302,8 @@ export class MountComponent implements AfterContentInit, OnDestroy {
moveTo(direction: string, pressed: boolean, event: MouseEvent) {
if (event.button === 0) {
+ this.slewingDirection = pressed ? direction : undefined
+
if (this.moveToDirection[0] !== pressed) {
switch (direction[0]) {
case 'N':
@@ -326,7 +380,7 @@ export class MountComponent implements AfterContentInit, OnDestroy {
}
}
- private async update() {
+ private update() {
if (this.mount) {
this.connected = this.mount.connected
this.slewing = this.mount.slewing
@@ -386,7 +440,7 @@ export class MountComponent implements AfterContentInit, OnDestroy {
private loadPreference() {
if (this.mount) {
- const preference = this.storage.get
(`mount.${this.mount.name}`, {})
+ const preference = this.storage.get(mountPreferenceKey(this.mount), {})
this.targetCoordinateType = preference.targetCoordinateType ?? 'JNOW'
this.targetRightAscension = preference.targetRightAscension ?? '00h00m00s'
this.targetDeclination = preference.targetDeclination ?? `00°00'00"`
@@ -402,7 +456,7 @@ export class MountComponent implements AfterContentInit, OnDestroy {
targetDeclination: this.targetDeclination,
}
- this.storage.set(`mount.${this.mount.name}`, preference)
+ this.storage.set(mountPreferenceKey(this.mount), preference)
}
}
}
diff --git a/desktop/src/app/sequencer/sequencer.component.html b/desktop/src/app/sequencer/sequencer.component.html
new file mode 100644
index 000000000..b0672df5c
--- /dev/null
+++ b/desktop/src/app/sequencer/sequencer.component.html
@@ -0,0 +1,278 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ event.elapsedTime | exposureTime }}
+
+
+ {{ event.remainingTime | exposureTime }}
+
+
+ {{ event.progress * 100 | number:'1.1-1' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ state[i] === 'SETTLING' ? 'settling' : state[i] === 'WAITING' ? 'waiting' : state[i] === 'EXPOSURING'
+ ? 'capturing' : 'idle' }}
+
+
+
+ {{ exposure[i].count }} of {{ capture[i].amount }}
+
+
+ {{ capture[i].elapsedTime | exposureTime }}
+
+
+ {{ capture[i].remainingTime | exposureTime }}
+
+
+ {{ capture[i].progress * 100 | number:'1.1-1' }}
+
+
+
+
+ {{ exposure[i].remainingTime | exposureTime }}
+
+
+ {{ exposure[i].progress * 100 | number:'1.1-1' }}
+
+
+
+
+ {{ wait[i].remainingTime | exposureTime }}
+
+
+ {{ wait[i].progress * 100 | number:'1.1-1' }}
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
diff --git a/desktop/src/app/settings/settings.component.ts b/desktop/src/app/settings/settings.component.ts
index 6ceb802ae..d625254ee 100644
--- a/desktop/src/app/settings/settings.component.ts
+++ b/desktop/src/app/settings/settings.component.ts
@@ -18,7 +18,6 @@ export class SettingsComponent implements AfterViewInit, OnDestroy {
locations: Location[] = []
location = Object.assign({}, EMPTY_LOCATION)
- private deletedLocations: Location[] = []
readonly plateSolvers: PlateSolverType[] = ['ASTAP', 'ASTROMETRY_NET']
plateSolver!: PlateSolverOptions
@@ -43,20 +42,12 @@ export class SettingsComponent implements AfterViewInit, OnDestroy {
private prime: PrimeService,
) {
app.title = 'Settings'
-
- app.extra.push({
- icon: 'mdi mdi-content-save',
- tooltip: 'Save changes',
- command: () => {
- this.save()
- }
- })
}
async ngAfterViewInit() {
this.plateSolver = await this.api.getPlateSolverSettings()
- this.loadLocation()
+ this.loadLocations()
}
@HostListener('window:unload')
@@ -73,52 +64,37 @@ export class SettingsComponent implements AfterViewInit, OnDestroy {
private async showLocation(location: Location) {
const result = await this.prime.open(LocationDialog, { header: 'Location', data: location })
- if (result && !this.locations.includes(result)) {
- this.locations.push(result)
+ if (result) {
+ await this.api.saveLocation(result)
+ await this.loadLocations()
+ this.electron.send('LOCATION_CHANGED', this.location)
}
}
- private async loadLocation() {
+ private async loadLocations() {
this.locations = await this.api.locations()
this.location = this.locations.find(e => e.selected) ?? this.locations[0] ?? EMPTY_LOCATION
- }
- async deleteLocation() {
- if (this.location.id > 0) {
- this.deletedLocations.push(this.location)
+ if (this.location.id && !this.location.selected) {
+ this.location.selected = true
+ this.api.saveLocation(this.location)
}
+ }
- const index = this.locations.indexOf(this.location)
-
- if (index >= 0) {
- const deletedLocation = this.locations[index]
- this.locations.splice(index, 1)
-
- if (this.location === deletedLocation) {
- this.location = this.locations[0]
- this.location.selected = true
- }
- }
+ async deleteLocation() {
+ await this.api.deleteLocation(this.location)
+ await this.loadLocations()
+ this.electron.send('LOCATION_CHANGED', this.location)
}
locationChanged() {
this.locations.forEach(e => e.selected = false)
this.location.selected = true
+ this.locations.forEach(e => this.api.saveLocation(e))
+ this.electron.send('LOCATION_CHANGED', this.location)
}
async save() {
- for (const location of this.locations) {
- await this.api.saveLocation(location)
- }
-
- for (const location of this.deletedLocations) {
- await this.api.deleteLocation(location)
- }
-
- this.deletedLocations = []
- await this.loadLocation()
- this.electron.send('LOCATION_CHANGED', this.location)
-
- this.api.setPlateSolverSettings(this.plateSolver)
+ this.api.updatePlateSolverSettings(this.plateSolver)
}
}
\ No newline at end of file
diff --git a/desktop/src/assets/icons/CREDITS.md b/desktop/src/assets/icons/CREDITS.md
index 9640a1559..c9b465176 100644
--- a/desktop/src/assets/icons/CREDITS.md
+++ b/desktop/src/assets/icons/CREDITS.md
@@ -26,7 +26,7 @@
* https://www.flaticon.com/free-icon/stars_3266390
* https://www.flaticon.com/free-icon/milky-way_1086076
* https://www.flaticon.com/free-icon/satellite_1086093
-* https://www.flaticon.com/free-icon/schedule_3652191
* https://www.flaticon.com/free-icon/search_10770011
* https://www.flaticon.com/free-icon/stack_3342239
+* https://www.flaticon.com/free-icon/workflow_7400612
* https://thenounproject.com/icon/random-dither-4259782
diff --git a/desktop/src/assets/icons/brazil.png b/desktop/src/assets/icons/brazil.png
new file mode 100644
index 000000000..e6ec11e47
Binary files /dev/null and b/desktop/src/assets/icons/brazil.png differ
diff --git a/desktop/src/assets/icons/schedule.png b/desktop/src/assets/icons/schedule.png
deleted file mode 100644
index 5b879191a..000000000
Binary files a/desktop/src/assets/icons/schedule.png and /dev/null differ
diff --git a/desktop/src/assets/icons/workflow.png b/desktop/src/assets/icons/workflow.png
new file mode 100644
index 000000000..2a5789dc4
Binary files /dev/null and b/desktop/src/assets/icons/workflow.png differ
diff --git a/desktop/src/shared/components/openstreetmap/openstreetmap.component.scss b/desktop/src/shared/components/openstreetmap/openstreetmap.component.scss
index a9b54e028..b0973beae 100644
--- a/desktop/src/shared/components/openstreetmap/openstreetmap.component.scss
+++ b/desktop/src/shared/components/openstreetmap/openstreetmap.component.scss
@@ -1,5 +1,6 @@
:host {
display: block;
+ width: 100%;
}
::ng-deep .leaflet-marker-shadow {
diff --git a/desktop/src/shared/dialogs/location/location.dialog.ts b/desktop/src/shared/dialogs/location/location.dialog.ts
index 56e5180a4..09fcb36fc 100644
--- a/desktop/src/shared/dialogs/location/location.dialog.ts
+++ b/desktop/src/shared/dialogs/location/location.dialog.ts
@@ -16,7 +16,7 @@ export class LocationDialog implements AfterViewInit {
constructor(
private dialogRef: DynamicDialogRef,
- config: DynamicDialogConfig,
+ config: DynamicDialogConfig,
) {
this.location = config.data!
}
diff --git a/desktop/src/shared/pipes/exposureTime.pipe.ts b/desktop/src/shared/pipes/exposureTime.pipe.ts
index d030cbe68..d7e3bea5c 100644
--- a/desktop/src/shared/pipes/exposureTime.pipe.ts
+++ b/desktop/src/shared/pipes/exposureTime.pipe.ts
@@ -25,7 +25,7 @@ export class ExposureTimePipe implements PipeTransform {
function formatter(format: Intl.NumberFormat, unit: string) {
return function (value: number) {
- return `${format.format(value)}${unit}`
+ return value ? `${format.format(value)}${unit}` : ''
}
}
diff --git a/desktop/src/shared/services/api.service.ts b/desktop/src/shared/services/api.service.ts
index 36710016a..7dcef4b7f 100644
--- a/desktop/src/shared/services/api.service.ts
+++ b/desktop/src/shared/services/api.service.ts
@@ -3,10 +3,8 @@ import moment from 'moment'
import {
Angle, BodyPosition, CalibrationFrame, CalibrationFrameGroup, Camera, CameraStartCapture, ComputedLocation, Constellation, CoordinateInterpolation, DeepSkyObject, DetectedStar, Device,
FilterWheel, Focuser, GuideDirection, GuideOutput, Guider, HipsSurvey, HistoryStep,
- INDIProperty, INDISendProperty, ImageAnnotation, ImageCalibrated,
- ImageChannel, ImageInfo, ListeningEventType, Location, MinorPlanet,
- Mount, PlateSolverOptions, SCNRProtectionMethod, Satellite, SatelliteGroupType,
- SettleInfo, SkyObjectType, SlewRate, Star, TrackMode, Twilight
+ INDIProperty, INDISendProperty, ImageAnnotation, ImageChannel, ImageInfo, ImageSolved, Location, MinorPlanet, Mount, PlateSolverOptions, SCNRProtectionMethod, Satellite, SatelliteGroupType,
+ SequencePlan, SettleInfo, SkyObjectType, SlewRate, Star, TrackMode, Twilight
} from '../types'
import { HttpService } from './http.service'
@@ -339,24 +337,26 @@ export class ApiService {
return this.http.delete(`image?${query}`)
}
+ // INDI
+
indiProperties(device: Device) {
- return this.http.get[]>(`indiProperties?name=${device.name}`)
+ return this.http.get[]>(`indi/${device.name}/properties`)
}
- sendIndiProperty(device: Device, property: INDISendProperty) {
- return this.http.post(`sendIndiProperty?name=${device.name}`, property)
+ indiSendProperty(device: Device, property: INDISendProperty) {
+ return this.http.put(`indi/${device.name}/send`, property)
}
- startListening(eventType: ListeningEventType) {
- return this.http.post(`startListening?eventType=${eventType}`)
+ indiStartListening(device: Device) {
+ return this.http.put(`indi/listener/${device.name}/start`)
}
- stopListening(eventType: ListeningEventType) {
- return this.http.post(`stopListening?eventType=${eventType}`)
+ indiStopListening(device: Device) {
+ return this.http.put(`indi/listener/${device.name}/stop`)
}
indiLog(device: Device) {
- return this.http.get(`indiLog?name=${device.name}`)
+ return this.http.get(`indi/${device.name}/log`)
}
// LOCATION
@@ -582,8 +582,8 @@ export class ApiService {
// DARV
darvStart(camera: Camera, guideOutput: GuideOutput,
- exposureTime: number, initialPause: number, direction: GuideDirection, reversed: boolean = false) {
- const data = { exposureTime, initialPause, direction, reversed }
+ exposureTime: number, initialPause: number, direction: GuideDirection, reversed: boolean = false, capture?: CameraStartCapture) {
+ const data = { capture, exposureTime, initialPause, direction, reversed }
return this.http.put(`polar-alignment/darv/${camera.name}/${guideOutput.name}/start`, data)
}
@@ -591,6 +591,16 @@ export class ApiService {
return this.http.put(`polar-alignment/darv/${camera.name}/${guideOutput.name}/stop`)
}
+ // SEQUENCER
+
+ sequencerStart(plan: SequencePlan) {
+ return this.http.put