- 
+ 
+
- 
diff --git a/desktop/src/app/alignment/alignment.component.html b/desktop/src/app/alignment/alignment.component.html
index d9611b818..a3dc17a88 100644
--- a/desktop/src/app/alignment/alignment.component.html
+++ b/desktop/src/app/alignment/alignment.component.html
@@ -37,16 +37,16 @@
Nebulosa v0.1.0 (Ceres)
-© 2023 Tiago Melo 🇧🇷
+Nebulosa v0.1.0
+Ceres
+© 2023 Tiago Melo 🇧🇷
This program comes with absolutely no warranty and is provided on an 'as is' basis.
diff --git a/desktop/src/app/alignment/alignment.component.html b/desktop/src/app/alignment/alignment.component.html
index d9611b818..a3dc17a88 100644
--- a/desktop/src/app/alignment/alignment.component.html
+++ b/desktop/src/app/alignment/alignment.component.html
@@ -37,16 +37,16 @@
- {{ darvStatus }}
-
+ {{ darvStatus | enum | lowercase }}
+
{{ darvDirection }}
- {{ darvCaptureEvent.captureRemainingTime | exposureTime }}
+ {{ darvCapture.remainingTime | exposureTime }}
- {{ darvCaptureEvent.captureProgress | percent:'1.1-1' }}
+ {{ darvCapture.progress | percent:'1.1-1' }}
diff --git a/desktop/src/app/alignment/alignment.component.ts b/desktop/src/app/alignment/alignment.component.ts
index b550a9735..9714c7eba 100644
--- a/desktop/src/app/alignment/alignment.component.ts
+++ b/desktop/src/app/alignment/alignment.component.ts
@@ -2,8 +2,7 @@ import { AfterViewInit, Component, HostListener, NgZone, OnDestroy } from '@angu
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, CameraCaptureEvent, DARVPolarAlignmentEvent, DARVPolarAlignmentGuidePulseElapsed, DARVPolarAlignmentInitialPauseElapsed, GuideDirection, GuideOutput, Hemisphere } from '../../shared/types'
+import { Camera, DARVPolarAlignmentState, GuideDirection, GuideOutput, Hemisphere, Union } from '../../shared/types'
import { AppComponent } from '../app.component'
@Component({
@@ -26,52 +25,55 @@ export class AlignmentComponent implements AfterViewInit, OnDestroy {
darvInProgress = false
readonly darvHemispheres: Hemisphere[] = ['NORTHERN', 'SOUTHERN']
darvHemisphere: Hemisphere = 'NORTHERN'
- darvCaptureEvent?: CameraCaptureEvent
darvDirection?: GuideDirection
- darvStatus = 'idle'
+ darvStatus: Union{{ title }}
{{ subTitle }}
+
+
-
+
- 
+
-
+
+
+
+
+
- 
+
-
+
+
+
+
-
- 
+
- 
+
+
+
+
+
+
+
+
+
+
@@ -80,7 +88,9 @@
- 
+
+
+
+
+
@@ -91,7 +101,7 @@
@@ -108,7 +118,7 @@
- {{ item.name.replaceAll('|', ' · ') }}
+ {{ item | skyObject:'name' }}
{{ item.type | enum }}
{{ item.magnitude < 99 ? item.magnitude.toFixed(1) : '-' }}
{{ item.constellation }}
@@ -119,7 +129,9 @@
- 
+
+
+
+
+
+
+
+
+
@@ -130,7 +142,7 @@
@@ -147,7 +159,48 @@
- {{ item.name.replaceAll('|', ' · ') }}
+ {{ item | skyObject:'name' }}
+ {{ item.type | enum }}
+ {{ item.magnitude < 99 ? item.magnitude.toFixed(1) : '-' }}
+ {{ item.constellation }}
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Name
+ Type
+ Mag.
+ Const.
+
+
+
+
+ {{ item | skyObject:'name' }}
{{ item.type | enum }}
{{ item.magnitude < 99 ? item.magnitude.toFixed(1) : '-' }}
{{ item.constellation }}
@@ -158,7 +211,9 @@
- 
+
-
- 
-
-
@@ -318,20 +350,9 @@
-
+
\ No newline at end of file
diff --git a/desktop/src/app/camera/camera.component.ts b/desktop/src/app/camera/camera.component.ts
index d3711af0a..1632366d9 100644
--- a/desktop/src/app/camera/camera.component.ts
+++ b/desktop/src/app/camera/camera.component.ts
@@ -1,15 +1,37 @@
import { AfterContentInit, Component, HostListener, NgZone, OnDestroy } from '@angular/core'
-import { MegaMenuItem, MenuItem } from 'primeng/api'
+import { ActivatedRoute } from '@angular/router'
+import { MenuItem } 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 {
- AutoSubFolderMode, Camera, CameraCaptureEvent,
- CameraStartCapture, ExposureMode, ExposureTimeUnit, FilterWheel, FrameType
-} from '../../shared/types'
+import { LocalStorageService } from '../../shared/services/local-storage.service'
+import { AutoSubFolderMode, Camera, CameraStartCapture, Dither, ExposureMode, ExposureTimeUnit, FilterWheel, FrameType } from '../../shared/types'
import { AppComponent } from '../app.component'
+export interface CameraPreference {
+ autoSave?: boolean
+ savePath?: string
+ autoSubFolderMode?: AutoSubFolderMode
+ setpointTemperature?: number
+ exposureTime?: number
+ exposureTimeUnit?: ExposureTimeUnit
+ exposureMode?: ExposureMode
+ exposureDelay?: number
+ exposureCount?: number
+ x?: number
+ y?: number
+ width?: number
+ height?: number
+ subFrame?: boolean
+ binX?: number
+ binY?: number
+ frameType?: FrameType
+ gain?: number
+ offset?: number
+ frameFormat?: string
+ dithering?: Dither
+}
+
@Component({
selector: 'app-camera',
templateUrl: './camera.component.html',
@@ -17,7 +39,6 @@ import { AppComponent } from '../app.component'
})
export class CameraComponent implements AfterContentInit, OnDestroy {
- cameras: Camera[] = []
camera?: Camera
connected = false
@@ -28,23 +49,29 @@ export class CameraComponent implements AfterContentInit, OnDestroy {
wheel?: FilterWheel
- readonly cameraMenuItems: MenuItem[] = [
+ showDitheringDialog = false
+ readonly dithering: Dither = {
+ enabled: false,
+ afterExposures: 1,
+ amount: 1.5,
+ raOnly: false,
+ }
+
+ readonly cameraModel: MenuItem[] = [
{
icon: 'mdi mdi-content-save',
label: 'Auto save all exposures',
- command: (e) => {
+ command: () => {
this.autoSave = !this.autoSave
this.savePreference()
-
- this.checkMenuItem(e.item, this.autoSave)
},
},
{
icon: 'mdi mdi-folder',
label: 'Save path...',
- command: () => {
+ command: async () => {
const defaultPath = this.savePath || this.capturesPath
- const path = this.electron.openDirectory({ defaultPath })
+ const path = await this.electron.openDirectory({ defaultPath })
if (path) {
this.savePath = path
@@ -59,35 +86,39 @@ export class CameraComponent implements AfterContentInit, OnDestroy {
{
icon: 'mdi mdi-folder-off',
label: 'None',
- command: (e) => {
+ command: () => {
this.autoSubFolderMode = 'OFF'
this.savePreference()
-
- this.checkMenu(this.cameraMenuItems[2].items!, e.item)
},
},
{
icon: 'mdi mdi-weather-sunny',
label: 'Noon',
- command: (e) => {
+ command: () => {
this.autoSubFolderMode = 'NOON'
this.savePreference()
-
- this.checkMenu(this.cameraMenuItems[2].items!, e.item)
},
},
{
icon: 'mdi mdi-weather-night',
label: 'Midnight',
- command: (e) => {
+ command: () => {
this.autoSubFolderMode = 'MIDNIGHT'
this.savePreference()
-
- this.checkMenu(this.cameraMenuItems[2].items!, e.item)
},
},
],
},
+ {
+ separator: true,
+ },
+ {
+ icon: 'icomoon random-dither',
+ label: 'Dithering',
+ command: () => {
+ this.showDitheringDialog = true
+ },
+ },
]
cooler = false
@@ -129,14 +160,34 @@ export class CameraComponent implements AfterContentInit, OnDestroy {
offset = 0
offsetMin = 0
offsetMax = 0
- event?: CameraCaptureEvent
+
capturing = false
waiting = false
+ readonly exposure = {
+ count: 0,
+ remainingTime: 0,
+ progress: 0,
+ }
+
+ readonly capture = {
+ looping: false,
+ amount: 0,
+ remainingTime: 0,
+ elapsedTime: 0,
+ progress: 0,
+ }
+
+ readonly wait = {
+ duration: 0,
+ remainingTime: 0,
+ progress: 0,
+ }
+
readonly exposureModeOptions: ExposureMode[] = ['SINGLE', 'FIXED', 'LOOP']
readonly frameTypeOptions: FrameType[] = ['LIGHT', 'DARK', 'FLAT', 'BIAS']
- readonly exposureTimeUnitOptions: MenuItem[] = [
+ readonly exposureTimeUnitModel: MenuItem[] = [
{
label: 'Minute (m)',
command: () => {
@@ -172,42 +223,60 @@ export class CameraComponent implements AfterContentInit, OnDestroy {
private api: ApiService,
private browserWindow: BrowserWindowService,
private electron: ElectronService,
- private preference: PreferenceService,
+ private storage: LocalStorageService,
+ private route: ActivatedRoute,
ngZone: NgZone,
) {
app.title = 'Camera'
api.startListening('CAMERA')
- electron.on('CAMERA_UPDATED', (_, event: Camera) => {
- if (event.name === this.camera?.name) {
+ electron.on('CAMERA_UPDATED', event => {
+ if (event.device.name === this.camera?.name) {
ngZone.run(() => {
- Object.assign(this.camera!, event)
+ Object.assign(this.camera!, event.device)
this.update()
})
}
})
- electron.on('CAMERA_EXPOSURE_STARTED', (_, event: CameraCaptureEvent) => {
+ electron.on('CAMERA_CAPTURE_STARTED', event => {
if (event.camera.name === this.camera?.name) {
ngZone.run(() => {
- this.event = event
+ this.capture.looping = event.looping
+ this.capture.amount = event.exposureAmount
+ this.capture.elapsedTime = 0
+ this.capture.remainingTime = event.estimatedTime
+ this.capture.progress = event.progress
this.capturing = true
this.waiting = false
})
}
})
- electron.on('CAMERA_EXPOSURE_UPDATED', (_, event: CameraCaptureEvent) => {
+ electron.on('CAMERA_CAPTURE_ELAPSED', event => {
+ if (event.camera.name === this.camera?.name) {
+ ngZone.run(() => {
+ this.capture.elapsedTime = event.elapsedTime
+ this.capture.remainingTime = event.remainingTime
+ this.capture.progress = event.progress
+ })
+ }
+ })
+
+ electron.on('CAMERA_CAPTURE_WAITING', event => {
if (event.camera.name === this.camera?.name) {
ngZone.run(() => {
- this.event = event
- this.waiting = event.captureIsWaiting
+ this.wait.duration = event.waitDuration
+ this.wait.remainingTime = event.remainingTime
+ this.wait.progress = event.progress
+ this.capturing = false
+ this.waiting = true
})
}
})
- electron.on('CAMERA_CAPTURE_FINISHED', (_, event: CameraCaptureEvent) => {
+ electron.on('CAMERA_CAPTURE_FINISHED', event => {
if (event.camera.name === this.camera?.name) {
ngZone.run(() => {
this.capturing = false
@@ -216,15 +285,43 @@ export class CameraComponent implements AfterContentInit, OnDestroy {
}
})
- electron.on('WHEEL_CHANGED', (_, event?: FilterWheel) => {
- ngZone.run(() => {
- this.wheel = event
- })
+ electron.on('CAMERA_EXPOSURE_STARTED', event => {
+ if (event.camera.name === this.camera?.name) {
+ ngZone.run(() => {
+ this.exposure.remainingTime = event.remainingTime
+ this.exposure.progress = event.progress
+ this.exposure.count = event.exposureCount
+ this.capturing = true
+ this.waiting = false
+ })
+ }
+ })
+
+ electron.on('CAMERA_EXPOSURE_ELAPSED', event => {
+ if (event.camera.name === this.camera?.name) {
+ ngZone.run(() => {
+ this.exposure.remainingTime = event.remainingTime
+ this.exposure.progress = event.progress
+ this.exposure.count = event.exposureCount
+ })
+ }
+ })
+
+ electron.on('CAMERA_EXPOSURE_FINISHED', event => {
+ if (event.camera.name === this.camera?.name) {
+ ngZone.run(() => {
+ this.exposure.remainingTime = event.remainingTime
+ this.exposure.progress = event.progress
+ })
+ }
})
}
async ngAfterContentInit() {
- this.cameras = await this.api.cameras()
+ this.route.queryParams.subscribe(e => {
+ const camera = JSON.parse(decodeURIComponent(e.data)) as Camera
+ this.cameraChanged(camera)
+ })
}
@HostListener('window:unload')
@@ -233,21 +330,20 @@ export class CameraComponent implements AfterContentInit, OnDestroy {
this.abortCapture()
}
- async cameraChanged() {
+ async cameraChanged(camera?: Camera) {
+ this.camera = camera
+
if (this.camera) {
this.app.subTitle = this.camera.name
const camera = await this.api.camera(this.camera.name)
Object.assign(this.camera, camera)
- this.loadPreference()
+ await this.loadPreference()
this.update()
- this.savePreference()
} else {
this.app.subTitle = ''
}
-
- this.electron.send('CAMERA_CHANGED', this.camera)
}
connect() {
@@ -277,18 +373,26 @@ export class CameraComponent implements AfterContentInit, OnDestroy {
}
}
+ openCameraImage() {
+ return this.browserWindow.openCameraImage(this.camera!)
+ }
+
+ openCameraCalibration() {
+ return this.browserWindow.openCalibration({ data: this.camera! })
+ }
+
async startCapture() {
const x = this.subFrame ? this.x : this.camera!.minX
const y = this.subFrame ? this.y : this.camera!.minY
const width = this.subFrame ? this.width : this.camera!.maxWidth
const height = this.subFrame ? this.height : this.camera!.maxHeight
const exposureFactor = CameraComponent.exposureUnitFactor(this.exposureTimeUnit)
- const exposureInMicroseconds = Math.trunc(this.exposureTime * 60000000 / exposureFactor)
+ const exposureTime = Math.trunc(this.exposureTime * 60000000 / exposureFactor)
const exposureAmount = this.exposureMode === 'LOOP' ? 0 : (this.exposureMode === 'FIXED' ? this.exposureCount : 1)
const data: CameraStartCapture = {
- exposureInMicroseconds, exposureAmount,
- exposureDelayInSeconds: this.exposureDelay,
+ exposureTime, exposureAmount,
+ exposureDelay: this.exposureDelay * 1000000,
x, y, width, height,
frameFormat: this.frameFormat,
frameType: this.frameType,
@@ -299,9 +403,10 @@ export class CameraComponent implements AfterContentInit, OnDestroy {
autoSave: this.autoSave,
savePath: this.savePath,
autoSubFolderMode: this.autoSubFolderMode,
+ dither: this.dithering,
}
- await this.browserWindow.openCameraImage(this.camera!)
+ await this.openCameraImage()
this.api.cameraStartCapture(this.camera!, data)
}
@@ -360,79 +465,77 @@ export class CameraComponent implements AfterContentInit, OnDestroy {
this.gainMax = this.camera.gainMax
this.offsetMin = this.camera.offsetMin
this.offsetMax = this.camera.offsetMax
- this.capturesPath = this.camera.capturesPath
this.updateExposureUnit(this.exposureTimeUnit)
}
+
+ this.capturesPath = this.camera.capturesPath
}
}
- resetSavePath() {
+ clearSavePath() {
this.savePath = ''
- this.preference.set(`camera.${this.camera!.name}.savePath`, this.savePath)
+ this.savePreference()
}
private loadPreference() {
if (this.camera) {
- this.autoSave = this.preference.get(`camera.${this.camera.name}.autoSave`, false)
- this.savePath = this.preference.get(`camera.${this.camera.name}.savePath`, '')
- this.autoSubFolderMode = this.preference.get(`camera.${this.camera.name}.autoSubFolderMode`, 'OFF')
-
- this.checkMenuItem(this.cameraMenuItems[0], this.autoSave)
- const menuIndex = this.autoSubFolderMode === 'OFF' ? 0 : (this.autoSubFolderMode === 'NOON' ? 1 : 2)
- this.checkMenu(this.cameraMenuItems[2].items!, this.cameraMenuItems[2].items![menuIndex], true)
-
- this.setpointTemperature = this.preference.get(`camera.${this.camera.name}.setpointTemperature`, 0)
- this.exposureTime = this.preference.get(`camera.${this.camera.name}.exposureTime`, this.camera.exposureMin)
- this.exposureTimeUnit = this.preference.get(`camera.${this.camera.name}.exposureTimeUnit`, ExposureTimeUnit.MICROSECOND)
- this.exposureMode = this.preference.get(`camera.${this.camera.name}.exposureMode`, 'SINGLE')
- this.exposureDelay = this.preference.get(`camera.${this.camera.name}.exposureDelay`, 0)
- this.exposureCount = this.preference.get(`camera.${this.camera.name}.exposureCount`, 1)
- this.x = this.preference.get(`camera.${this.camera.name}.x`, this.camera.minX)
- this.y = this.preference.get(`camera.${this.camera.name}.y`, this.camera.minY)
- this.width = this.preference.get(`camera.${this.camera.name}.width`, this.camera.maxWidth)
- this.height = this.preference.get(`camera.${this.camera.name}.height`, this.camera.maxHeight)
- this.subFrame = this.preference.get(`camera.${this.camera.name}.subFrame`, false)
- this.binX = this.preference.get(`camera.${this.camera.name}.binX`, 1)
- this.binY = this.preference.get(`camera.${this.camera.name}.binY`, 1)
- this.frameType = this.preference.get(`camera.${this.camera.name}.frameType`, 'LIGHT')
- this.gain = this.preference.get(`camera.${this.camera.name}.gain`, 0)
- this.offset = this.preference.get(`camera.${this.camera.name}.offset`, 0)
- this.frameFormat = this.preference.get(`camera.${this.camera.name}.frameFormat`, this.camera.frameFormats[0] || '')
+ const preference = this.storage.get(`camera.${this.camera.name}`, {})
+ this.autoSave = preference.autoSave ?? false
+ this.savePath = preference.savePath ?? ''
+ this.autoSubFolderMode = preference.autoSubFolderMode ?? 'OFF'
+ this.setpointTemperature = preference.setpointTemperature ?? 0
+ this.exposureTime = preference.exposureTime ?? this.camera.exposureMin
+ this.exposureTimeUnit = preference.exposureTimeUnit ?? ExposureTimeUnit.MICROSECOND
+ this.exposureMode = preference.exposureMode ?? 'SINGLE'
+ this.exposureDelay = preference.exposureDelay ?? 0
+ this.exposureCount = preference.exposureCount ?? 1
+ this.x = preference.x ?? this.camera.minX
+ this.y = preference.y ?? this.camera.minY
+ this.width = preference.width ?? this.camera.maxWidth
+ this.height = preference.height ?? this.camera.maxHeight
+ this.subFrame = preference.subFrame ?? false
+ this.binX = preference.binX ?? 1
+ this.binY = preference.binY ?? 1
+ this.frameType = preference.frameType ?? 'LIGHT'
+ this.gain = preference.gain ?? 0
+ this.offset = preference.offset ?? 0
+ this.frameFormat = preference.frameFormat ?? (this.camera.frameFormats[0] || '')
+
+ this.dithering.enabled = preference.dithering?.enabled ?? false
+ this.dithering.raOnly = preference.dithering?.raOnly ?? false
+ this.dithering.amount = preference.dithering?.amount ?? 1.5
+ this.dithering.afterExposures = preference.dithering?.afterExposures ?? 1
}
}
savePreference() {
if (this.camera && this.camera.connected) {
- this.preference.set(`camera.${this.camera.name}.autoSave`, this.autoSave)
- this.preference.set(`camera.${this.camera.name}.savePath`, this.savePath)
- this.preference.set(`camera.${this.camera.name}.autoSubFolderMode`, this.autoSubFolderMode)
- this.preference.set(`camera.${this.camera.name}.setpointTemperature`, this.setpointTemperature)
- this.preference.set(`camera.${this.camera.name}.exposureTime`, this.exposureTime)
- this.preference.set(`camera.${this.camera.name}.exposureTimeUnit`, this.exposureTimeUnit)
- this.preference.set(`camera.${this.camera.name}.exposureMode`, this.exposureMode)
- this.preference.set(`camera.${this.camera.name}.exposureDelay`, this.exposureDelay)
- this.preference.set(`camera.${this.camera.name}.exposureCount`, this.exposureCount)
- this.preference.set(`camera.${this.camera.name}.x`, this.x)
- this.preference.set(`camera.${this.camera.name}.y`, this.y)
- this.preference.set(`camera.${this.camera.name}.width`, this.width)
- this.preference.set(`camera.${this.camera.name}.height`, this.height)
- this.preference.set(`camera.${this.camera.name}.subFrame`, this.subFrame)
- this.preference.set(`camera.${this.camera.name}.binX`, this.binX)
- this.preference.set(`camera.${this.camera.name}.binY`, this.binY)
- this.preference.set(`camera.${this.camera.name}.frameType`, this.frameType)
- this.preference.set(`camera.${this.camera.name}.gain`, this.gain)
- this.preference.set(`camera.${this.camera.name}.offset`, this.offset)
- this.preference.set(`camera.${this.camera.name}.frameFormat`, this.frameFormat)
- }
- }
-
- private checkMenuItem(item?: MenuItem | MegaMenuItem, checked: boolean = true) {
- item && (item.styleClass = checked ? 'p-menuitem-checked' : '')
- }
+ const preference: CameraPreference = {
+ autoSave: this.autoSave,
+ savePath: this.savePath,
+ autoSubFolderMode: this.autoSubFolderMode,
+ setpointTemperature: this.setpointTemperature,
+ exposureTime: this.exposureTime,
+ exposureTimeUnit: this.exposureTimeUnit,
+ exposureMode: this.exposureMode,
+ exposureDelay: this.exposureDelay,
+ exposureCount: this.exposureCount,
+ x: this.x,
+ y: this.y,
+ width: this.width,
+ height: this.height,
+ subFrame: this.subFrame,
+ binX: this.binX,
+ binY: this.binY,
+ frameType: this.frameType,
+ gain: this.gain,
+ offset: this.offset,
+ frameFormat: this.frameFormat,
+ dithering: this.dithering,
+ }
- private checkMenu(menu: MenuItem[], item?: MenuItem | MegaMenuItem, checked: boolean = true) {
- menu.forEach((e) => e !== item && this.checkMenuItem(e, false))
- this.checkMenuItem(item, checked)
+ this.storage.set(`camera.${this.camera.name}`, preference)
+ }
}
}
diff --git a/desktop/src/app/filterwheel/filterwheel.component.html b/desktop/src/app/filterwheel/filterwheel.component.html
index 9c02bd622..e7ac0fe78 100644
--- a/desktop/src/app/filterwheel/filterwheel.component.html
+++ b/desktop/src/app/filterwheel/filterwheel.component.html
@@ -1,10 +1,8 @@
+
+
+
+
@@ -198,35 +253,10 @@
-
-
-
-
-
-
-
-
-
-
- {{ name }}
-
@@ -300,17 +330,19 @@
-
-
-
@@ -342,30 +363,30 @@
-
-
+
+ {{ name ?? '' }}
+
+
+
-
-
-
-
-
-
@@ -489,4 +445,28 @@
-
+
+
+
+
+
magnitude: [number, number]
type: Union
+ types: Union[]
+}
+
+export interface SkyAtlasPreference {
+ satellites?: { group: SatelliteGroupType, enabled: boolean }[]
}
@Component({
@@ -40,29 +49,24 @@ export interface SearchFilter {
templateUrl: './atlas.component.html',
styleUrls: ['./atlas.component.scss'],
})
-export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
+export class AtlasComponent implements OnInit, AfterContentInit, AfterViewInit, OnDestroy {
refreshing = false
private activeTab = 0
- private settingsTabActivated = false
get tab() {
- return this.settingsTabActivated ? 7 : this.activeTab
+ return this.activeTab
}
set tab(value: number) {
- this.settingsTabActivated = false
- if (value === 7) this.settingsTabActivated = true
- else this.activeTab = value
+ this.activeTab = value
}
readonly bodyPosition = Object.assign({}, EMPTY_BODY_POSITION)
moonIlluminated = 1
moonWaning = false
- locations: Location[] = []
- location = Object.assign({}, EMPTY_LOCATION)
useManualDateTime = false
dateTime = new Date()
dateTimeHour = this.dateTime.getHours()
@@ -115,9 +119,8 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
star?: Star
starItems: Star[] = []
starSearchText = ''
- showStarFilterDialog = false
- readonly starFilter: SearchFilter = {
+ private readonly starFilter: SearchFilter = {
text: '',
rightAscension: '00h00m00s',
declination: `+000°00'00"`,
@@ -125,22 +128,14 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
constellation: 'ALL',
magnitude: [-30, 30],
type: 'ALL',
+ types: ['ALL'],
}
- readonly starTypeOptions: Union[] = ['ALL']
-
dso?: DeepSkyObject
dsoItems: DeepSkyObject[] = []
dsoSearchText = ''
- showDSOFilterDialog = false
- satellite?: Satellite
- satelliteItems: Satellite[] = []
- satelliteSearchText = ''
- showSatelliteFilterDialog = false
- readonly satelliteSearchGroup = new Map()
-
- readonly dsoFilter: SearchFilter = {
+ private readonly dsoFilter: SearchFilter = {
text: '',
rightAscension: '00h00m00s',
declination: `+000°00'00"`,
@@ -148,18 +143,46 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
constellation: 'ALL',
magnitude: [-30, 30],
type: 'ALL',
+ types: ['ALL'],
}
- readonly dsoTypeOptions: Union[] = ['ALL']
+ simbad?: DeepSkyObject
+ simbadItems: DeepSkyObject[] = []
+ simbadSearchText = ''
+
+ private readonly simbadFilter: SearchFilter = {
+ text: '',
+ rightAscension: '00h00m00s',
+ declination: `+000°00'00"`,
+ radius: 0,
+ constellation: 'ALL',
+ magnitude: [-30, 30],
+ type: 'ALL',
+ types: ['ALL'],
+ }
+ showSkyObjectFilter = false
+ skyObjectFilter?: SearchFilter
readonly constellationOptions: Union[] = ['ALL', ...CONSTELLATIONS]
- name = 'Sun'
+ satellite?: Satellite
+ satelliteItems: Satellite[] = []
+ satelliteSearchText = ''
+ showSatelliteFilterDialog = false
+ readonly satelliteSearchGroup = new Map()
+
+ name?= 'Sun'
tags: { title: string, severity: string }[] = []
@ViewChild('imageOfSun')
private readonly imageOfSun!: ElementRef
+ @ViewChild('deviceMenu')
+ private readonly deviceMenu!: DeviceMenuComponent
+
+ @ViewChild('calendarPanel')
+ private readonly calendarPanel!: OverlayPanel
+
@ViewChild('chart')
private readonly chart!: UIChart
@@ -402,7 +425,7 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
'ONEWEB', 'SCIENCE', 'STARLINK', 'STATIONS', 'VISUAL'
]
- readonly ephemerisMenuItems: MenuItem[] = [
+ readonly ephemerisModel: MenuItem[] = [
{
icon: 'mdi mdi-magnify',
label: 'Find stars around this object',
@@ -410,9 +433,10 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
this.starFilter.rightAscension = this.bodyPosition.rightAscensionJ2000
this.starFilter.declination = this.bodyPosition.declinationJ2000
if (this.starFilter.radius <= 0) this.starFilter.radius = 1
+ this.skyObjectFilter = this.starFilter
this.tab = 4
- // this.showStarFilterDialog = true
- this.filterStar()
+ this.tabChanged()
+ this.filterSkyObject()
},
},
{
@@ -422,57 +446,72 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
this.dsoFilter.rightAscension = this.bodyPosition.rightAscensionJ2000
this.dsoFilter.declination = this.bodyPosition.declinationJ2000
if (this.dsoFilter.radius <= 0) this.dsoFilter.radius = 1
+ this.skyObjectFilter = this.dsoFilter
this.tab = 5
- // this.showDSOFilterDialog = true
- this.filterDSO()
+ this.tabChanged()
+ this.filterSkyObject()
+ },
+ },
+ {
+ icon: 'mdi mdi-magnify',
+ label: 'Find around this object on Simbad',
+ command: () => {
+ this.simbadFilter.rightAscension = this.bodyPosition.rightAscensionJ2000
+ this.simbadFilter.declination = this.bodyPosition.declinationJ2000
+ if (this.simbadFilter.radius <= 0) this.simbadFilter.radius = 1
+ this.skyObjectFilter = this.simbadFilter
+ this.tab = 6
+ this.tabChanged()
+ this.filterSkyObject()
},
},
]
+ private refreshTimer?: Subscription
+ private refreshTabCount = 0
+
constructor(
private app: AppComponent,
private api: ApiService,
private browserWindow: BrowserWindowService,
- private electron: ElectronService,
- private preference: PreferenceService,
- private dialog: DialogService,
+ electron: ElectronService,
+ private storage: LocalStorageService,
+ private skyObjectPipe: SkyObjectPipe,
+ private prime: PrimeService,
+ ngZone: NgZone,
) {
app.title = 'Sky Atlas'
- for (const item of SATELLITE_GROUPS) {
- const enabled = preference.get(`atlas.satellite.filter.${item}`, AtlasComponent.DEFAULT_SATELLITE_FILTERS.includes(item))
- this.satelliteSearchGroup.set(item, enabled)
- }
+ app.extra.push({
+ icon: 'mdi mdi-calendar',
+ tooltip: 'Date & time',
+ command: (e) => {
+ this.calendarPanel.toggle(e.originalEvent)
+ },
+ })
- electron.on('CRON_TICKED', () => {
- if (!this.useManualDateTime) {
- this.refreshTab()
- }
+ electron.on('LOCATION_CHANGED', (event) => {
+ ngZone.run(() => this.refreshTab(true, true, event))
})
// TODO: Refresh graph and twilight if hours past 12 (noon)
}
async ngOnInit() {
- this.electron.registerCron(EVERY_MINUTE_CRON_TIME)
-
- this.starTypeOptions.push(... await this.api.starTypes())
- this.dsoTypeOptions.push(... await this.api.dsoTypes())
- }
+ const preference = this.storage.get('atlas', {})
- async ngAfterContentInit() {
- const locations = await this.api.locations()
- const location = this.preference.get('atlas.location', EMPTY_LOCATION)
- const index = locations.findIndex(e => e.id === location.id)
-
- if (index >= 1) {
- const temp = locations[0]
- locations[0] = location
- locations[index] = temp
+ for (const group of SATELLITE_GROUPS) {
+ const satellite = preference.satellites?.find(e => e.group === group)
+ const enabled = satellite?.enabled ?? AtlasComponent.DEFAULT_SATELLITE_FILTERS.includes(group)
+ this.satelliteSearchGroup.set(group, enabled)
}
- this.locations = locations
+ this.starFilter.types.push(... await this.api.starTypes())
+ this.dsoFilter.types.push(... await this.api.dsoTypes())
+ this.simbadFilter.types.push(... await this.api.simbadTypes())
+ }
+ async ngAfterContentInit() {
// const canvas = this.chart.getCanvas() as HTMLCanvasElement
// const chart = this.chart.chart as Chart
@@ -480,19 +519,38 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
// const x = chart.scales['x'].getValueForPixel(event.offsetX)
// const y = chart.scales['y'].getValueForPixel(event.offsetY)
// }
+
+ const now = new Date()
+ const initialDelay = 60 * 1000 - (now.getSeconds() * 1000 + now.getMilliseconds())
+ this.refreshTimer = timer(initialDelay, 60 * 1000)
+ .subscribe(() => {
+ if (!this.useManualDateTime) {
+ this.refreshTab()
+ }
+ })
+
+ if (initialDelay > 2500) {
+ await this.refreshTab()
+ }
+ }
+
+ ngAfterViewInit() {
+ this.calendarPanel.onOverlayClick = (e) => {
+ e.stopImmediatePropagation()
+ }
}
@HostListener('window:unload')
ngOnDestroy() {
- this.electron.unregisterCron()
+ this.refreshTimer?.unsubscribe()
}
- tabChanged() {
- this.refreshTab(false, true)
+ async tabChanged() {
+ await this.refreshTab(false, true)
}
- planetChanged() {
- this.refreshTab(false, true)
+ async planetChanged() {
+ await this.refreshTab(false, true)
}
async searchMinorPlanet() {
@@ -503,7 +561,7 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
if (minorPlanet.found) {
this.minorPlanet = minorPlanet
- this.refreshTab(false, true)
+ await this.refreshTab(false, true)
} else {
this.minorPlanetChoiceItems = minorPlanet.searchItems
this.showMinorPlanetChoiceDialog = true
@@ -519,16 +577,25 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
this.showMinorPlanetChoiceDialog = false
}
- starChanged() {
- this.refreshTab(false, true)
+ async starChanged() {
+ await this.refreshTab(false, true)
+ }
+
+ async dsoChanged() {
+ await this.refreshTab(false, true)
+ }
+
+ async simbadChanged() {
+ await this.refreshTab(false, true)
}
- dsoChanged() {
- this.refreshTab(false, true)
+ async satelliteChanged() {
+ await this.refreshTab(false, true)
}
- satelliteChanged() {
- this.refreshTab(false, true)
+ showStarFilterDialog() {
+ this.skyObjectFilter = this.starFilter
+ this.showSkyObjectFilter = true
}
async searchStar() {
@@ -547,9 +614,9 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
}
}
- async filterStar() {
- await this.searchStar()
- this.showStarFilterDialog = false
+ showDSOFilterDialog() {
+ this.skyObjectFilter = this.dsoFilter
+ this.showSkyObjectFilter = true
}
async searchDSO() {
@@ -568,110 +635,116 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
}
}
- async filterDSO() {
- await this.searchDSO()
- this.showDSOFilterDialog = false
+ showSimbadFilterDialog() {
+ this.skyObjectFilter = this.simbadFilter
+ this.showSkyObjectFilter = true
}
- async searchSatellite() {
+ async searchSimbad() {
+ const constellation = this.simbadFilter.constellation === 'ALL' ? undefined : this.simbadFilter.constellation
+ const type = this.simbadFilter.type === 'ALL' ? undefined : this.simbadFilter.type
+
this.refreshing = true
try {
- for (const item of SATELLITE_GROUPS) {
- this.preference.set(`atlas.satellite.filter.${item}`, this.satelliteSearchGroup.get(item))
- }
-
- const groups = SATELLITE_GROUPS.filter(e => this.satelliteSearchGroup.get(e))
- this.satelliteItems = await this.api.searchSatellites(this.satelliteSearchText, groups)
+ this.simbadItems = await this.api.searchSimbad(this.simbadSearchText,
+ this.simbadFilter.rightAscension, this.simbadFilter.declination, this.simbadFilter.radius,
+ constellation, this.simbadFilter.magnitude[0], this.simbadFilter.magnitude[1], type,
+ )
} finally {
this.refreshing = false
}
}
- resetSatelliteFilter() {
- for (const item of SATELLITE_GROUPS) {
- const enabled = AtlasComponent.DEFAULT_SATELLITE_FILTERS.includes(item)
- this.preference.set(`atlas.satellite.filter.${item}`, enabled)
- this.satelliteSearchGroup.set(item, enabled)
- }
- }
+ async filterSkyObject() {
+ if (this.skyObjectFilter === this.starFilter) await this.searchStar()
+ else if (this.skyObjectFilter === this.dsoFilter) await this.searchDSO()
+ else if (this.skyObjectFilter === this.simbadFilter) await this.searchSimbad()
- async filterSatellite() {
- await this.searchSatellite()
- this.showSatelliteFilterDialog = false
+ this.showSkyObjectFilter = false
}
- addLocation() {
- this.showLocation(Object.assign({}, EMPTY_LOCATION))
- }
+ async searchSatellite() {
+ this.refreshing = true
- editLocation() {
- this.showLocation(Object.assign({}, this.location))
- }
+ try {
+ const preference = this.storage.get('atlas', {})
- private showLocation(location: Location) {
- const dialog = LocationDialog.show(this.dialog, location)
+ preference.satellites = SATELLITE_GROUPS.map(group => {
+ return { group, enabled: this.satelliteSearchGroup.get(group) ?? false }
+ })
- dialog.onClose.subscribe((result?: Location) => {
- result && this.saveLocation(result)
- })
- }
+ this.storage.set('atlas', preference)
- private async saveLocation(location: Location) {
- this.location = await this.api.saveLocation(location)
- this.locations = await this.api.locations()
- this.refreshTab(true, true)
+ const groups = SATELLITE_GROUPS.filter(e => this.satelliteSearchGroup.get(e))
+ this.satelliteItems = await this.api.searchSatellites(this.satelliteSearchText, groups)
+ } finally {
+ this.refreshing = false
+ }
}
- async deleteLocation() {
- await this.api.deleteLocation(this.location)
- this.locations = await this.api.locations()
- this.location = this.locations[0] ?? Object.assign({}, EMPTY_LOCATION)
- this.refreshTab(true, true)
+ resetSatelliteFilter() {
+ const preference = this.storage.get('atlas', {})
+
+ preference.satellites = []
+
+ for (const group of SATELLITE_GROUPS) {
+ const enabled = AtlasComponent.DEFAULT_SATELLITE_FILTERS.includes(group)
+ preference.satellites!.push({ group, enabled })
+ this.satelliteSearchGroup.set(group, enabled)
+ }
+
+ this.storage.set('atlas', preference)
}
- locationChanged() {
- this.preference.set(`atlas.location`, this.location)
- this.refreshTab(true, true)
+ async filterSatellite() {
+ await this.searchSatellite()
+ this.showSatelliteFilterDialog = false
}
- dateTimeChanged(dateChanged: boolean) {
- this.refreshTab(dateChanged, true)
+ async dateTimeChanged(dateChanged: boolean) {
+ await this.refreshTab(dateChanged, true)
}
- useManualDateTimeChanged() {
+ async useManualDateTimeChanged() {
if (!this.useManualDateTime) {
- this.refreshTab(true, true)
+ await this.refreshTab(true, true)
}
}
async mountGoTo() {
- const mount = await this.electron.selectedMount()
- if (!mount?.connected) return
- this.api.mountGoTo(mount, this.bodyPosition.rightAscension, this.bodyPosition.declination, false)
+ this.executeMount((mount) => {
+ this.api.mountGoTo(mount, this.bodyPosition.rightAscension, this.bodyPosition.declination, false)
+ })
}
async mountSlew() {
- const mount = await this.electron.selectedMount()
- if (!mount?.connected) return
- this.api.mountSlew(mount, this.bodyPosition.rightAscension, this.bodyPosition.declination, false)
+ this.executeMount((mount) => {
+ this.api.mountSlew(mount, this.bodyPosition.rightAscension, this.bodyPosition.declination, false)
+ })
}
async mountSync() {
- const mount = await this.electron.selectedMount()
- if (!mount?.connected) return
- this.api.mountSync(mount, this.bodyPosition.rightAscension, this.bodyPosition.declination, false)
+ this.executeMount((mount) => {
+ this.api.mountSync(mount, this.bodyPosition.rightAscension, this.bodyPosition.declination, false)
+ })
}
frame() {
- this.browserWindow.openFraming({ rightAscension: this.bodyPosition.rightAscensionJ2000, declination: this.bodyPosition.declinationJ2000 })
+ this.browserWindow.openFraming({ data: { rightAscension: this.bodyPosition.rightAscensionJ2000, declination: this.bodyPosition.declinationJ2000 } })
}
async refreshTab(
refreshTwilight: boolean = false,
refreshChart: boolean = false,
+ location?: Location,
) {
+ if (this.refreshing) return
+
+ location ??= await this.api.selectedLocation()
+
this.refreshing = true
+ this.refreshTabCount++
if (!this.useManualDateTime) {
this.dateTime = new Date()
@@ -682,7 +755,7 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
this.dateTime.setMinutes(this.dateTimeMinute)
}
- this.app.subTitle = this.location.name
+ this.app.subTitle = `${location.name} · ${moment(this.dateTime).format('YYYY-MM-DD HH:mm')}`
try {
// Sun.
@@ -690,14 +763,14 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
this.name = 'Sun'
this.tags = []
this.imageOfSun.nativeElement.src = `${this.api.baseUrl}/sky-atlas/sun/image`
- const bodyPosition = await this.api.positionOfSun(this.location!, this.dateTime)
+ const bodyPosition = await this.api.positionOfSun(location!, this.dateTime)
Object.assign(this.bodyPosition, bodyPosition)
}
// Moon.
else if (this.activeTab === 1) {
this.name = 'Moon'
this.tags = []
- const bodyPosition = await this.api.positionOfMoon(this.location!, this.dateTime)
+ const bodyPosition = await this.api.positionOfMoon(location!, this.dateTime)
Object.assign(this.bodyPosition, bodyPosition)
this.moonIlluminated = this.bodyPosition.illuminated / 100.0
this.moonWaning = this.bodyPosition.leading
@@ -708,10 +781,10 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
if (this.planet) {
this.name = this.planet.name
- const bodyPosition = await this.api.positionOfPlanet(this.location!, this.planet.code, this.dateTime)
+ const bodyPosition = await this.api.positionOfPlanet(location!, this.planet.code, this.dateTime)
Object.assign(this.bodyPosition, bodyPosition)
} else {
- this.name = '-'
+ this.name = undefined
Object.assign(this.bodyPosition, EMPTY_BODY_POSITION)
}
}
@@ -726,10 +799,10 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
if (this.minorPlanet.pha) this.tags.push({ title: 'PHA', severity: 'danger' })
if (this.minorPlanet.neo) this.tags.push({ title: 'NEO', severity: 'warning' })
const code = `DES=${this.minorPlanet.spkId};`
- const bodyPosition = await this.api.positionOfPlanet(this.location!, code, this.dateTime)
+ const bodyPosition = await this.api.positionOfPlanet(location!, code, this.dateTime)
Object.assign(this.bodyPosition, bodyPosition)
} else {
- this.name = '-'
+ this.name = undefined
Object.assign(this.bodyPosition, EMPTY_BODY_POSITION)
}
}
@@ -738,11 +811,11 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
this.tags = []
if (this.star) {
- this.name = this.star.name.replaceAll('|', ' · ')
- const bodyPosition = await this.api.positionOfStar(this.location!, this.star, this.dateTime)
+ this.name = this.skyObjectPipe.transform(this.star, 'name')
+ const bodyPosition = await this.api.positionOfStar(location!, this.star, this.dateTime)
Object.assign(this.bodyPosition, bodyPosition)
} else {
- this.name = '-'
+ this.name = undefined
Object.assign(this.bodyPosition, EMPTY_BODY_POSITION)
}
}
@@ -751,30 +824,43 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
this.tags = []
if (this.dso) {
- this.name = this.dso.name.replaceAll('|', ' · ')
- const bodyPosition = await this.api.positionOfDSO(this.location!, this.dso, this.dateTime)
+ this.name = this.skyObjectPipe.transform(this.dso, 'name')
+ const bodyPosition = await this.api.positionOfDSO(location!, this.dso, this.dateTime)
Object.assign(this.bodyPosition, bodyPosition)
} else {
- this.name = '-'
+ this.name = undefined
Object.assign(this.bodyPosition, EMPTY_BODY_POSITION)
}
}
- // Satellite.
+ // Simbad.
else if (this.activeTab === 6) {
this.tags = []
+ if (this.simbad) {
+ this.name = this.skyObjectPipe.transform(this.simbad, 'name')
+ const bodyPosition = await this.api.positionOfSimbad(location!, this.simbad, this.dateTime)
+ Object.assign(this.bodyPosition, bodyPosition)
+ } else {
+ this.name = undefined
+ Object.assign(this.bodyPosition, EMPTY_BODY_POSITION)
+ }
+ }
+ // Satellite.
+ else if (this.activeTab === 7) {
+ this.tags = []
+
if (this.satellite) {
this.name = this.satellite.name
- const bodyPosition = await this.api.positionOfSatellite(this.location!, this.satellite, this.dateTime)
+ const bodyPosition = await this.api.positionOfSatellite(location!, this.satellite, this.dateTime)
Object.assign(this.bodyPosition, bodyPosition)
} else {
- this.name = '-'
+ this.name = undefined
Object.assign(this.bodyPosition, EMPTY_BODY_POSITION)
}
}
- if (refreshTwilight) {
- const twilight = await this.api.twilight(this.location!, this.dateTime)
+ if (this.refreshTabCount === 1 || refreshTwilight) {
+ const twilight = await this.api.twilight(location!, this.dateTime)
this.altitudeData.datasets[0].data = [[0.0, 90], [twilight.civilDusk[0], 90]]
this.altitudeData.datasets[1].data = [[twilight.civilDusk[0], 90], [twilight.civilDusk[1], 90]]
this.altitudeData.datasets[2].data = [[twilight.nauticalDusk[0], 90], [twilight.nauticalDusk[1], 90]]
@@ -787,30 +873,30 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
this.chart?.refresh()
}
- if (refreshChart) {
- await this.refreshChart()
+ if (this.refreshTabCount === 1 || refreshChart) {
+ await this.refreshChart(location)
}
} finally {
this.refreshing = false
}
}
- private async refreshChart() {
+ private async refreshChart(location: Location) {
// Sun.
if (this.activeTab === 0) {
- const points = await this.api.altitudePointsOfSun(this.location!, this.dateTime)
+ const points = await this.api.altitudePointsOfSun(location!, this.dateTime)
AtlasComponent.belowZeroPoints(points)
this.altitudeData.datasets[9].data = points
}
// Moon.
else if (this.activeTab === 1) {
- const points = await this.api.altitudePointsOfMoon(this.location!, this.dateTime)
+ const points = await this.api.altitudePointsOfMoon(location!, this.dateTime)
AtlasComponent.belowZeroPoints(points)
this.altitudeData.datasets[9].data = points
}
// Planet.
else if (this.activeTab === 2 && this.planet) {
- const points = await this.api.altitudePointsOfPlanet(this.location!, this.planet.code, this.dateTime)
+ const points = await this.api.altitudePointsOfPlanet(location!, this.planet.code, this.dateTime)
AtlasComponent.belowZeroPoints(points)
this.altitudeData.datasets[9].data = points
}
@@ -818,7 +904,7 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
else if (this.activeTab === 3) {
if (this.minorPlanet) {
const code = `DES=${this.minorPlanet.spkId};`
- const points = await this.api.altitudePointsOfPlanet(this.location!, code, this.dateTime)
+ const points = await this.api.altitudePointsOfPlanet(location!, code, this.dateTime)
AtlasComponent.belowZeroPoints(points)
this.altitudeData.datasets[9].data = points
} else {
@@ -828,7 +914,7 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
// Star.
else if (this.activeTab === 4) {
if (this.star) {
- const points = await this.api.altitudePointsOfStar(this.location!, this.star, this.dateTime)
+ const points = await this.api.altitudePointsOfStar(location!, this.star, this.dateTime)
AtlasComponent.belowZeroPoints(points)
this.altitudeData.datasets[9].data = points
} else {
@@ -838,17 +924,27 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
// DSO.
else if (this.activeTab === 5) {
if (this.dso) {
- const points = await this.api.altitudePointsOfDSO(this.location!, this.dso, this.dateTime)
+ const points = await this.api.altitudePointsOfDSO(location!, this.dso, this.dateTime)
AtlasComponent.belowZeroPoints(points)
this.altitudeData.datasets[9].data = points
} else {
this.altitudeData.datasets[9].data = []
}
}
- // Satellite.
+ // Simbad.
else if (this.activeTab === 6) {
+ if (this.simbad) {
+ const points = await this.api.altitudePointsOfSimbad(location!, this.simbad, this.dateTime)
+ AtlasComponent.belowZeroPoints(points)
+ this.altitudeData.datasets[9].data = points
+ } else {
+ this.altitudeData.datasets[9].data = []
+ }
+ }
+ // Satellite.
+ else if (this.activeTab === 7) {
if (this.satellite) {
- const points = await this.api.altitudePointsOfSatellite(this.location!, this.satellite, this.dateTime)
+ const points = await this.api.altitudePointsOfSatellite(location!, this.satellite, this.dateTime)
AtlasComponent.belowZeroPoints(points)
this.altitudeData.datasets[9].data = points
} else {
@@ -868,4 +964,26 @@ export class AtlasComponent implements OnInit, AfterContentInit, OnDestroy {
}
}
}
+
+ private async executeMount(action: (mount: Mount) => void) {
+ if (await this.prime.confirm('Are you sure that you want to proceed?')) {
+ return
+ }
+
+ const mounts = await this.api.mounts()
+
+ if (mounts.length === 1) {
+ action(mounts[0])
+ return true
+ } else {
+ const mount = await this.deviceMenu.show(mounts)
+
+ if (mount && mount.connected) {
+ action(mount)
+ return true
+ }
+ }
+
+ return false
+ }
}
diff --git a/desktop/src/app/calibration/calibration.component.html b/desktop/src/app/calibration/calibration.component.html
new file mode 100644
index 000000000..cffb48474
--- /dev/null
+++ b/desktop/src/app/calibration/calibration.component.html
@@ -0,0 +1,85 @@
+
@@ -104,7 +112,7 @@
[allowEmpty]="false" (ngModelChange)="savePreference()" />
-
@@ -233,11 +241,41 @@
-
-
+
-
+
-
-
@@ -383,55 +404,7 @@
-
-
-
-
-
-
-
-
-
-
- {{ item | enum }}
-
-
- {{ item | enum }}
-
-
-
- Magnitude min: {{ starFilter.magnitude[0] }} max: {{ starFilter.magnitude[1] }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -444,33 +417,16 @@
-
-
-
-
-
-
-
- {{ item | enum }}
-
-
- {{ item | enum }}
-
-
-
Magnitude min: {{ dsoFilter.magnitude[0] }} max: {{ dsoFilter.magnitude[1] }}
-Magnitude min: {{ skyObjectFilter.magnitude[0] }} max: {{ skyObjectFilter.magnitude[1] }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/desktop/src/app/calibration/calibration.component.scss b/desktop/src/app/calibration/calibration.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/desktop/src/app/calibration/calibration.component.ts b/desktop/src/app/calibration/calibration.component.ts
new file mode 100644
index 000000000..b1da8bbf2
--- /dev/null
+++ b/desktop/src/app/calibration/calibration.component.ts
@@ -0,0 +1,120 @@
+import { AfterViewInit, Component, HostListener, OnDestroy } from '@angular/core'
+import { ActivatedRoute } from '@angular/router'
+import { CheckboxChangeEvent } from 'primeng/checkbox'
+import { ApiService } from '../../shared/services/api.service'
+import { ElectronService } from '../../shared/services/electron.service'
+import { CalibrationFrame, CalibrationFrameGroup, Camera } from '../../shared/types'
+import { AppComponent } from '../app.component'
+
+@Component({
+ selector: 'app-calibration',
+ templateUrl: './calibration.component.html',
+ styleUrls: ['./calibration.component.scss'],
+})
+export class CalibrationComponent implements AfterViewInit, OnDestroy {
+
+ camera!: Camera
+
+ groups: CalibrationFrameGroup[] = []
+ group?: CalibrationFrameGroup
+ frame?: CalibrationFrame
+
+ get groupIsEnabled() {
+ return !!this.group && !this.group.frames.find(e => !e.enabled)
+ }
+
+ constructor(
+ private app: AppComponent,
+ private api: ApiService,
+ electron: ElectronService,
+ private route: ActivatedRoute,
+ ) {
+ app.title = 'Calibration'
+
+ app.extra.push({
+ icon: 'mdi mdi-image-plus',
+ tooltip: 'Add file',
+ command: async () => {
+ const path = await electron.openFITS()
+
+ if (path) {
+ this.upload(path)
+ }
+ },
+ })
+
+ app.extra.push({
+ icon: 'mdi mdi-folder-plus',
+ tooltip: 'Add folder',
+ command: async () => {
+ const path = await electron.openDirectory()
+
+ if (path) {
+ this.upload(path)
+ }
+ },
+ })
+ }
+
+ async ngAfterViewInit() {
+ this.route.queryParams.subscribe(async e => {
+ this.camera = JSON.parse(decodeURIComponent(e.data)) as Camera
+ this.app.subTitle = this.camera.name
+ this.load()
+ })
+ }
+
+ @HostListener('window:unload')
+ ngOnDestroy() { }
+
+ private async upload(path: string) {
+ const frames = await this.api.uploadCalibrationFrame(this.camera!, path)
+
+ if (frames.length > 0) {
+ this.load()
+ }
+ }
+
+ private async load() {
+ this.groups = await this.api.calibrationFrames(this.camera)
+ }
+
+ groupSelected() {
+ this.frame = undefined
+ }
+
+ groupChecked(event: CheckboxChangeEvent) {
+ this.group?.frames?.forEach(e => e.enabled = event.checked)
+ }
+
+ async frameChecked(frame: CalibrationFrame, event: CheckboxChangeEvent) {
+ await this.api.editCalibrationFrame(frame)
+ }
+
+ replaceFrame(frame: CalibrationFrame) {
+ console.info(frame)
+ }
+
+ async deleteFrame(frame: CalibrationFrame) {
+ await this.api.deleteCalibrationFrame(frame)
+
+ if (this.frame === frame) {
+ this.frame = undefined
+ }
+
+ let index = this.group?.frames?.findIndex(e => e.id === frame.id) ?? -1
+
+ if (index >= 0) {
+ this.group!.frames.splice(index, 1)
+
+ if (!this.group!.frames.length) {
+ index = this.groups.indexOf(this.group!)
+
+ if (index >= 0) {
+ this.groups.splice(index, 1)
+ this.group = undefined
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/desktop/src/app/camera/camera.component.html b/desktop/src/app/camera/camera.component.html
index 1fd6f26a7..eedad2166 100644
--- a/desktop/src/app/camera/camera.component.html
+++ b/desktop/src/app/camera/camera.component.html
@@ -1,9 +1,8 @@
+
+
+
+
+
+ Type
+ Filter
+ Duration
+ Size
+ Bin
+ T. (°C)
+ Gain
+
+
+
+
+ {{ item.key.type }}
+ {{ item.key.filter ?? '' }}
+ {{ item.key.exposureTime | exposureTime }}
+ {{ item.key.width }}x{{ item.key.height }}
+ {{ item.key.binX }}x{{ item.key.binY }}
+ {{ item.key.temperature }}
+ {{ item.key.gain }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Type
+ Filter
+ Duration
+ Size
+ Bin
+ T. (°C)
+ Gain
+
+
+
+
+
+
+ {{ item.type }}
+ {{ item.filter ?? '' }}
+ {{ item.exposureTime | exposureTime }}
+ {{ item.width }}x{{ item.height }}
+ {{ item.binX }}x{{ item.binY }}
+ {{ item.temperature }}
+ {{ item.gain }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
@@ -13,9 +12,13 @@
-
+
@@ -25,49 +28,54 @@
tooltipPosition="bottom">
-
{{ savePath || capturesPath }}
-
+
{{ waiting ? 'waiting' : capturing ? 'capturing' : 'idle' }}
-
-
+
+
- {{ event.exposureCount }} of {{ event.exposureAmount }}
+ {{ exposure.count }} of {{ capture.amount }}
-
+
- {{ event.exposureCount }}
+ {{ exposure.count }}
- {{ event.exposureRemainingTime | exposureTime }}
+ {{ exposure.remainingTime | exposureTime }}
- {{ event.exposureProgress | percent:'1.1-1' }}
+ {{ exposure.progress | percent:'1.1-1' }}
-
+
+
+
- {{ event.captureRemainingTime | exposureTime }}
+ {{ capture.remainingTime | exposureTime }}
- {{ event.captureProgress | percent:'1.1-1' }}
+ {{ capture.progress | percent:'1.1-1' }}
-
+
- {{ event.captureElapsedTime | exposureTime }}
+ {{ capture.elapsedTime | exposureTime }}
-
+
- {{ event.waitRemainingTime | exposureTime }}
+ {{ wait.remainingTime | exposureTime }}
+
+
+ {{ wait.progress | percent:'1.1-1' }}
@@ -87,11 +95,11 @@
+
+
+ Enabled
+
+
+
+
+
+ Dither in RA only
+
+
+
+
+
-
-
+
-
@@ -16,51 +14,62 @@
- {{ moving ? 'moving' : 'idle' }}
+ {{ moving ? 'moving' : 'idle' }}
+
-
-
-
-
+
+ ()
+ private subscription?: Subscription
constructor(
private app: AppComponent,
private api: ApiService,
private electron: ElectronService,
- private preference: PreferenceService,
+ private storage: LocalStorageService,
+ private remoteStorage: RemoteStorageService,
+ private route: ActivatedRoute,
ngZone: NgZone,
) {
app.title = 'Filter Wheel'
- electron.on('WHEEL_UPDATED', (_, event: FilterWheel) => {
- if (event.name === this.wheel?.name) {
+ electron.on('WHEEL_UPDATED', event => {
+ if (event.device.name === this.wheel?.name) {
ngZone.run(() => {
- Object.assign(this.wheel!, event)
+ Object.assign(this.wheel!, event.device)
this.update()
})
}
})
+
+ this.subscription = this.filterChangedPublisher
+ .pipe(throttleTime(1500))
+ .subscribe((filter) => {
+ this.savePreference()
+ this.electron.send('WHEEL_RENAMED', { wheel: this.wheel!, filter })
+ })
}
async ngAfterContentInit() {
- this.wheels = await this.api.wheels()
+ this.route.queryParams.subscribe(e => {
+ const wheel = JSON.parse(decodeURIComponent(e.data)) as FilterWheel
+ this.wheelChanged(wheel)
+ })
}
@HostListener('window:unload')
- ngOnDestroy() { }
+ ngOnDestroy() {
+ this.subscription?.unsubscribe()
+ }
+
+ async wheelChanged(wheel?: FilterWheel) {
+ this.wheel = wheel
- async wheelChanged() {
if (this.wheel) {
this.app.subTitle = this.wheel.name
@@ -73,12 +95,9 @@ export class FilterWheelComponent implements AfterContentInit, OnDestroy {
this.loadPreference()
this.update()
- this.savePreference()
} else {
this.app.subTitle = ''
}
-
- this.electron.send('WHEEL_CHANGED', this.wheel)
}
connect() {
@@ -89,30 +108,23 @@ export class FilterWheelComponent implements AfterContentInit, OnDestroy {
}
}
- showFilterEdit(filter: FilterSlot, event: Event) {
- filter.editing = true
- event.stopImmediatePropagation()
+ moveTo(filter: Filter) {
+ this.api.wheelMoveTo(this.wheel!, filter.position)
}
- shutterToggled(filter: FilterSlot, event: CheckboxChangeEvent) {
- this.filters.forEach(e => e.dark = e === filter ? e.dark : false)
- this.savePreference()
- event.originalEvent?.stopImmediatePropagation()
+ shutterToggled(filter: Filter, event: InputSwitchChangeEvent) {
+ this.filters.forEach(e => e.dark = event.checked && e === filter)
+ this.filterChangedPublisher.next(filter)
}
- moveTo(filter: FilterSlot) {
- this.api.wheelMoveTo(this.wheel!, filter.position)
+ filterNameChanged(filter: Filter) {
+ if (filter.name) {
+ this.filterChangedPublisher.next(filter)
+ }
}
- applyFilterName(filter: FilterSlot, event: Event) {
- filter.name = filter.newName
-
- this.preference.set(`wheel.${this.wheel!.name}.filterName.${filter.position}`, filter.name)
- this.api.wheelSync(this.wheel!, this.filters.map(e => e.name))
- this.electron.send('WHEEL_RENAMED', this.wheel)
-
- filter.editing = false
- event.stopImmediatePropagation()
+ focusOffsetChanged(filter: Filter) {
+ this.filterChangedPublisher.next(filter)
}
private async update() {
@@ -124,32 +136,51 @@ export class FilterWheelComponent implements AfterContentInit, OnDestroy {
this.moving = this.wheel.moving
this.position = this.wheel.position
+ let filters: Filter[] = []
+
if (this.wheel.count <= 0) {
this.filters = []
+ return
} else if (this.wheel.count !== this.filters.length) {
- this.filters = new Array(this.wheel.count)
+ filters = new Array(this.wheel.count)
+ } else {
+ filters = this.filters
}
- const darkFilter = this.preference.get(`wheel.${this.wheel.name}.shutterPosition`, 0)
+ const preference = this.storage.get(`wheel.${this.wheel.name}`, {})
- for (let i = 1; i <= this.filters.length; i++) {
- const name = this.preference.get(`wheel.${this.wheel.name}.filterName.${i}`, `Filter #${i}`)
- const filter = { position: i, name, editing: false, newName: name, dark: i === darkFilter }
- this.filters[i - 1] = filter
+ for (let position = 1; position <= filters.length; position++) {
+ const name = preference.names?.[position - 1] ?? `Filter #${position}`
+ const offset = preference.offsets?.[position - 1] ?? 0
+ const dark = position === preference.shutterPosition
+ const filter = { position, name, dark, offset }
+ filters[position - 1] = filter
}
+
+ this.filters = filters
+ this.filter = filters[this.position - 1] ?? filters[0]
}
private loadPreference() {
if (this.wheel) {
- const darkFilter = this.preference.get(`wheel.${this.wheel.name}.shutterPosition`, 0)
- this.filters.forEach(e => e.dark = e.position === darkFilter)
+ const preference = this.storage.get(`wheel.${this.wheel.name}`, {})
+ const shutterPosition = preference.shutterPosition ?? 0
+ this.filters.forEach(e => e.dark = e.position === shutterPosition)
}
}
private savePreference() {
if (this.wheel && this.wheel.connected) {
- const darkFilter = this.filters.find(e => e.dark)
- this.preference.set(`wheel.${this.wheel.name}.shutterPosition`, darkFilter?.position || 0)
+ const dark = this.filters.find(e => e.dark)
+
+ const preference: WheelPreference = {
+ shutterPosition: dark?.position ?? 0,
+ names: this.filters.map(e => e.name)
+ }
+
+ this.storage.set(`wheel.${this.wheel.name}`, preference)
+ this.remoteStorage.set(`wheel.${this.wheel.name}.shutterPosition`, preference.shutterPosition)
+ this.api.wheelSync(this.wheel, preference.names!)
}
}
}
\ No newline at end of file
diff --git a/desktop/src/app/focuser/focuser.component.html b/desktop/src/app/focuser/focuser.component.html
index c42d97b56..f3bc285cc 100644
--- a/desktop/src/app/focuser/focuser.component.html
+++ b/desktop/src/app/focuser/focuser.component.html
@@ -1,9 +1,8 @@
@@ -120,54 +135,32 @@
-
-
+
-
\ No newline at end of file
diff --git a/desktop/src/app/filterwheel/filterwheel.component.scss b/desktop/src/app/filterwheel/filterwheel.component.scss
index e69de29bb..fa0ed14c8 100644
--- a/desktop/src/app/filterwheel/filterwheel.component.scss
+++ b/desktop/src/app/filterwheel/filterwheel.component.scss
@@ -0,0 +1,10 @@
+.filter {
+ &.current {
+ border-left: 5px solid #00ffe0;
+ background-color: #38363f;
+ }
+
+ &:not(.current):hover {
+ background-color: #1a1a1a;
+ }
+}
\ No newline at end of file
diff --git a/desktop/src/app/filterwheel/filterwheel.component.ts b/desktop/src/app/filterwheel/filterwheel.component.ts
index 37139cc0e..1ec686822 100644
--- a/desktop/src/app/filterwheel/filterwheel.component.ts
+++ b/desktop/src/app/filterwheel/filterwheel.component.ts
@@ -1,17 +1,25 @@
import { AfterContentInit, Component, HostListener, NgZone, OnDestroy } from '@angular/core'
-import { CheckboxChangeEvent } from 'primeng/checkbox'
+import { ActivatedRoute } from '@angular/router'
+import { InputSwitchChangeEvent } from 'primeng/inputswitch'
+import { Subject, Subscription, throttleTime } from 'rxjs'
import { ApiService } from '../../shared/services/api.service'
import { ElectronService } from '../../shared/services/electron.service'
-import { PreferenceService } from '../../shared/services/preference.service'
+import { LocalStorageService } from '../../shared/services/local-storage.service'
+import { RemoteStorageService } from '../../shared/services/preference.service'
import { FilterWheel } from '../../shared/types'
import { AppComponent } from '../app.component'
-export interface FilterSlot {
+export interface WheelPreference {
+ shutterPosition?: number
+ names?: string[]
+ offsets?: number[]
+}
+
+export interface Filter {
position: number
name: string
- editing: boolean
- newName: string
dark: boolean
+ offset: number
}
@Component({
@@ -21,50 +29,64 @@ export interface FilterSlot {
})
export class FilterWheelComponent implements AfterContentInit, OnDestroy {
- wheels: FilterWheel[] = []
wheel?: FilterWheel
connected = false
moving = false
position = 0
+ filters: Filter[] = []
+ filter?: Filter
- filters: FilterSlot[] = []
-
- get selectedFilter() {
+ get selectedFilter(): Filter | undefined {
return this.filters[this.position - 1]
}
- set selectedFilter(value: FilterSlot) {
- this.moveTo(value)
- }
+ private readonly filterChangedPublisher = new Subject
- {{ item.name }}
-
+
-
+
+
+
-
-
- {{ item.name }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Shutter
+
- (
- type: 'CAMERA' | 'MOUNT' | 'FOCUSER' | 'WHEEL',
- onAdd: (device: T) => number,
- onRemove: (device: T) => number,
+ readonly deviceModel: MenuItem[] = []
+
+ readonly imageModel: MenuItem[] = [
+ {
+ icon: 'mdi mdi-image-plus',
+ label: 'Open new image',
+ command: () => {
+ this.openImage(true)
+ }
+ }
+ ]
+
+ private startListening(
+ type: K,
+ onAdd: (device: MappedDevice[K]) => number,
+ onRemove: (device: MappedDevice[K]) => number,
) {
- this.electron.on(`${type}_ATTACHED`, (_, device: T) => {
+ this.electron.on(`${type}_ATTACHED`, event => {
this.ngZone.run(() => {
- if (onAdd(device) === 1) {
- this.electron.send(`${type}_CHANGED`, device)
- }
+ onAdd(event.device as any)
})
})
- this.electron.on(`${type}_DETACHED`, (_, device: T) => {
+ this.electron.on(`${type}_DETACHED`, event => {
this.ngZone.run(() => {
- if (onRemove(device) === 0) {
- this.electron.send(`${type}_CHANGED`, undefined)
- }
+ onRemove(event.device as any)
})
})
}
@@ -99,12 +127,12 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
private browserWindow: BrowserWindowService,
private api: ApiService,
private message: MessageService,
- private preference: PreferenceService,
+ private storage: LocalStorageService,
private ngZone: NgZone,
) {
app.title = 'Nebulosa'
- this.startListening('CAMERA',
+ this.startListening('CAMERA',
(device) => {
return this.cameras.push(device)
},
@@ -114,7 +142,7 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
},
)
- this.startListening('MOUNT',
+ this.startListening('MOUNT',
(device) => {
return this.mounts.push(device)
},
@@ -124,7 +152,7 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
},
)
- this.startListening('FOCUSER',
+ this.startListening('FOCUSER',
(device) => {
return this.focusers.push(device)
},
@@ -134,7 +162,7 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
},
)
- this.startListening('WHEEL',
+ this.startListening('WHEEL',
(device) => {
return this.wheels.push(device)
},
@@ -143,34 +171,22 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
return this.wheels.length
},
)
+
+ electron.on('SKY_ATLAS_UPDATE_FINISHED', () => this.open('SKY_ATLAS'))
}
async ngAfterContentInit() {
this.updateConnection()
- this.host = this.preference.get('home.host', 'localhost')
- this.port = this.preference.get('home.port', 7624)
+ const preference = this.storage.get('home', {})
+
+ this.host = preference.host ?? 'localhost'
+ this.port = preference.port ?? 7624
this.cameras = await this.api.cameras()
this.mounts = await this.api.mounts()
this.focusers = await this.api.focusers()
this.wheels = await this.api.wheels()
-
- 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.wheels.length > 0) {
- this.electron.send('WHEEL_CHANGED', this.wheels[0])
- }
}
@HostListener('window:unload')
@@ -183,8 +199,12 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
} else {
await this.api.connect(this.host || 'localhost', this.port)
- this.preference.set('home.host', this.host)
- this.preference.set('home.port', this.port)
+ const preference: HomePreference = {
+ host: this.host,
+ port: this.port,
+ }
+
+ this.storage.set('home', preference)
}
} catch (e) {
console.error(e)
@@ -195,38 +215,92 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
}
}
- async open(type: HomeWindowType) {
+ private openDevice(type: K) {
+ this.deviceModel.length = 0
+
+ const devices: Device[] = type === 'CAMERA' ? this.cameras
+ : type === 'MOUNT' ? this.mounts
+ : type === 'FOCUSER' ? this.focusers
+ : type === 'WHEEL' ? this.wheels
+ : []
+
+ if (devices.length === 0) return
+ if (devices.length === 1) return this.openDeviceWindow(type, devices[0] as any)
+
+ for (const device of devices) {
+ this.deviceModel.push({
+ icon: 'mdi mdi-connection',
+ label: device.name,
+ command: () => {
+ this.openDeviceWindow(type, device as any)
+ }
+ })
+ }
+
+ this.deviceMenu.show()
+ }
+
+ private openDeviceWindow(type: K, device: MappedDevice[K]) {
switch (type) {
case 'MOUNT':
- this.browserWindow.openMount({ bringToFront: true })
+ this.browserWindow.openMount({ bringToFront: true, data: device as Mount })
break
case 'CAMERA':
- this.browserWindow.openCamera({ bringToFront: true })
+ this.browserWindow.openCamera({ bringToFront: true, data: device as Camera })
break
case 'FOCUSER':
- this.browserWindow.openFocuser({ bringToFront: true })
+ this.browserWindow.openFocuser({ bringToFront: true, data: device as Focuser })
break
case 'WHEEL':
- this.browserWindow.openWheel({ bringToFront: true })
+ this.browserWindow.openWheel({ bringToFront: true, data: device as FilterWheel })
+ break
+ }
+ }
+
+ private async openImage(force: boolean = false) {
+ if (force || this.cameras.length === 0) {
+ const path = await this.electron.openFITS()
+
+ if (path) {
+ this.browserWindow.openImage({ path, source: 'PATH' })
+ }
+ } else {
+ const camera = await this.imageMenu.show(this.cameras)
+
+ if (camera) {
+ this.browserWindow.openCameraImage(camera)
+ }
+ }
+ }
+
+ open(type: HomeWindowType) {
+ switch (type) {
+ case 'MOUNT':
+ case 'CAMERA':
+ case 'FOCUSER':
+ case 'WHEEL':
+ this.openDevice(type)
break
case 'GUIDER':
this.browserWindow.openGuider({ bringToFront: true })
break
- case 'ATLAS':
+ case 'SKY_ATLAS':
this.browserWindow.openSkyAtlas({ bringToFront: true })
break
case 'FRAMING':
- this.browserWindow.openFraming(undefined, { bringToFront: true })
+ this.browserWindow.openFraming({ bringToFront: true, data: undefined })
break
case 'ALIGNMENT':
this.browserWindow.openAlignment({ bringToFront: true })
break
case 'INDI':
- this.browserWindow.openINDI(undefined, { bringToFront: true })
+ this.browserWindow.openINDI({ data: undefined, bringToFront: true })
break
case 'IMAGE':
- const path = await this.electron.sendSync('OPEN_FITS')
- if (path) this.browserWindow.openImage(path, undefined, 'PATH')
+ this.openImage()
+ break
+ case 'SETTINGS':
+ this.browserWindow.openSettings()
break
case 'ABOUT':
this.browserWindow.openAbout()
diff --git a/desktop/src/app/image/image.component.html b/desktop/src/app/image/image.component.html
index 4c92fec08..adb915555 100644
--- a/desktop/src/app/image/image.component.html
+++ b/desktop/src/app/image/image.component.html
@@ -1,6 +1,6 @@
![]()
+ class="select-none pixelated" (mousemove)="imageMouseMoved($event)" [class.cursor-crosshair]="isMouseCoordinateVisible" />
-
+ (`focuser.${this.focuser.name}`, {})
+ this.stepsRelative = preference.stepsRelative ?? 100
+ this.stepsAbsolute = preference.stepsAbsolute ?? this.focuser.position
}
}
private savePreference() {
if (this.focuser && this.focuser.connected) {
- this.preference.set(`focuser.${this.focuser.name}.stepsRelative`, this.stepsRelative)
- this.preference.set(`focuser.${this.focuser.name}.stepsAbsolute`, this.stepsAbsolute)
+ const preference: FocuserPreference = {
+ stepsRelative: this.stepsRelative,
+ stepsAbsolute: this.stepsAbsolute,
+ }
+
+ this.storage.set(`focuser.${this.focuser.name}`, preference)
}
}
}
\ No newline at end of file
diff --git a/desktop/src/app/framing/framing.component.html b/desktop/src/app/framing/framing.component.html
index 5f5242f5e..c3dc665b3 100644
--- a/desktop/src/app/framing/framing.component.html
+++ b/desktop/src/app/framing/framing.component.html
@@ -1,4 +1,4 @@
-
+
+
-
diff --git a/desktop/src/app/focuser/focuser.component.ts b/desktop/src/app/focuser/focuser.component.ts
index dc52ed55d..666b8fd6a 100644
--- a/desktop/src/app/focuser/focuser.component.ts
+++ b/desktop/src/app/focuser/focuser.component.ts
@@ -1,10 +1,16 @@
import { AfterViewInit, Component, HostListener, NgZone, OnDestroy } from '@angular/core'
+import { ActivatedRoute } from '@angular/router'
import { ApiService } from '../../shared/services/api.service'
import { ElectronService } from '../../shared/services/electron.service'
-import { PreferenceService } from '../../shared/services/preference.service'
+import { LocalStorageService } from '../../shared/services/local-storage.service'
import { Focuser } from '../../shared/types'
import { AppComponent } from '../app.component'
+export interface FocuserPreference {
+ stepsRelative?: number
+ stepsAbsolute?: number
+}
+
@Component({
selector: 'app-focuser',
templateUrl: './focuser.component.html',
@@ -12,7 +18,6 @@ import { AppComponent } from '../app.component'
})
export class FocuserComponent implements AfterViewInit, OnDestroy {
- focusers: Focuser[] = []
focuser?: Focuser
connected = false
@@ -36,15 +41,16 @@ export class FocuserComponent implements AfterViewInit, OnDestroy {
private app: AppComponent,
private api: ApiService,
private electron: ElectronService,
- private preference: PreferenceService,
+ private storage: LocalStorageService,
+ private route: ActivatedRoute,
ngZone: NgZone,
) {
app.title = 'Focuser'
- electron.on('FOCUSER_UPDATED', (_, event: Focuser) => {
- if (event.name === this.focuser?.name) {
+ electron.on('FOCUSER_UPDATED', event => {
+ if (event.device.name === this.focuser?.name) {
ngZone.run(() => {
- Object.assign(this.focuser!, event)
+ Object.assign(this.focuser!, event.device)
this.update()
})
}
@@ -52,13 +58,20 @@ export class FocuserComponent implements AfterViewInit, OnDestroy {
}
async ngAfterViewInit() {
- this.focusers = await this.api.focusers()
+ this.route.queryParams.subscribe(e => {
+ const focuser = JSON.parse(decodeURIComponent(e.data)) as Focuser
+ this.focuserChanged(focuser)
+ })
}
@HostListener('window:unload')
- ngOnDestroy() { }
+ ngOnDestroy() {
+ this.abort()
+ }
+
+ async focuserChanged(focuser?: Focuser) {
+ this.focuser = focuser
- async focuserChanged() {
if (this.focuser) {
this.app.subTitle = this.focuser.name
@@ -67,12 +80,9 @@ export class FocuserComponent implements AfterViewInit, OnDestroy {
this.loadPreference()
this.update()
- this.savePreference()
} else {
this.app.subTitle = ''
}
-
- this.electron.send('FOCUSER_CHANGED', this.focuser)
}
connect() {
@@ -132,15 +142,20 @@ export class FocuserComponent implements AfterViewInit, OnDestroy {
private loadPreference() {
if (this.focuser) {
- this.stepsRelative = this.preference.get(`focuser.${this.focuser.name}.stepsRelative`, 0)
- this.stepsAbsolute = this.preference.get(`focuser.${this.focuser.name}.stepsAbsolute`, 0)
+ const preference = this.storage.get
+
('framing', {})
+
+ this.rightAscension = preference.rightAscension ?? '00h00m00s'
+ this.declination = preference.declination ?? `+00°00'00"`
+ this.width = preference.width ?? 1280
+ this.height = preference.height ?? 720
+ this.fov = preference.fov ?? 1
+ this.rotation = preference.rotation ?? 0
+ this.hipsSurvey ??= preference.hipsSurvey ?? this.hipsSurvey
}
private savePreference() {
- this.preference.set('framing.rightAscension', this.rightAscension)
- this.preference.set('framing.declination', this.declination)
- this.preference.set('framing.width', this.width)
- this.preference.set('framing.height', this.height)
- this.preference.set('framing.fov', this.fov)
- this.preference.set('framing.rotation', this.rotation)
- this.preference.set('framing.hipsSurvey', this.hipsSurvey)
+ const preference: FramingPreference = {
+ rightAscension: this.rightAscension,
+ declination: this.declination,
+ width: this.width,
+ height: this.height,
+ fov: this.fov,
+ rotation: this.rotation,
+ hipsSurvey: this.hipsSurvey,
+ }
+
+ this.storage.set('framing', preference)
}
private async closeFrameImage() {
diff --git a/desktop/src/app/guider/guider.component.html b/desktop/src/app/guider/guider.component.html
index ccd0f094b..a5767177b 100644
--- a/desktop/src/app/guider/guider.component.html
+++ b/desktop/src/app/guider/guider.component.html
@@ -5,110 +5,70 @@
-
-
+
+
diff --git a/desktop/src/app/guider/guider.component.ts b/desktop/src/app/guider/guider.component.ts
index 929b4425b..e0d3b88a6 100644
--- a/desktop/src/app/guider/guider.component.ts
+++ b/desktop/src/app/guider/guider.component.ts
@@ -3,14 +3,14 @@ import { Title } from '@angular/platform-browser'
import { ChartData, ChartOptions } from 'chart.js'
import { UIChart } from 'primeng/chart'
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 { GuideDirection, GuideOutput, GuideStar, GuideState, GuideStep, GuiderStatus, HistoryStep } from '../../shared/types'
+import { GuideDirection, GuideOutput, GuideState, GuideStep, Guider, GuiderPlotMode, GuiderYAxisUnit, HistoryStep } from '../../shared/types'
-export type PlotMode = 'RA/DEC' | 'DX/DY'
-
-export type YAxisUnit = 'ARCSEC' | 'PIXEL'
+export interface GuiderPreference {
+ settleAmount?: number
+ settleTime?: number
+ settleTimeout?: number
+}
@Component({
selector: 'app-guider',
@@ -29,47 +29,46 @@ export class GuiderComponent implements AfterViewInit, OnDestroy {
guideWestDuration = 1000
guideEastDuration = 1000
- phdConnected = false
- phdHost = 'localhost'
- phdPort = 4400
- phdState: GuideState = 'STOPPED'
- phdGuideStep?: GuideStep
- phdMessage = ''
-
- phdDitherPixels = 5
- phdDitherRAOnly = false
- phdSettleAmount = 1.5
- phdSettleTime = 10
- phdSettleTimeout = 30
+ connected = false
+ host = 'localhost'
+ port = 4400
+ guideState: GuideState = 'STOPPED'
+ guideStep?: GuideStep
+ message = ''
+
+ settleAmount = 1.5
+ settleTime = 10
+ settleTimeout = 30
readonly phdGuideHistory: HistoryStep[] = []
private phdDurationScale = 1.0
- phdPixelScale = 1.0
- phdRmsRA = 0.0
- phdRmsDEC = 0.0
- phdRmsTotal = 0.0
+ pixelScale = 1.0
+ rmsRA = 0.0
+ rmsDEC = 0.0
+ rmsTotal = 0.0
- readonly plotModes: PlotMode[] = ['RA/DEC', 'DX/DY']
- plotMode: PlotMode = 'RA/DEC'
- readonly yAxisUnits: YAxisUnit[] = ['ARCSEC', 'PIXEL']
- yAxisUnit: YAxisUnit = 'ARCSEC'
+ readonly plotModes: GuiderPlotMode[] = ['RA/DEC', 'DX/DY']
+ plotMode = this.plotModes[0]
- @ViewChild('phdChart')
- private readonly phdChart!: UIChart
+ readonly yAxisUnits: GuiderYAxisUnit[] = ['ARCSEC', 'PIXEL']
+ yAxisUnit = this.yAxisUnits[0]
+
+ @ViewChild('chart')
+ private readonly chart!: UIChart
get stopped() {
- return this.phdState === 'STOPPED'
+ return this.guideState === 'STOPPED'
}
get looping() {
- return this.phdState === 'LOOPING'
+ return this.guideState === 'LOOPING'
}
get guiding() {
- return this.phdState === 'GUIDING'
+ return this.guideState === 'GUIDING'
}
- readonly phdChartData: ChartData = {
+ readonly chartData: ChartData = {
labels: Array.from({ length: 100 }, (_, i) => `${i}`),
datasets: [
// RA.
@@ -107,7 +106,7 @@ export class GuiderComponent implements AfterViewInit, OnDestroy {
]
}
- readonly phdChartOptions: ChartOptions = {
+ readonly chartOptions: ChartOptions = {
responsive: true,
plugins: {
legend: {
@@ -216,83 +215,83 @@ export class GuiderComponent implements AfterViewInit, OnDestroy {
constructor(
title: Title,
private api: ApiService,
- private browserWindow: BrowserWindowService,
- private electron: ElectronService,
- private preference: PreferenceService,
+ electron: ElectronService,
ngZone: NgZone,
) {
title.setTitle('Guider')
api.startListening('GUIDING')
- electron.on('GUIDE_OUTPUT_UPDATED', (_, event: GuideOutput) => {
- if (event.name === this.guideOutput?.name) {
+ electron.on('GUIDE_OUTPUT_UPDATED', event => {
+ if (event.device.name === this.guideOutput?.name) {
ngZone.run(() => {
- Object.assign(this.guideOutput!, event)
+ Object.assign(this.guideOutput!, event.device)
this.update()
})
}
})
- electron.on('GUIDE_OUTPUT_ATTACHED', (_, event: GuideOutput) => {
+ electron.on('GUIDE_OUTPUT_ATTACHED', event => {
ngZone.run(() => {
- this.guideOutputs.push(event)
+ this.guideOutputs.push(event.device)
})
})
- electron.on('GUIDE_OUTPUT_DETACHED', (_, event: GuideOutput) => {
+ electron.on('GUIDE_OUTPUT_DETACHED', event => {
ngZone.run(() => {
- const index = this.guideOutputs.findIndex(e => e.name === event.name)
+ const index = this.guideOutputs.findIndex(e => e.name === event.device.name)
if (index >= 0) this.guideOutputs.splice(index, 1)
})
})
electron.on('GUIDER_CONNECTED', () => {
ngZone.run(() => {
- this.phdConnected = true
+ this.connected = true
})
})
electron.on('GUIDER_DISCONNECTED', () => {
ngZone.run(() => {
- this.phdConnected = false
+ this.connected = false
})
})
- electron.on('GUIDER_UPDATED', (_, event: GuiderStatus) => {
+ electron.on('GUIDER_UPDATED', event => {
ngZone.run(() => {
- this.processGuiderStatus(event)
+ this.processGuiderStatus(event.data)
})
})
- electron.on('GUIDER_STEPPED', (_, event: HistoryStep | GuideStar) => {
+ electron.on('GUIDER_STEPPED', event => {
ngZone.run(() => {
- if ("id" in event) {
- if (this.phdGuideHistory.length >= 100) {
- this.phdGuideHistory.splice(0, 1)
- }
-
- this.phdGuideHistory.push(event)
- this.updateGuideHistoryChart()
+ if (this.phdGuideHistory.length >= 100) {
+ this.phdGuideHistory.splice(0, this.phdGuideHistory.length - 99)
}
- if ("guideStep" in event && event.guideStep) {
- this.phdGuideStep = event.guideStep
+ this.phdGuideHistory.push(event.data)
+ this.updateGuideHistoryChart()
+
+ if (event.data.guideStep) {
+ this.guideStep = event.data.guideStep
+ } else {
+ // Dithering.
}
})
})
- electron.on('GUIDER_MESSAGE_RECEIVED', (_, event: { message: string }) => {
+ electron.on('GUIDER_MESSAGE_RECEIVED', event => {
ngZone.run(() => {
- this.phdMessage = event.message
+ this.message = event.data
})
})
}
async ngAfterViewInit() {
- this.phdSettleAmount = this.preference.get('guiding.settleAmount', 1.5)
- this.phdSettleTime = this.preference.get('guiding.settleTime', 10)
- this.phdSettleTimeout = this.preference.get('guiding.settleTimeout', 30)
+ const settle = await this.api.getGuidingSettle()
+
+ this.settleAmount = settle.amount ?? 1.5
+ this.settleTime = settle.time ?? 10
+ this.settleTimeout = settle.timeout ?? 30
this.guideOutputs = await this.api.guideOutputs()
@@ -309,10 +308,10 @@ export class GuiderComponent implements AfterViewInit, OnDestroy {
this.api.stopListening('GUIDING')
}
- private processGuiderStatus(event: GuiderStatus) {
- this.phdConnected = event.connected
- this.phdState = event.state
- this.phdPixelScale = event.pixelScale
+ private processGuiderStatus(event: Guider) {
+ this.connected = event.connected
+ this.guideState = event.state
+ this.pixelScale = event.pixelScale
}
plotModeChanged() {
@@ -326,16 +325,16 @@ export class GuiderComponent implements AfterViewInit, OnDestroy {
private updateGuideHistoryChart() {
if (this.phdGuideHistory.length > 0) {
const history = this.phdGuideHistory[this.phdGuideHistory.length - 1]
- this.phdRmsTotal = history.rmsTotal
- this.phdRmsDEC = history.rmsDEC
- this.phdRmsRA = history.rmsRA
+ this.rmsTotal = history.rmsTotal
+ this.rmsDEC = history.rmsDEC
+ this.rmsRA = history.rmsRA
} else {
return
}
const startId = this.phdGuideHistory[0].id
const guideSteps = this.phdGuideHistory.filter(e => e.guideStep)
- const scale = this.yAxisUnit === 'ARCSEC' ? this.phdPixelScale : 1.0
+ const scale = this.yAxisUnit === 'ARCSEC' ? this.pixelScale : 1.0
let maxDuration = 0
@@ -347,14 +346,14 @@ export class GuiderComponent implements AfterViewInit, OnDestroy {
this.phdDurationScale = maxDuration / 16.0
if (this.plotMode === 'RA/DEC') {
- this.phdChartData.datasets[0].data = guideSteps
+ this.chartData.datasets[0].data = guideSteps
.map(e => [e.id - startId, -e.guideStep!.raDistance * scale])
- this.phdChartData.datasets[1].data = guideSteps
+ this.chartData.datasets[1].data = guideSteps
.map(e => [e.id - startId, e.guideStep!.decDistance * scale])
} else {
- this.phdChartData.datasets[0].data = guideSteps
+ this.chartData.datasets[0].data = guideSteps
.map(e => [e.id - startId, -e.guideStep!.dx * scale])
- this.phdChartData.datasets[1].data = guideSteps
+ this.chartData.datasets[1].data = guideSteps
.map(e => [e.id - startId, e.guideStep!.dy * scale])
}
@@ -362,12 +361,12 @@ export class GuiderComponent implements AfterViewInit, OnDestroy {
return !direction || direction === 'NORTH' || direction === 'WEST' ? this.phdDurationScale : -this.phdDurationScale
}
- this.phdChartData.datasets[2].data = this.phdGuideHistory
+ this.chartData.datasets[2].data = this.phdGuideHistory
.map(e => (e.guideStep?.raDuration ?? 0) / durationScale(e.guideStep?.raDirection))
- this.phdChartData.datasets[3].data = this.phdGuideHistory
+ this.chartData.datasets[3].data = this.phdGuideHistory
.map(e => (e.guideStep?.decDuration ?? 0) / durationScale(e.guideStep?.decDirection))
- this.phdChart?.refresh()
+ this.chart?.refresh()
}
async guideOutputChanged() {
@@ -377,8 +376,6 @@ export class GuiderComponent implements AfterViewInit, OnDestroy {
this.update()
}
-
- this.electron.send('GUIDE_OUTPUT_CHANGED', this.guideOutput)
}
connectGuideOutput() {
@@ -393,16 +390,16 @@ export class GuiderComponent implements AfterViewInit, OnDestroy {
for (const direction of directions) {
switch (direction) {
case 'NORTH':
- this.api.guideOutputPulse(this.guideOutput!, direction, this.guideNorthDuration)
+ this.api.guideOutputPulse(this.guideOutput!, direction, this.guideNorthDuration * 1000)
break
case 'SOUTH':
- this.api.guideOutputPulse(this.guideOutput!, direction, this.guideSouthDuration)
+ this.api.guideOutputPulse(this.guideOutput!, direction, this.guideSouthDuration * 1000)
break
case 'WEST':
- this.api.guideOutputPulse(this.guideOutput!, direction, this.guideWestDuration)
+ this.api.guideOutputPulse(this.guideOutput!, direction, this.guideWestDuration * 1000)
break
case 'EAST':
- this.api.guideOutputPulse(this.guideOutput!, direction, this.guideEastDuration)
+ this.api.guideOutputPulse(this.guideOutput!, direction, this.guideEastDuration * 1000)
break
}
}
@@ -416,10 +413,10 @@ export class GuiderComponent implements AfterViewInit, OnDestroy {
}
guidingConnect() {
- if (this.phdConnected) {
+ if (this.connected) {
this.api.guidingDisconnect()
} else {
- this.api.guidingConnect(this.phdHost, this.phdPort)
+ this.api.guidingConnect(this.host, this.port)
}
}
@@ -428,11 +425,8 @@ export class GuiderComponent implements AfterViewInit, OnDestroy {
await this.api.guidingStart(event.shiftKey)
}
- async guidingSettleChanged() {
- await this.api.guidingSettle(this.phdSettleAmount, this.phdSettleTime, this.phdSettleTimeout)
- this.preference.set('guiding.settleAmount', this.phdSettleAmount)
- this.preference.set('guiding.settleTime', this.phdSettleTime)
- this.preference.set('guiding.settleTimeout', this.phdSettleTimeout)
+ async settleChanged() {
+ await this.api.setGuidingSettle({ amount: this.settleAmount, time: this.settleTime, timeout: this.settleTimeout })
}
guidingClearHistory() {
diff --git a/desktop/src/app/home/home.component.html b/desktop/src/app/home/home.component.html
index a6c96703d..34efe5ad5 100644
--- a/desktop/src/app/home/home.component.html
+++ b/desktop/src/app/home/home.component.html
@@ -19,101 +19,112 @@
-
@@ -27,15 +27,15 @@
-
-
+
-
-
- {{ phdState | enum | lowercase }}
- {{ phdMessage }}
+ {{ guideState | enum | lowercase }}
+ {{ message }}
-
-
-
-
-
- Dither in RA only
-
-
-
-
-
-
-
-
-
-
-
+ value="{{ rmsRA.toFixed(2) + ' (' + (rmsRA * pixelScale).toFixed(2) + '\" )' }}" />
+ value="{{ rmsDEC.toFixed(2) + ' (' + (rmsDEC * pixelScale).toFixed(2) + '\" )' }}" />
+ value="{{ rmsTotal.toFixed(2) + ' (' + (rmsTotal * pixelScale).toFixed(2) + '\" )' }}" />
-
+
-
+
-
+
@@ -129,20 +89,49 @@
-
North
East
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
\ No newline at end of file
+
-
+
Camera
-
+
Mount
-
+
Guider
-
+
Filter Wheel
-
+
Focuser
-
+
Dome
-
+
Rotator
-
+
Switch
-
+
Sky Atlas
-
+
Alignment
-
+
Sequencer
-
+
Image Viewer
-
+
Framing
-
+
INDI
-
+
+ 
+
+
+
+ Settings
+
+
About
-
@@ -195,7 +188,7 @@
-
-
-
- Blind
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
@@ -215,61 +208,63 @@
-
+
+
-
+ annotationIsVisible = false
+
+ detectedStars: DetectedStar[] = []
+ detectedStarsIsVisible = false
showFITSHeadersDialog = false
fitsHeaders: FITSHeaderItem[] = []
@@ -94,7 +103,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
private imageInfo?: ImageInfo
private imageMouseX = 0
private imageMouseY = 0
- private imageParams: ImageParams = {}
+ private imageData: ImageData = {}
roiX = 0
roiY = 0
@@ -102,6 +111,48 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
roiHeight = 128
roiInteractable?: Interactable
+ private readonly saveAsMenuItem: MenuItem = {
+ label: 'Save as...',
+ icon: 'mdi mdi-content-save',
+ command: async () => {
+ const path = await this.electron.send('SAVE_FITS_AS')
+ if (path) this.api.saveImageAs(this.imageData.path!, path)
+ },
+ }
+
+ private readonly plateSolveMenuItem: MenuItem = {
+ label: 'Plate Solve',
+ icon: 'mdi mdi-sigma',
+ command: () => {
+ this.showSolverDialog = true
+ },
+ }
+
+ private readonly stretchMenuItem: MenuItem = {
+ label: 'Stretch',
+ icon: 'mdi mdi-chart-histogram',
+ command: () => {
+ this.showStretchingDialog = true
+ },
+ }
+
+ private readonly autoStretchMenuItem: CheckableMenuItem = {
+ id: 'auto-stretch-menuitem',
+ label: 'Auto stretch',
+ icon: 'mdi mdi-auto-fix',
+ checked: true,
+ command: () => {
+ this.autoStretched = !this.autoStretched
+ this.autoStretchMenuItem.checked = this.autoStretched
+
+ if (!this.autoStretched) {
+ this.resetStretch()
+ } else {
+ this.loadImage()
+ }
+ },
+ }
+
private readonly scnrMenuItem: MenuItem = {
label: 'SCNR',
icon: 'mdi mdi-palette',
@@ -111,209 +162,227 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
},
}
- private readonly pointMountHereMenuItem: MenuItem = {
- label: 'Point mount here',
- icon: 'mdi mdi-telescope',
- disabled: true,
- command: async () => {
- const mount = await this.electron.selectedMount()
- if (!mount?.connected) return
- this.api.pointMountHere(mount, this.imageParams.path!, this.imageMouseX, this.imageMouseY, !this.solved)
+ private readonly horizontalMirrorMenuItem: CheckableMenuItem = {
+ label: 'Horizontal mirror',
+ icon: 'mdi mdi-flip-horizontal',
+ checked: false,
+ command: () => {
+ this.mirrorHorizontal = !this.mirrorHorizontal
+ this.horizontalMirrorMenuItem.checked = this.mirrorHorizontal
+ this.loadImage()
},
}
- private readonly annotationMenuItem: MenuItem = {
- label: 'Annotation',
- icon: 'mdi mdi-format-color-text',
- disabled: true,
+ private readonly verticalMirrorMenuItem: CheckableMenuItem = {
+ label: 'Vertical mirror',
+ icon: 'mdi mdi-flip-vertical',
+ checked: false,
command: () => {
- this.showAnnotationDialog = true
+ this.mirrorVertical = !this.mirrorVertical
+ this.verticalMirrorMenuItem.checked = this.mirrorVertical
+ this.loadImage()
},
}
- readonly menuItems: MenuItem[] = [
- {
- label: 'Save as...',
- icon: 'mdi mdi-content-save',
- command: async () => {
- const path = await this.electron.sendSync('SAVE_FITS_AS')
- if (path) this.api.saveImageAs(this.imageParams.path!, path)
- },
- },
- {
- separator: true,
- },
- {
- label: 'Plate Solve',
- icon: 'mdi mdi-sigma',
- command: () => {
- this.showSolverDialog = true
- },
- },
- {
- separator: true,
+ private readonly invertMenuItem: CheckableMenuItem = {
+ label: 'Invert',
+ icon: 'mdi mdi-invert-colors',
+ checked: false,
+ command: () => {
+ this.invert = !this.invert
+ this.invertMenuItem.checked = this.invert
+ this.loadImage()
},
- {
- label: 'Stretch',
- icon: 'mdi mdi-chart-histogram',
- command: () => {
- this.showStretchingDialog = true
- },
+ }
+
+ private readonly calibrateMenuItem: CheckableMenuItem = {
+ label: 'Calibrate',
+ icon: 'mdi mdi-tools',
+ checked: true,
+ command: () => {
+ this.calibrate = !this.calibrate
+ this.calibrateMenuItem.checked = this.calibrate
+ this.loadImage()
},
- {
- id: 'auto-stretch-menuitem',
- label: 'Auto stretch',
- icon: 'mdi mdi-chart-histogram',
- styleClass: 'p-menuitem-checked',
- command: (e) => {
- this.autoStretch = !this.autoStretch
- this.checkMenuItem(e.item, this.autoStretch)
-
- if (!this.autoStretch) {
- this.resetStretch()
- } else {
- this.loadImage()
- }
- },
+ }
+
+ private readonly fitsHeaderMenuItem: MenuItem = {
+ icon: 'mdi mdi-list-box',
+ label: 'FITS Header',
+ command: () => {
+ this.showFITSHeadersDialog = true
},
- this.scnrMenuItem,
- {
- label: 'Horizontal mirror',
- icon: 'mdi mdi-flip-horizontal',
- command: (e) => {
- this.mirrorHorizontal = !this.mirrorHorizontal
- this.checkMenuItem(e.item, this.mirrorHorizontal)
- this.loadImage()
- },
+ }
+
+ private readonly pointMountHereMenuItem: MenuItem = {
+ label: 'Point mount here',
+ icon: 'mdi mdi-telescope',
+ disabled: true,
+ command: () => {
+ this.executeMount((mount) => {
+ this.api.pointMountHere(mount, this.imageData.path!, this.imageMouseX, this.imageMouseY, !this.solved)
+ })
},
- {
- label: 'Vertical mirror',
- icon: 'mdi mdi-flip-vertical',
- command: (e) => {
- this.mirrorVertical = !this.mirrorVertical
- this.checkMenuItem(e.item, this.mirrorVertical)
- this.loadImage()
- },
+ }
+
+ private readonly crosshairMenuItem: CheckableMenuItem = {
+ label: 'Crosshair',
+ icon: 'mdi mdi-bullseye',
+ checked: false,
+ command: () => {
+ this.crossHair = !this.crossHair
+ this.crosshairMenuItem.checked = this.crossHair
},
- {
- label: 'Invert',
- icon: 'mdi mdi-invert-colors',
- command: (e) => {
- this.invert = !this.invert
- this.checkMenuItem(e.item, this.invert)
- this.loadImage()
- },
+ }
+
+ private readonly annotationMenuItem: ToggleableMenuItem = {
+ label: 'Annotate',
+ icon: 'mdi mdi-marker',
+ disabled: true,
+ toggleable: true,
+ toggled: false,
+ command: () => {
+ this.showAnnotationDialog = true
},
- {
- separator: true,
+ toggle: (event) => {
+ event.originalEvent?.stopImmediatePropagation()
+ this.annotationIsVisible = event.checked
},
- {
- label: 'Overlay',
- icon: 'mdi mdi-layer',
- items: [
- {
- label: 'Crosshair',
- icon: 'mdi mdi-bullseye',
- command: (e) => {
- this.crossHair = !this.crossHair
- this.checkMenuItem(e.item, this.crossHair)
- },
- },
- this.annotationMenuItem,
- {
- label: 'ROI',
- icon: 'mdi mdi-select',
- command: (e) => {
- if (this.roiInteractable) {
- this.roiInteractable.unset()
- this.roiInteractable = undefined
- } else {
- this.roiInteractable = interact(this.roi.nativeElement)
- .origin({ x: 0, y: 0 })
- .resizable({
- edges: { left: true, right: true, bottom: true, top: true },
- inertia: true,
- listeners: { move: (event: any) => this.roiResizableMove(event) },
- modifiers: [
- interact.modifiers.restrictEdges({
- outer: 'parent',
- }),
- interact.modifiers.restrictSize({
- min: { width: 8, height: 8 },
- })
- ],
- })
- .draggable({
- listeners: { move: (event: any) => this.roiDraggableMove(event) },
- inertia: true,
- modifiers: [
- interact.modifiers.restrictRect({
- restriction: 'parent',
- endOnly: true,
- }),
- ]
- })
- }
-
- this.checkMenuItem(e.item, !!this.roiInteractable)
- },
- },
- ]
+ }
+
+ private readonly detectStarsMenuItem: ToggleableMenuItem = {
+ label: 'Detect stars',
+ icon: 'mdi mdi-creation',
+ disabled: false,
+ toggleable: false,
+ toggled: false,
+ command: async () => {
+ this.detectedStars = await this.api.detectStars(this.imageData.path!)
+ this.detectedStarsIsVisible = this.detectedStars.length > 0
+ this.detectStarsMenuItem.toggleable = this.detectedStarsIsVisible
+ this.detectStarsMenuItem.toggled = this.detectedStarsIsVisible
},
- {
- icon: 'mdi mdi-list-box',
- label: 'FITS Header',
- command: () => {
- this.showFITSHeadersDialog = true
- },
+ toggle: (event) => {
+ event.originalEvent?.stopImmediatePropagation()
+ this.detectedStarsIsVisible = event.checked
},
- {
- separator: true,
+ }
+
+ private readonly roiMenuItem: CheckableMenuItem = {
+ label: 'ROI',
+ icon: 'mdi mdi-select',
+ checked: false,
+ command: () => {
+ if (this.roiInteractable) {
+ this.roiInteractable.unset()
+ this.roiInteractable = undefined
+ } else {
+ this.roiInteractable = interact(this.roi.nativeElement)
+ .origin({ x: 0, y: 0 })
+ .resizable({
+ edges: { left: true, right: true, bottom: true, top: true },
+ inertia: true,
+ listeners: { move: (event: any) => this.roiResizableMove(event) },
+ modifiers: [
+ interact.modifiers.restrictEdges({
+ outer: 'parent',
+ }),
+ interact.modifiers.restrictSize({
+ min: { width: 8, height: 8 },
+ })
+ ],
+ })
+ .draggable({
+ listeners: { move: (event: any) => this.roiDraggableMove(event) },
+ inertia: true,
+ modifiers: [
+ interact.modifiers.restrictRect({
+ restriction: 'parent',
+ endOnly: true,
+ }),
+ ]
+ })
+ }
+
+ this.roiMenuItem.checked = !!this.roiInteractable
},
+ }
+
+ private readonly overlayMenuItem: MenuItem = {
+ label: 'Overlay',
+ icon: 'mdi mdi-layers',
+ items: [
+ this.crosshairMenuItem,
+ this.annotationMenuItem,
+ this.detectStarsMenuItem,
+ this.roiMenuItem,
+ ]
+ }
+
+ readonly contextMenuItems = [
+ this.saveAsMenuItem,
+ SEPARATOR_MENU_ITEM,
+ this.plateSolveMenuItem,
+ SEPARATOR_MENU_ITEM,
+ this.stretchMenuItem,
+ this.autoStretchMenuItem,
+ this.scnrMenuItem,
+ this.horizontalMirrorMenuItem,
+ this.verticalMirrorMenuItem,
+ this.invertMenuItem,
+ this.calibrateMenuItem,
+ SEPARATOR_MENU_ITEM,
+ this.overlayMenuItem,
+ this.fitsHeaderMenuItem,
+ SEPARATOR_MENU_ITEM,
this.pointMountHereMenuItem,
]
mouseCoordinate?: InterpolatedCoordinate & Partial<{ x: number, y: number }>
private mouseCoordinateInterpolation?: CoordinateInterpolator
+ get isMouseCoordinateVisible() {
+ return !!this.mouseCoordinate && !this.mirrorHorizontal && !this.mirrorVertical
+ }
+
constructor(
private app: AppComponent,
private route: ActivatedRoute,
private api: ApiService,
private electron: ElectronService,
private browserWindow: BrowserWindowService,
- private preference: PreferenceService,
+ private storage: LocalStorageService,
+ private prime: PrimeService,
private ngZone: NgZone,
) {
app.title = 'Image'
- electron.on('CAMERA_EXPOSURE_FINISHED', async (_, event: CameraCaptureEvent) => {
- if (event.camera.name === this.imageParams.camera?.name) {
+ electron.on('CAMERA_EXPOSURE_FINISHED', async (event) => {
+ if (event.camera.name === this.imageData.camera?.name) {
await this.closeImage()
ngZone.run(() => {
- this.annotations = []
- this.imageParams.path = event.savePath
+ this.imageData.path = event.savePath
this.loadImage()
})
}
})
- electron.on('PARAMS_CHANGED', async (_, event: ImageParams) => {
+ electron.on('DATA_CHANGED', async (event: ImageData) => {
await this.closeImage()
- this.loadImageFromParams(event)
+ ngZone.run(() => {
+ this.loadImageFromData(event)
+ })
})
-
- 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)
}
ngAfterViewInit() {
+ this.loadPreference()
+
this.route.queryParams.subscribe(e => {
- const params = JSON.parse(decodeURIComponent(e.params)) as ImageParams
- this.loadImageFromParams(params)
+ const data = JSON.parse(decodeURIComponent(e.data)) as ImageData
+ this.loadImageFromData(data)
})
}
@@ -325,9 +394,9 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
}
private async closeImage(force: boolean = false) {
- if (this.imageParams.path) {
- if (force || !this.imageParams.path.startsWith('@')) {
- await this.api.closeImage(this.imageParams.path)
+ if (this.imageData.path) {
+ if (force || !this.imageData.path.startsWith('@')) {
+ await this.api.closeImage(this.imageData.path)
}
}
}
@@ -337,8 +406,8 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
const { scale } = this.panZoom!.getTransform()
- var x = parseFloat(target.getAttribute('data-x')) || 0
- var y = parseFloat(target.getAttribute('data-y')) || 0
+ let x = parseFloat(target.getAttribute('data-x')) || 0
+ let y = parseFloat(target.getAttribute('data-y')) || 0
target.style.width = event.rect.width / scale + 'px'
target.style.height = event.rect.height / scale + 'px'
@@ -378,32 +447,49 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
})
}
- private loadImageFromParams(params: ImageParams) {
- console.info('loading image from params: %s', params)
+ private loadImageFromData(data: ImageData) {
+ console.info('loading image from data: %s', data)
- this.imageParams = params
+ this.imageData = data
- if (params.source === 'FRAMING') {
+ if (data.source === 'FRAMING') {
this.disableAutoStretch()
}
- if (this.imageParams.path) {
- this.annotations = []
- this.loadImage()
+ this.calibrateMenuItem.disabled = !data.camera
+
+ if (!data.camera) {
+ this.disableCalibrate()
}
+
+ this.loadImage()
+ }
+
+ private clearOverlay() {
+ this.annotations = []
+ this.annotationIsVisible = false
+ this.annotationMenuItem.toggleable = false
+
+ this.detectedStars = []
+ this.detectedStarsIsVisible = false
+ this.detectStarsMenuItem.toggleable = false
}
private async loadImage() {
- if (this.imageParams.path) {
- await this.loadImageFromPath(this.imageParams.path)
+ if (this.imageData.path) {
+ this.clearOverlay()
+
+ await this.loadImageFromPath(this.imageData.path)
}
- if (this.imageParams.title) {
- this.app.subTitle = this.imageParams.title
- } else if (this.imageParams.camera) {
- this.app.subTitle = this.imageParams.camera.name
- } else if (this.imageParams.path) {
- this.app.subTitle = path.basename(this.imageParams.path)
+ this.loadPreference(this.imageData.camera)
+
+ if (this.imageData.title) {
+ this.app.subTitle = this.imageData.title
+ } else if (this.imageData.camera) {
+ this.app.subTitle = this.imageData.camera.name
+ } else if (this.imageData.path) {
+ this.app.subTitle = path.basename(this.imageData.path)
} else {
this.app.subTitle = ''
}
@@ -412,7 +498,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
private async loadImageFromPath(path: string) {
const image = this.image.nativeElement
const scnrEnabled = this.scnrChannel !== 'NONE'
- const { info, blob } = await this.api.openImage(path, this.debayer, this.autoStretch,
+ const { info, blob } = await this.api.openImage(path, this.imageData.camera, this.calibrate, this.debayer, this.autoStretched,
this.stretchShadowhHighlight[0] / 65536, this.stretchShadowhHighlight[1] / 65536, this.stretchMidtone / 65536,
this.mirrorHorizontal, this.mirrorVertical,
this.invert, scnrEnabled, scnrEnabled ? this.scnrChannel : 'GREEN', this.scnrAmount, this.scnrProtectionMethod)
@@ -422,8 +508,9 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
if (info.rightAscension) this.solverCenterRA = info.rightAscension
if (info.declination) this.solverCenterDEC = info.declination
+ this.solverBlind = !this.solverCenterRA || !this.solverCenterDEC
- if (this.autoStretch) {
+ if (this.autoStretched) {
this.stretchShadowhHighlight[0] = Math.trunc(info.stretchShadow * 65536)
this.stretchShadowhHighlight[1] = Math.trunc(info.stretchHighlight * 65536)
this.stretchMidtone = Math.trunc(info.stretchMidtone * 65536)
@@ -450,18 +537,25 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
}
imageMouseMoved(event: MouseEvent) {
+ this.imageMouseMovedWithCoordinates(event.offsetX, event.offsetY)
+ }
+
+ imageMouseMovedWithCoordinates(x: number, y: number) {
if (!this.menu.visible()) {
- this.mouseCoordinate = this.mouseCoordinateInterpolation?.interpolateAsText(event.offsetX, event.offsetY, true, true, false)
- this.mouseCoordinate!.x = event.offsetX
- this.mouseCoordinate!.y = event.offsetY
+ this.mouseCoordinate = this.mouseCoordinateInterpolation?.interpolateAsText(x, y, true, true, false)
+ this.mouseCoordinate!.x = x
+ this.mouseCoordinate!.y = y
}
}
async annotateImage() {
try {
this.annotating = true
- this.annotations = await this.api.annotationsOfImage(this.imageParams.path!,
+ this.annotations = await this.api.annotationsOfImage(this.imageData.path!,
this.annotateWithStars, this.annotateWithDSOs, this.annotateWithMinorPlanets, this.annotateWithMinorPlanetsMagLimit)
+ this.annotationIsVisible = true
+ this.annotationMenuItem.toggleable = this.annotations.length > 0
+ this.annotationMenuItem.toggled = this.annotationMenuItem.toggleable
this.showAnnotationDialog = false
} finally {
this.annotating = false
@@ -474,8 +568,20 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
}
private disableAutoStretch() {
- this.autoStretch = false
- this.checkMenuItem(this.menuItems[5], false)
+ this.autoStretched = false
+ this.autoStretchMenuItem.checked = false
+ }
+
+ private disableCalibrate() {
+ this.calibrate = false
+ this.calibrateMenuItem.checked = false
+ }
+
+ autoStretch() {
+ this.autoStretched = true
+ this.autoStretchMenuItem.checked = true
+
+ this.loadImage()
}
resetStretch() {
@@ -496,14 +602,14 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
}
private async retrieveCoordinateInterpolation() {
- const coordinate = await this.api.coordinateInterpolation(this.imageParams.path!)
+ const coordinate = await this.api.coordinateInterpolation(this.imageData.path!)
if (coordinate) {
const { ma, md, x0, y0, x1, y1, delta } = coordinate
+ const x = Math.max(0, Math.min(this.mouseCoordinate?.x ?? 0, this.imageInfo!.width))
+ const y = Math.max(0, Math.min(this.mouseCoordinate?.y ?? 0, this.imageInfo!.height))
this.mouseCoordinateInterpolation = new CoordinateInterpolator(ma, md, x0, y0, x1, y1, delta)
- this.mouseCoordinate = this.mouseCoordinateInterpolation.interpolateAsText(0, 0)
- this.mouseCoordinate.x = 0
- this.mouseCoordinate.y = 0
+ this.imageMouseMovedWithCoordinates(x, y)
} else {
this.mouseCoordinateInterpolation = undefined
this.mouseCoordinate = undefined
@@ -514,13 +620,10 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
this.solving = true
try {
- this.solverCalibration = await this.api.solveImage(this.imageParams.path!, this.solverType, this.solverBlind,
- this.solverCenterRA, this.solverCenterDEC, this.solverRadius, this.solverDownsampleFactor,
- this.solverPathOrUrl, this.solverApiKey)
+ this.solverCalibration = await this.api.solveImage(this.imageData.path!, this.solverBlind,
+ this.solverCenterRA, this.solverCenterDEC, this.solverRadius)
- this.preference.set('image.solver.pathOrUrl', this.solverPathOrUrl)
- this.preference.set('image.solver.radius', this.solverRadius)
- this.preference.set('image.solver.downsampleFactor', this.solverDownsampleFactor)
+ this.savePreference()
this.solved = true
this.annotationMenuItem.disabled = false
@@ -536,26 +639,26 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
}
}
- async mountSync(coordinate: EquatorialCoordinateJ2000) {
- const mount = await this.electron.selectedMount()
- if (!mount?.connected) return
- this.api.mountSync(mount, coordinate.rightAscensionJ2000, coordinate.declinationJ2000, true)
+ mountSync(coordinate: EquatorialCoordinateJ2000) {
+ this.executeMount((mount) => {
+ this.api.mountSync(mount, coordinate.rightAscensionJ2000, coordinate.declinationJ2000, true)
+ })
}
async mountGoTo(coordinate: EquatorialCoordinateJ2000) {
- const mount = await this.electron.selectedMount()
- if (!mount?.connected) return
- this.api.mountGoTo(mount, coordinate.rightAscensionJ2000, coordinate.declinationJ2000, true)
+ this.executeMount((mount) => {
+ this.api.mountGoTo(mount, coordinate.rightAscensionJ2000, coordinate.declinationJ2000, true)
+ })
}
async mountSlew(coordinate: EquatorialCoordinateJ2000) {
- const mount = await this.electron.selectedMount()
- if (!mount?.connected) return
- this.api.mountSlew(mount, coordinate.rightAscensionJ2000, coordinate.declinationJ2000, true)
+ this.executeMount((mount) => {
+ this.api.mountSlew(mount, coordinate.rightAscensionJ2000, coordinate.declinationJ2000, true)
+ })
}
frame(coordinate: EquatorialCoordinateJ2000) {
- this.browserWindow.openFraming({ rightAscension: coordinate.rightAscensionJ2000, declination: coordinate.declinationJ2000 })
+ this.browserWindow.openFraming({ data: { rightAscension: coordinate.rightAscensionJ2000, declination: coordinate.declinationJ2000 } })
}
imageLoaded() {
@@ -578,7 +681,49 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
}
}
- private checkMenuItem(item?: MenuItem | MegaMenuItem, checked: boolean = true) {
- item && (item.styleClass = checked ? 'p-menuitem-checked' : '')
+ private loadPreference(camera?: Camera) {
+ let preference: ImagePreference
+
+ if (camera) {
+ preference = this.storage.get(`image.${camera.name}`, {})
+ } else {
+ preference = this.storage.get('image', {})
+ }
+
+ this.solverRadius = preference.solverRadius ?? this.solverRadius
+ }
+
+ private savePreference() {
+ const preference: ImagePreference = {
+ solverRadius: this.solverRadius
+ }
+
+ if (this.imageData.camera) {
+ this.storage.set(`image.${this.imageData.camera.name}`, preference)
+ } else {
+ this.storage.set('image', preference)
+ }
+ }
+
+ private async executeMount(action: (mount: Mount) => void) {
+ if (await this.prime.confirm('Are you sure that you want to proceed?')) {
+ return
+ }
+
+ const mounts = await this.api.mounts()
+
+ if (mounts.length === 1) {
+ action(mounts[0])
+ return true
+ } else {
+ const mount = await this.deviceMenu.show(mounts)
+
+ if (mount && mount.connected) {
+ action(mount)
+ return true
+ }
+ }
+
+ return false
}
}
diff --git a/desktop/src/app/indi/indi.component.ts b/desktop/src/app/indi/indi.component.ts
index 6ee8abe63..057e361b1 100644
--- a/desktop/src/app/indi/indi.component.ts
+++ b/desktop/src/app/indi/indi.component.ts
@@ -3,13 +3,9 @@ import { ActivatedRoute } from '@angular/router'
import { MenuItem } from 'primeng/api'
import { ApiService } from '../../shared/services/api.service'
import { ElectronService } from '../../shared/services/electron.service'
-import { Device, INDIDeviceMessage, INDIProperty, INDIPropertyItem, INDISendProperty } from '../../shared/types'
+import { Device, INDIProperty, INDIPropertyItem, INDISendProperty } from '../../shared/types'
import { AppComponent } from '../app.component'
-export interface INDIParams {
- device?: Device
-}
-
@Component({
selector: 'app-indi',
templateUrl: './indi.component.html',
@@ -37,15 +33,15 @@ export class INDIComponent implements AfterViewInit, OnDestroy {
this.api.startListening('INDI')
- electron.on('DEVICE_PROPERTY_CHANGED', (_, event: INDIProperty) => {
+ electron.on('DEVICE_PROPERTY_CHANGED', event => {
ngZone.run(() => {
- this.addOrUpdateProperty(event)
+ this.addOrUpdateProperty(event.property!)
this.updateGroups()
})
})
- electron.on('DEVICE_PROPERTY_DELETED', (_, event: INDIProperty) => {
- const index = this.properties.findIndex((e) => e.name === event.name)
+ electron.on('DEVICE_PROPERTY_DELETED', event => {
+ const index = this.properties.findIndex((e) => e.name === event.property!.name)
if (index >= 0) {
ngZone.run(() => {
@@ -55,10 +51,10 @@ export class INDIComponent implements AfterViewInit, OnDestroy {
}
})
- electron.on('DEVICE_MESSAGE_RECEIVED', (_, event: INDIDeviceMessage) => {
+ electron.on('DEVICE_MESSAGE_RECEIVED', event => {
if (this.device && event.device?.name === this.device.name) {
ngZone.run(() => {
- this.messages.splice(0, 0, event.message)
+ this.messages.splice(0, 0, event.message!)
})
}
})
@@ -66,8 +62,7 @@ export class INDIComponent implements AfterViewInit, OnDestroy {
async ngAfterViewInit() {
this.route.queryParams.subscribe(e => {
- const params = JSON.parse(decodeURIComponent(e.params)) as INDIParams
- this.device = params.device
+ this.device = JSON.parse(decodeURIComponent(e.data)) as Device
})
this.devices = [
diff --git a/desktop/src/app/indi/property/indi-property.component.ts b/desktop/src/app/indi/property/indi-property.component.ts
index e2133f1b9..9c984adf1 100644
--- a/desktop/src/app/indi/property/indi-property.component.ts
+++ b/desktop/src/app/indi/property/indi-property.component.ts
@@ -8,7 +8,7 @@ import { INDIProperty, INDIPropertyItem, INDISendProperty, INDISendPropertyItem
})
export class INDIPropertyComponent implements AfterContentInit, OnDestroy {
- @Input()
+ @Input({ required: true })
property!: INDIProperty
@Input()
diff --git a/desktop/src/app/mount/mount.component.html b/desktop/src/app/mount/mount.component.html
index de4850af3..4f43fe5b1 100644
--- a/desktop/src/app/mount/mount.component.html
+++ b/desktop/src/app/mount/mount.component.html
@@ -1,9 +1,8 @@
-
-
+
+
+
-
-
-
@@ -291,8 +286,8 @@
-
-
+
\ No newline at end of file
+
+
+X: {{ mouseCoordinate.x }}
Y: {{ mouseCoordinate.y }}
α: {{ mouseCoordinate.alpha }}
δ: {{ mouseCoordinate.delta }}
l: {{ mouseCoordinate.l }}
b: {{ mouseCoordinate.b }}
-
- (`mount.${this.mount.name}`, {})
+ this.targetCoordinateType = preference.targetCoordinateType ?? 'JNOW'
+ this.targetRightAscension = preference.targetRightAscension ?? '00h00m00s'
+ this.targetDeclination = preference.targetDeclination ?? `00°00'00"`
this.computeTargetCoordinatePublisher.next()
}
}
private savePreference() {
if (this.mount && this.mount.connected) {
- this.preference.set(`mount.${this.mount.name}.targetCoordinateType`, this.targetCoordinateType)
- this.preference.set(`mount.${this.mount.name}.targetRightAscension`, this.targetRightAscension)
- this.preference.set(`mount.${this.mount.name}.targetDeclination`, this.targetDeclination)
+ const preference: MountPreference = {
+ targetCoordinateType: this.targetCoordinateType,
+ targetRightAscension: this.targetRightAscension,
+ targetDeclination: this.targetDeclination,
+ }
+
+ this.storage.set(`mount.${this.mount.name}`, preference)
}
}
}
diff --git a/desktop/src/app/settings/settings.component.html b/desktop/src/app/settings/settings.component.html
new file mode 100644
index 000000000..16cf282ba
--- /dev/null
+++ b/desktop/src/app/settings/settings.component.html
@@ -0,0 +1,44 @@
+
+
-
-
@@ -69,7 +68,7 @@
+
-
@@ -113,7 +112,7 @@
@@ -199,4 +198,4 @@
+
\ No newline at end of file
diff --git a/desktop/src/app/settings/settings.component.scss b/desktop/src/app/settings/settings.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/desktop/src/app/settings/settings.component.ts b/desktop/src/app/settings/settings.component.ts
new file mode 100644
index 000000000..6ceb802ae
--- /dev/null
+++ b/desktop/src/app/settings/settings.component.ts
@@ -0,0 +1,124 @@
+import { AfterViewInit, Component, HostListener, OnDestroy } from '@angular/core'
+import { MenuItem } from 'primeng/api'
+import { LocationDialog } from '../../shared/dialogs/location/location.dialog'
+import { ApiService } from '../../shared/services/api.service'
+import { ElectronService } from '../../shared/services/electron.service'
+import { PrimeService } from '../../shared/services/prime.service'
+import { EMPTY_LOCATION, Location, PlateSolverOptions, PlateSolverType } from '../../shared/types'
+import { AppComponent } from '../app.component'
+
+@Component({
+ selector: 'app-settings',
+ templateUrl: './settings.component.html',
+ styleUrls: ['./settings.component.scss'],
+})
+export class SettingsComponent implements AfterViewInit, OnDestroy {
+
+ activeTab = 0
+
+ locations: Location[] = []
+ location = Object.assign({}, EMPTY_LOCATION)
+ private deletedLocations: Location[] = []
+
+ readonly plateSolvers: PlateSolverType[] = ['ASTAP', 'ASTROMETRY_NET']
+ plateSolver!: PlateSolverOptions
+
+ readonly items: MenuItem[] = [
+ {
+ icon: 'mdi mdi-map-marker',
+ label: 'Location',
+ },
+ {
+ icon: 'mdi mdi-sigma',
+ label: 'Plate Solver',
+ },
+ ]
+
+ item = this.items[0]
+
+ constructor(
+ app: AppComponent,
+ private api: ApiService,
+ private electron: ElectronService,
+ 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()
+ }
+
+ @HostListener('window:unload')
+ ngOnDestroy() { }
+
+ addLocation() {
+ this.showLocation(Object.assign({}, EMPTY_LOCATION))
+ }
+
+ editLocation() {
+ this.showLocation(this.location)
+ }
+
+ 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)
+ }
+ }
+
+ private async loadLocation() {
+ 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)
+ }
+
+ 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
+ }
+ }
+ }
+
+ locationChanged() {
+ this.locations.forEach(e => e.selected = false)
+ this.location.selected = true
+ }
+
+ 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)
+ }
+}
\ No newline at end of file
diff --git a/desktop/src/assets/fonts/icomoon.ttf b/desktop/src/assets/fonts/icomoon.ttf
new file mode 100644
index 000000000..796fd516a
Binary files /dev/null and b/desktop/src/assets/fonts/icomoon.ttf differ
diff --git a/desktop/src/assets/icons/CREDITS.md b/desktop/src/assets/icons/CREDITS.md
index d0c7b1449..9640a1559 100644
--- a/desktop/src/assets/icons/CREDITS.md
+++ b/desktop/src/assets/icons/CREDITS.md
@@ -2,12 +2,8 @@
* https://www.flaticon.com/free-icon/galaxy_1534067
* https://www.flaticon.com/free-icon/information_9195785
-* https://www.flaticon.com/free-icon/gps_856332
-* https://www.flaticon.com/free-icon/clock_3133110
-* https://www.flaticon.com/free-icon/map_854878
* https://www.flaticon.com/free-icon/remote-control_3567313
* https://www.flaticon.com/free-icon/sky_3982229
-* https://www.flaticon.com/free-icon/text-box_3815460
* https://www.flaticon.com/free-icon/histogram_2709742
* https://www.flaticon.com/free-icon/target_3207593
* https://www.flaticon.com/free-icon/camera-lens_5708327
@@ -19,12 +15,9 @@
* https://www.flaticon.com/free-icon/image-processing_6062419
* https://www.flaticon.com/free-icon/star_740882
* https://www.flaticon.com/free-icon/rotate_3303063
-* https://www.flaticon.com/free-icon/combination_8654893
-* https://www.flaticon.com/free-icon/rgb-print_4904473
* https://www.flaticon.com/free-icon/location_4631354
* https://www.flaticon.com/free-icon/rgb-print_7664547
-* https://www.flaticon.com/free-icon/setting_839374
-* https://www.flaticon.com/free-icon/filter_679991
+* https://www.flaticon.com/free-icon/cogwheel_3953226
* https://www.flaticon.com/free-icon/target_10542035
* https://www.flaticon.com/free-icon/contrast_439842
* https://www.flaticon.com/free-icon/full-moon_9689786
@@ -33,4 +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/gear_8753403
+* 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://thenounproject.com/icon/random-dither-4259782
diff --git a/desktop/src/assets/icons/about.png b/desktop/src/assets/icons/about.png
index dcc3290ca..7a82378e1 100644
Binary files a/desktop/src/assets/icons/about.png and b/desktop/src/assets/icons/about.png differ
diff --git a/desktop/src/assets/icons/asteroid.png b/desktop/src/assets/icons/asteroid.png
index 3c4b7f4d8..c45e9308a 100644
Binary files a/desktop/src/assets/icons/asteroid.png and b/desktop/src/assets/icons/asteroid.png differ
diff --git a/desktop/src/assets/icons/atlas.png b/desktop/src/assets/icons/atlas.png
index dffc74958..5c4f59c2b 100644
Binary files a/desktop/src/assets/icons/atlas.png and b/desktop/src/assets/icons/atlas.png differ
diff --git a/desktop/src/assets/icons/camera.png b/desktop/src/assets/icons/camera.png
index cfcc105f9..2cdded1b5 100644
Binary files a/desktop/src/assets/icons/camera.png and b/desktop/src/assets/icons/camera.png differ
diff --git a/desktop/src/assets/icons/filter-wheel.png b/desktop/src/assets/icons/filter-wheel.png
index ed843f917..2daf28c9f 100644
Binary files a/desktop/src/assets/icons/filter-wheel.png and b/desktop/src/assets/icons/filter-wheel.png differ
diff --git a/desktop/src/assets/icons/filter.png b/desktop/src/assets/icons/filter.png
deleted file mode 100644
index b73b88f9b..000000000
Binary files a/desktop/src/assets/icons/filter.png and /dev/null differ
diff --git a/desktop/src/assets/icons/focus.png b/desktop/src/assets/icons/focus.png
index 6dfc87d46..155f13952 100644
Binary files a/desktop/src/assets/icons/focus.png and b/desktop/src/assets/icons/focus.png differ
diff --git a/desktop/src/assets/icons/framing.png b/desktop/src/assets/icons/framing.png
index e42b7720c..394a657b4 100644
Binary files a/desktop/src/assets/icons/framing.png and b/desktop/src/assets/icons/framing.png differ
diff --git a/desktop/src/assets/icons/gear.png b/desktop/src/assets/icons/gear.png
deleted file mode 100644
index a57fd0a7a..000000000
Binary files a/desktop/src/assets/icons/gear.png and /dev/null differ
diff --git a/desktop/src/assets/icons/guider.png b/desktop/src/assets/icons/guider.png
index 20897eb5f..70e48e71c 100644
Binary files a/desktop/src/assets/icons/guider.png and b/desktop/src/assets/icons/guider.png differ
diff --git a/desktop/src/assets/icons/histogram.png b/desktop/src/assets/icons/histogram.png
index 90c02cacf..ba4e5ec4d 100644
Binary files a/desktop/src/assets/icons/histogram.png and b/desktop/src/assets/icons/histogram.png differ
diff --git a/desktop/src/assets/icons/image.png b/desktop/src/assets/icons/image.png
index bd097621c..3b443000f 100644
Binary files a/desktop/src/assets/icons/image.png and b/desktop/src/assets/icons/image.png differ
diff --git a/desktop/src/assets/icons/indi.png b/desktop/src/assets/icons/indi.png
index 7d0bf1163..debf55518 100644
Binary files a/desktop/src/assets/icons/indi.png and b/desktop/src/assets/icons/indi.png differ
diff --git a/desktop/src/assets/icons/jupiter.png b/desktop/src/assets/icons/jupiter.png
index 6d2365460..880593dc7 100644
Binary files a/desktop/src/assets/icons/jupiter.png and b/desktop/src/assets/icons/jupiter.png differ
diff --git a/desktop/src/assets/icons/location.png b/desktop/src/assets/icons/location.png
index 1ce76af1c..9cdce86ae 100644
Binary files a/desktop/src/assets/icons/location.png and b/desktop/src/assets/icons/location.png differ
diff --git a/desktop/src/assets/icons/map-marker.png b/desktop/src/assets/icons/map-marker.png
index 37835cfbc..f63b28183 100644
Binary files a/desktop/src/assets/icons/map-marker.png and b/desktop/src/assets/icons/map-marker.png differ
diff --git a/desktop/src/assets/icons/milky-way.png b/desktop/src/assets/icons/milky-way.png
index 073c3817b..b6c1e3f78 100644
Binary files a/desktop/src/assets/icons/milky-way.png and b/desktop/src/assets/icons/milky-way.png differ
diff --git a/desktop/src/assets/icons/moon.png b/desktop/src/assets/icons/moon.png
index f64202ee2..0fe4e02a6 100644
Binary files a/desktop/src/assets/icons/moon.png and b/desktop/src/assets/icons/moon.png differ
diff --git a/desktop/src/assets/icons/nebulosa-256.png b/desktop/src/assets/icons/nebulosa-256.png
new file mode 100644
index 000000000..f4c5e6415
Binary files /dev/null and b/desktop/src/assets/icons/nebulosa-256.png differ
diff --git a/desktop/src/assets/icons/nebulosa-512.png b/desktop/src/assets/icons/nebulosa-512.png
deleted file mode 100644
index d0571cd7d..000000000
Binary files a/desktop/src/assets/icons/nebulosa-512.png and /dev/null differ
diff --git a/desktop/src/assets/icons/nebulosa.png b/desktop/src/assets/icons/nebulosa.png
index 38ab0d8d8..2d70654f2 100644
Binary files a/desktop/src/assets/icons/nebulosa.png and b/desktop/src/assets/icons/nebulosa.png differ
diff --git a/desktop/src/assets/icons/observatory.png b/desktop/src/assets/icons/observatory.png
index fe5814692..15420ca67 100644
Binary files a/desktop/src/assets/icons/observatory.png and b/desktop/src/assets/icons/observatory.png differ
diff --git a/desktop/src/assets/icons/online-search.png b/desktop/src/assets/icons/online-search.png
new file mode 100644
index 000000000..6c74d6dc1
Binary files /dev/null and b/desktop/src/assets/icons/online-search.png differ
diff --git a/desktop/src/assets/icons/random-dither.svg b/desktop/src/assets/icons/random-dither.svg
new file mode 100644
index 000000000..58f0c9c73
--- /dev/null
+++ b/desktop/src/assets/icons/random-dither.svg
@@ -0,0 +1 @@
+
diff --git a/desktop/src/assets/icons/remote-control.png b/desktop/src/assets/icons/remote-control.png
index 2fee819e9..3341d7c19 100644
Binary files a/desktop/src/assets/icons/remote-control.png and b/desktop/src/assets/icons/remote-control.png differ
diff --git a/desktop/src/assets/icons/rgb.png b/desktop/src/assets/icons/rgb.png
deleted file mode 100644
index 33edd1c04..000000000
Binary files a/desktop/src/assets/icons/rgb.png and /dev/null differ
diff --git a/desktop/src/assets/icons/rotate.png b/desktop/src/assets/icons/rotate.png
index 9073b2552..a1d936786 100644
Binary files a/desktop/src/assets/icons/rotate.png and b/desktop/src/assets/icons/rotate.png differ
diff --git a/desktop/src/assets/icons/satellite.png b/desktop/src/assets/icons/satellite.png
index 3a5a1291b..ef9f4660b 100644
Binary files a/desktop/src/assets/icons/satellite.png and b/desktop/src/assets/icons/satellite.png differ
diff --git a/desktop/src/assets/icons/schedule.png b/desktop/src/assets/icons/schedule.png
index b8a1d3809..5b879191a 100644
Binary files a/desktop/src/assets/icons/schedule.png and b/desktop/src/assets/icons/schedule.png differ
diff --git a/desktop/src/assets/icons/settings.png b/desktop/src/assets/icons/settings.png
index d6acd23dc..2c8a74b86 100644
Binary files a/desktop/src/assets/icons/settings.png and b/desktop/src/assets/icons/settings.png differ
diff --git a/desktop/src/assets/icons/stack.png b/desktop/src/assets/icons/stack.png
new file mode 100644
index 000000000..7cfd07d6b
Binary files /dev/null and b/desktop/src/assets/icons/stack.png differ
diff --git a/desktop/src/assets/icons/star.png b/desktop/src/assets/icons/star.png
index 518d71ff7..b6d70ed1a 100644
Binary files a/desktop/src/assets/icons/star.png and b/desktop/src/assets/icons/star.png differ
diff --git a/desktop/src/assets/icons/stars.png b/desktop/src/assets/icons/stars.png
index 916705d97..eceb06ff8 100644
Binary files a/desktop/src/assets/icons/stars.png and b/desktop/src/assets/icons/stars.png differ
diff --git a/desktop/src/assets/icons/sun.png b/desktop/src/assets/icons/sun.png
index 545ac7b8e..326b05d5e 100644
Binary files a/desktop/src/assets/icons/sun.png and b/desktop/src/assets/icons/sun.png differ
diff --git a/desktop/src/assets/icons/switch.png b/desktop/src/assets/icons/switch.png
index 088c6cc8b..71f552c38 100644
Binary files a/desktop/src/assets/icons/switch.png and b/desktop/src/assets/icons/switch.png differ
diff --git a/desktop/src/assets/icons/telescope.png b/desktop/src/assets/icons/telescope.png
index dee85f31a..c1d0d039e 100644
Binary files a/desktop/src/assets/icons/telescope.png and b/desktop/src/assets/icons/telescope.png differ
diff --git a/desktop/src/assets/icons/text-box.png b/desktop/src/assets/icons/text-box.png
deleted file mode 100644
index 0a95948c8..000000000
Binary files a/desktop/src/assets/icons/text-box.png and /dev/null differ
diff --git a/desktop/src/assets/images/splash.png b/desktop/src/assets/images/splash.png
index a50b5bc99..aca9fba8b 100644
Binary files a/desktop/src/assets/images/splash.png and b/desktop/src/assets/images/splash.png differ
diff --git a/desktop/src/index.html b/desktop/src/index.html
index e75cf5e49..d4d0152a0 100644
--- a/desktop/src/index.html
+++ b/desktop/src/index.html
@@ -7,14 +7,10 @@
-
-
-
-
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+