-
-
-
- {{ status | enum | lowercase }}
-
-
- {{ darvDirection }}
-
-
- {{ remainingTime | exposureTime }}
-
-
- {{ progress | percent:'1.1-1' }}
-
-
-
-
- {{ elapsedTime | exposureTime }}
-
-
- {{ tppaRightAscension }}
-
-
- {{ tppaDeclination }}
-
-
+
+
+
@@ -58,22 +40,33 @@
-
+
-
-
- East
-
+
+
-
+
()
name? = 'Sun'
- tags: { title: string, severity: string }[] = []
+ tags: { title: string, severity: 'success' | 'info' | 'warning' | 'danger' }[] = []
@ViewChild('imageOfSun')
private readonly imageOfSun!: ElementRef
@@ -406,7 +406,7 @@ export class AtlasComponent implements OnInit, AfterContentInit, AfterViewInit,
'ONEWEB', 'SCIENCE', 'STARLINK', 'STATIONS', 'VISUAL'
]
- readonly ephemerisModel: MenuItem[] = [
+ readonly ephemerisModel: ExtendedMenuItem[] = [
{
icon: 'mdi mdi-magnify',
label: 'Find sky objects around this object',
@@ -519,7 +519,7 @@ export class AtlasComponent implements OnInit, AfterContentInit, AfterViewInit,
if (this.tab === SkyAtlasTab.SKY_OBJECT) {
this.skyObjectFilter.rightAscension = data.filter?.rightAscension || this.skyObjectFilter.rightAscension
this.skyObjectFilter.declination = data.filter?.declination || this.skyObjectFilter.declination
- if (data.filter?.radius) this.skyObjectFilter.radius = data.filter?.radius || this.skyObjectFilter.radius
+ this.skyObjectFilter.radius = data.filter?.radius || this.skyObjectFilter.radius || 4.0
this.skyObjectFilter.constellation = data.filter?.constellation || this.skyObjectFilter.constellation
this.skyObjectFilter.magnitude = data.filter?.magnitude || this.skyObjectFilter.magnitude
this.skyObjectFilter.type = data.filter?.type || this.skyObjectFilter.type
@@ -895,7 +895,7 @@ export class AtlasComponent implements OnInit, AfterContentInit, AfterViewInit,
} else {
const mount = await this.deviceMenu.show(mounts)
- if (mount && mount.connected) {
+ if (mount && mount !== 'NONE' && mount.connected) {
action(mount)
return true
}
diff --git a/desktop/src/app/calibration/calibration.component.html b/desktop/src/app/calibration/calibration.component.html
index 7b4ebf8ee..acfded5e3 100644
--- a/desktop/src/app/calibration/calibration.component.html
+++ b/desktop/src/app/calibration/calibration.component.html
@@ -1,98 +1,64 @@
+
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/desktop/src/app/calibration/calibration.component.scss b/desktop/src/app/calibration/calibration.component.scss
index e69de29bb..83a651dd7 100644
--- a/desktop/src/app/calibration/calibration.component.scss
+++ b/desktop/src/app/calibration/calibration.component.scss
@@ -0,0 +1,33 @@
+:host {
+ ::ng-deep {
+ .p-treenode-label {
+ width: 100%;
+ }
+
+ .p-tree-wrapper {
+ max-height: 288px;
+ }
+
+ .p-tree {
+ .p-tree-container {
+ padding-right: 4px;
+
+ .p-treenode {
+ padding: 0;
+
+ .p-treenode-content {
+ padding: 0 0.5rem;
+ }
+ }
+ }
+ }
+
+ .p-treenode-leaf>.p-treenode-content .p-tree-toggler {
+ display: none;
+ }
+
+ .p-tree-empty-message {
+ padding: 1rem 0.5rem;
+ }
+ }
+}
\ No newline at end of file
diff --git a/desktop/src/app/calibration/calibration.component.ts b/desktop/src/app/calibration/calibration.component.ts
index 18ed705b2..eb50c15e9 100644
--- a/desktop/src/app/calibration/calibration.component.ts
+++ b/desktop/src/app/calibration/calibration.component.ts
@@ -1,170 +1,271 @@
-import { AfterViewInit, Component, HostListener, NgZone, OnDestroy } from '@angular/core'
-import { ActivatedRoute } from '@angular/router'
-import path from 'path'
-import { CheckboxChangeEvent } from 'primeng/checkbox'
+import { AfterViewInit, Component, HostListener, OnDestroy } from '@angular/core'
+import { dirname } from 'path'
+import { TreeDragDropService, TreeNode } from 'primeng/api'
+import { TreeNodeDropEvent } from 'primeng/tree'
import { ApiService } from '../../shared/services/api.service'
import { BrowserWindowService } from '../../shared/services/browser-window.service'
import { ElectronService } from '../../shared/services/electron.service'
-import { LocalStorageService } from '../../shared/services/local-storage.service'
+import { PreferenceService } from '../../shared/services/preference.service'
import { CalibrationFrame, CalibrationFrameGroup } from '../../shared/types/calibration.types'
-import { Camera } from '../../shared/types/camera.types'
import { AppComponent } from '../app.component'
-export const CALIBRATION_DIR_KEY = 'calibration.directory'
+export interface CalibrationNode extends TreeNode {
+ key: string
+ label: string
+ data: TreeNodeData
+ children: CalibrationNode[]
+ parent?: CalibrationNode
+}
+
+export type TreeNodeData =
+ { type: 'NAME', data: string } |
+ { type: 'GROUP', data: CalibrationFrameGroup } |
+ { type: 'FRAME', data: CalibrationFrame }
@Component({
selector: 'app-calibration',
templateUrl: './calibration.component.html',
styleUrls: ['./calibration.component.scss'],
+ providers: [TreeDragDropService],
})
export class CalibrationComponent implements AfterViewInit, OnDestroy {
- camera!: Camera
-
- groups: CalibrationFrameGroup[] = []
- group?: CalibrationFrameGroup
- frame?: CalibrationFrame
+ readonly frames: CalibrationNode[] = []
- get groupIsEnabled() {
- return !!this.group && !this.group.frames.find(e => !e.enabled)
- }
+ showNewGroupDialog = false
+ newGroupName = ''
+ newGroupDialogSave: () => void = () => { }
constructor(
- private app: AppComponent,
+ app: AppComponent,
private api: ApiService,
- electron: ElectronService,
+ private electron: ElectronService,
private browserWindow: BrowserWindowService,
- private route: ActivatedRoute,
- private storage: LocalStorageService,
- ngZone: NgZone,
+ private preference: PreferenceService,
) {
app.title = 'Calibration'
-
- app.topMenu.push({
- icon: 'mdi mdi-image-plus',
- tooltip: 'Add file',
- command: async () => {
- const defaultPath = this.storage.get(CALIBRATION_DIR_KEY, '')
- const filePath = await electron.openFits({ defaultPath })
-
- if (filePath) {
- this.storage.set(CALIBRATION_DIR_KEY, path.dirname(filePath))
- this.upload(filePath)
- }
- },
- })
-
- app.topMenu.push({
- icon: 'mdi mdi-folder-plus',
- tooltip: 'Add folder',
- command: async () => {
- const defaultPath = this.storage.get(CALIBRATION_DIR_KEY, '')
- const dirPath = await electron.openDirectory({ defaultPath })
-
- if (dirPath) {
- this.storage.set(CALIBRATION_DIR_KEY, dirPath)
- this.upload(dirPath)
- }
- },
- })
-
- electron.on('DATA.CHANGED', (data: Camera) => {
- ngZone.run(() => {
- if (data.name !== this.camera.name) {
- this.loadForCamera(data, true)
- }
- })
- })
}
- async ngAfterViewInit() {
- this.route.queryParams.subscribe(async e => {
- const camera = JSON.parse(decodeURIComponent(e.data)) as Camera
- this.loadForCamera(camera)
- })
+ ngAfterViewInit() {
+ this.load()
}
@HostListener('window:unload')
ngOnDestroy() { }
- private loadForCamera(camera: Camera, reload: boolean = false) {
- this.camera = camera
- this.app.subTitle = this.camera.name
- return reload ? this.reload() : this.load()
+ private makeTreeNode(key: string, label: string, data: TreeNodeData, parent?: CalibrationNode): CalibrationNode {
+ const draggable = data.type === 'FRAME'
+ const droppable = data.type === 'NAME'
+ return { key, label, data, children: [], parent, draggable, droppable }
}
- private async upload(path: string) {
- const frames = await this.api.uploadCalibrationFrame(this.camera!, path)
+ addGroup(name: string) {
+ const node = this.frames.find(e => e.label === name)
+ ?? this.makeTreeNode(`group-${name}`, name, { type: 'NAME', data: name })
- if (frames.length > 0) {
- this.load()
+ if (this.frames.indexOf(node) < 0) {
+ this.frames.push(node)
}
+
+ return node
}
- private async load() {
- this.groups = await this.api.calibrationFrames(this.camera)
+ addFrameGroup(name: string | CalibrationNode, group: CalibrationFrameGroup) {
+ const parent = typeof name === 'string'
+ ? this.frames.find(e => e.label === name)
+ : name
+
+ if (parent) {
+ const node = this.makeTreeNode(`frame-group-${group.id}`, `Frame`, { type: 'GROUP', data: group }, parent)
+ parent.children.push(node)
+ return node
+ }
+
+ return undefined
}
- private async reload() {
- this.group = undefined
- this.groupSelected()
- this.load()
+ addFrame(group: string | CalibrationNode, frame: CalibrationFrame) {
+ const parent = typeof group === 'string'
+ ? this.frames.find(e => e.label === group)
+ : group
+
+ if (parent) {
+ const node = this.makeTreeNode(`frame-${frame.id}`, `Frame`, { type: 'FRAME', data: frame }, parent)
+ parent.children.push(node)
+ return node
+ }
+
+ return undefined
}
- groupSelected() {
- this.frame = undefined
+ async openFileToUpload(node: CalibrationNode) {
+ if (node.data.type === 'NAME') {
+ const preference = this.preference.calibrationPreference.get()
+ const path = await this.electron.openImage({ defaultPath: preference.openPath })
+
+ if (path) {
+ preference.openPath = dirname(path)
+ this.preference.calibrationPreference.set(preference)
+ this.upload(node, path)
+ }
+ }
}
- groupChecked(event: CheckboxChangeEvent) {
- this.group?.frames?.forEach(e => e.enabled = event.checked)
+ async openDirectoryToUpload(node: CalibrationNode) {
+ if (node.data.type === 'NAME') {
+ const preference = this.preference.calibrationPreference.get()
+ const path = await this.electron.openDirectory({ defaultPath: preference.openPath })
+
+ if (path) {
+ preference.openPath = path
+ this.preference.calibrationPreference.set(preference)
+ this.upload(node, path)
+ }
+ }
}
- async frameChecked(frame: CalibrationFrame, event: CheckboxChangeEvent) {
- await this.api.editCalibrationFrame(frame)
+ private async upload(node: CalibrationNode, path: string) {
+ if (node.data.type === 'NAME') {
+ const frames = await this.api.uploadCalibrationFrame(node.data.data, path)
+
+ if (frames.length > 0) {
+ this.electron.calibrationChanged()
+ this.load()
+ }
+ }
+ }
+
+ private async load() {
+ this.frames.length = 0
+
+ const names = await this.api.calibrationGroups()
+
+ for (const name of names) {
+ const nameNode = this.addGroup(name)
+
+ const groups = await this.api.calibrationFrames(name)
+
+ for (const group of groups) {
+ const frameGroupNode = this.addFrameGroup(nameNode, group)!
+
+ for (const frame of group.frames) {
+ this.addFrame(frameGroupNode, frame)
+ }
+ }
+ }
}
openImage(frame: CalibrationFrame) {
this.browserWindow.openImage({ path: frame.path })
}
- replaceFrame(frame: CalibrationFrame) {
- console.info(frame)
+ toggleCalibrationFrame(node: CalibrationNode, enabled: boolean) {
+ if (node.data.type === 'FRAME') {
+ this.api.editCalibrationFrame(node.data.data)
+ }
}
- async deleteFrame(frame: CalibrationFrame) {
- await this.api.deleteCalibrationFrame(frame)
+ async deleteFrame(node: CalibrationNode) {
+ const deleteFromParent = async () => {
+ if (node.parent) {
+ const idx = node.parent.children.indexOf(node)
- if (this.frame === frame) {
- this.frame = undefined
+ if (idx >= 0) {
+ node.parent.children.splice(idx, 1)
+ console.info('frame deleted', node)
+ }
+
+ if (!node.parent.children.length) {
+ await this.deleteFrame(node.parent)
+ }
+ } else {
+ const idx = this.frames.indexOf(node)
+
+ if (idx >= 0) {
+ this.frames.splice(idx, 1)
+ console.info('frame deleted', node)
+ this.electron.calibrationChanged()
+ }
+ }
}
- let index = this.group?.frames?.findIndex(e => e.id === frame.id) ?? -1
+ if (node.data.type === 'FRAME') {
+ await this.api.deleteCalibrationFrame(node.data.data)
+ await deleteFromParent()
+ } else {
+ for (const frame of Array.from(node.children)) {
+ await this.deleteFrame(frame)
+ }
- if (index >= 0) {
- this.group!.frames.splice(index, 1)
+ if (!node.children.length) {
+ await deleteFromParent()
+ }
+ }
+ }
- if (!this.group!.frames.length) {
- index = this.groups.indexOf(this.group!)
+ private calibrationFrameFromNode(node: CalibrationNode) {
+ const frames: CalibrationFrame[] = []
- if (index >= 0) {
- this.groups.splice(index, 1)
- this.group = undefined
+ function recursive(node: TreeNode) {
+ if (node.data!.type === 'NAME' || node.data!.type === 'GROUP') {
+ for (const child of node.children!) {
+ recursive(child)
}
+ } else {
+ frames.push(node.data!.data)
}
}
+
+ recursive(node)
+
+ return frames
+ }
+
+ showNewGroupDialogForAdd() {
+ this.newGroupDialogSave = () => {
+ this.addGroup(this.newGroupName)
+ this.showNewGroupDialog = false
+ }
+
+ this.newGroupName = ''
+ this.showNewGroupDialog = true
}
- async deleteGroupFrames(group: CalibrationFrameGroup) {
- for (const frame of group.frames) {
- await this.api.deleteCalibrationFrame(frame)
+ showNewGroupDialogForEdit(node: CalibrationNode) {
+ if (node.data.type === 'NAME') {
+ this.newGroupDialogSave = async () => {
+ const frames = this.calibrationFrameFromNode(node)
- if (frame === this.frame) {
- this.frame = undefined
+ for (const frame of frames) {
+ frame.name = this.newGroupName
+ await this.api.editCalibrationFrame(frame)
+ this.electron.calibrationChanged()
+ }
+
+ this.showNewGroupDialog = false
+ this.load()
}
+
+ this.newGroupName = node.data.data
+ this.showNewGroupDialog = true
}
+ }
- if (group === this.group) {
- this.group === undefined
+ editGroupName() {
+ this.showNewGroupDialog = false
+ }
+
+ async frameDropped(event: TreeNodeDropEvent) {
+ const dragNode = event.dragNode as CalibrationNode
+ const dropNode = event.dropNode as CalibrationNode
+
+ if (dragNode.data.type === 'FRAME' && dropNode.data.type === 'NAME' &&
+ dragNode.data.data.name !== dropNode.data.data
+ ) {
+ dragNode.data.data.name = dropNode.data.data
+ await this.api.editCalibrationFrame(dragNode.data.data)
+ this.electron.calibrationChanged()
+ this.load()
}
}
}
\ 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 0c4d324ec..0bac743f4 100644
--- a/desktop/src/app/camera/camera.component.html
+++ b/desktop/src/app/camera/camera.component.html
@@ -13,8 +13,8 @@
+
+
+
+
diff --git a/desktop/src/app/alignment/alignment.component.ts b/desktop/src/app/alignment/alignment.component.ts
index d11200c64..922073481 100644
--- a/desktop/src/app/alignment/alignment.component.ts
+++ b/desktop/src/app/alignment/alignment.component.ts
@@ -1,14 +1,15 @@
-import { AfterViewInit, Component, HostListener, NgZone, OnDestroy } from '@angular/core'
+import { AfterViewInit, Component, HostListener, NgZone, OnDestroy, ViewChild } from '@angular/core'
+import { CameraExposureComponent } from '../../shared/components/camera-exposure/camera-exposure.component'
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 { AlignmentMethod, AlignmentPreference, DARVStart, DARVState, Hemisphere, TPPAStart, TPPAState } from '../../shared/types/alignment.types'
import { Angle } from '../../shared/types/atlas.types'
-import { Camera, EMPTY_CAMERA, EMPTY_CAMERA_START_CAPTURE, ExposureTimeUnit } from '../../shared/types/camera.types'
+import { Camera, EMPTY_CAMERA, EMPTY_CAMERA_START_CAPTURE, ExposureTimeUnit, updateCameraStartCaptureFromCamera } from '../../shared/types/camera.types'
import { EMPTY_GUIDE_OUTPUT, GuideDirection, GuideOutput } from '../../shared/types/guider.types'
import { EMPTY_MOUNT, Mount } from '../../shared/types/mount.types'
-import { DEFAULT_SOLVER_TYPES, EMPTY_PLATE_SOLVER_OPTIONS } from '../../shared/types/settings.types'
+import { DEFAULT_SOLVER_TYPES, EMPTY_PLATE_SOLVER_PREFERENCE } from '../../shared/types/settings.types'
import { deviceComparator } from '../../shared/utils/comparators'
import { AppComponent } from '../app.component'
import { CameraComponent } from '../camera/camera.component'
@@ -32,31 +33,29 @@ export class AlignmentComponent implements AfterViewInit, OnDestroy {
tab = 0
running = false
+ pausingOrPaused = false
alignmentMethod?: AlignmentMethod
status: DARVState | TPPAState = 'IDLE'
- elapsedTime = 0
- remainingTime = 0
- progress = 0
- private id = ''
readonly tppaRequest: TPPAStart = {
capture: structuredClone(EMPTY_CAMERA_START_CAPTURE),
- plateSolver: structuredClone(EMPTY_PLATE_SOLVER_OPTIONS),
+ plateSolver: structuredClone(EMPTY_PLATE_SOLVER_PREFERENCE),
startFromCurrentPosition: true,
- eastDirection: true,
+ stepDirection: 'EAST',
compensateRefraction: true,
stopTrackingWhenDone: true,
- stepDistance: 10,
+ stepDuration: 5,
}
readonly plateSolverTypes = Array.from(DEFAULT_SOLVER_TYPES)
+ tppaFailed = false
+ tppaRightAscension: Angle = `00h00m00s`
+ tppaDeclination: Angle = `00°00'00"`
tppaAzimuthError: Angle = `00°00'00"`
tppaAzimuthErrorDirection = ''
tppaAltitudeError: Angle = `00°00'00"`
tppaAltitudeErrorDirection = ''
tppaTotalError: Angle = `00°00'00"`
- tppaRightAscension: Angle = '00h00m00s'
- tppaDeclination: Angle = `00°00'00"`
readonly darvRequest: DARVStart = {
capture: structuredClone(EMPTY_CAMERA_START_CAPTURE),
@@ -67,10 +66,14 @@ export class AlignmentComponent implements AfterViewInit, OnDestroy {
}
readonly driftExposureUnit = ExposureTimeUnit.SECOND
- readonly darvHemispheres: Hemisphere[] = ['NORTHERN', 'SOUTHERN']
darvHemisphere: Hemisphere = 'NORTHERN'
darvDirection?: GuideDirection
+ @ViewChild('cameraExposure')
+ private readonly cameraExposure!: CameraExposureComponent
+
+ private autoResizeTimeout?: any
+
constructor(
app: AppComponent,
private api: ApiService,
@@ -172,50 +175,52 @@ export class AlignmentComponent implements AfterViewInit, OnDestroy {
})
electron.on('TPPA.ELAPSED', event => {
- if (event.id === this.id) {
+ if (event.camera.id === this.camera?.id) {
ngZone.run(() => {
- if (this.status !== 'PAUSING' || event.state === 'PAUSED') {
- this.status = event.state
- }
-
+ this.status = event.state
this.running = event.state !== 'FINISHED'
- this.elapsedTime = event.elapsedTime
+ this.pausingOrPaused = event.state === 'PAUSING' || event.state === 'PAUSED'
if (event.state === 'COMPUTED') {
+ this.tppaFailed = false
+ this.tppaRightAscension = event.rightAscension
+ this.tppaDeclination = event.declination
this.tppaAzimuthError = event.azimuthError
this.tppaAltitudeError = event.altitudeError
this.tppaAzimuthErrorDirection = event.azimuthErrorDirection
this.tppaAltitudeErrorDirection = event.altitudeErrorDirection
this.tppaTotalError = event.totalError
- } else if (event.state === 'SOLVED' || event.state === 'SLEWING') {
+ clearTimeout(this.autoResizeTimeout)
+ this.autoResizeTimeout = electron.autoResizeWindow()
+ } else if (event.state === 'FINISHED') {
+ this.cameraExposure.reset()
+ electron.autoResizeWindow()
+ } else if (event.state === 'SOLVED' || event.state === 'SLEWED') {
+ this.tppaFailed = false
this.tppaRightAscension = event.rightAscension
this.tppaDeclination = event.declination
+ } else if (event.state === 'FAILED') {
+ this.tppaFailed = true
}
- if (!this.running) {
- this.alignmentMethod = undefined
+ if (event.capture && event.capture.state !== 'CAPTURE_FINISHED') {
+ this.cameraExposure.handleCameraCaptureEvent(event.capture, true)
}
})
}
})
electron.on('DARV.ELAPSED', event => {
- if (event.id === this.id) {
+ if (event.camera.id === this.camera?.id) {
ngZone.run(() => {
this.status = event.state
- this.remainingTime = event.remainingTime
- this.progress = event.progress
- this.running = event.remainingTime > 0
+ this.running = this.cameraExposure.handleCameraCaptureEvent(event.capture)
if (event.state === 'FORWARD' || event.state === 'BACKWARD') {
this.darvDirection = event.direction
} else {
this.darvDirection = undefined
}
-
- if (!this.running) {
- this.alignmentMethod = undefined
- }
})
}
})
@@ -236,29 +241,30 @@ export class AlignmentComponent implements AfterViewInit, OnDestroy {
}
async cameraChanged() {
- if (this.camera.name) {
- const camera = await this.api.camera(this.camera.name)
+ if (this.camera.id) {
+ const camera = await this.api.camera(this.camera.id)
Object.assign(this.camera, camera)
this.loadPreference()
}
}
async mountChanged() {
- if (this.mount.name) {
- const mount = await this.api.mount(this.mount.name)
+ if (this.mount.id) {
+ const mount = await this.api.mount(this.mount.id)
Object.assign(this.mount, mount)
+ this.tppaRequest.stepSpeed = mount.slewRate?.name
}
}
async guideOutputChanged() {
- if (this.guideOutput.name) {
- const guideOutput = await this.api.guideOutput(this.guideOutput.name)
+ if (this.guideOutput.id) {
+ const guideOutput = await this.api.guideOutput(this.guideOutput.id)
Object.assign(this.guideOutput, guideOutput)
}
}
mountConnect() {
- if (this.mount.name) {
+ if (this.mount.id) {
if (this.mount.connected) {
this.api.mountDisconnect(this.mount)
} else {
@@ -268,7 +274,7 @@ export class AlignmentComponent implements AfterViewInit, OnDestroy {
}
guideOutputConnect() {
- if (this.guideOutput.name) {
+ if (this.guideOutput.id) {
if (this.guideOutput.connected) {
this.api.guideOutputDisconnect(this.guideOutput)
} else {
@@ -278,7 +284,7 @@ export class AlignmentComponent implements AfterViewInit, OnDestroy {
}
async showCameraDialog() {
- if (this.camera.name) {
+ if (this.camera.id) {
if (this.tab === 0) {
if (await CameraComponent.showAsDialog(this.browserWindow, 'TPPA', this.camera, this.tppaRequest.capture)) {
this.savePreference()
@@ -295,7 +301,7 @@ export class AlignmentComponent implements AfterViewInit, OnDestroy {
}
plateSolverChanged() {
- this.tppaRequest.plateSolver = this.preference.plateSolverOptions(this.tppaRequest.plateSolver.type).get()
+ this.tppaRequest.plateSolver = this.preference.plateSolverPreference(this.tppaRequest.plateSolver.type).get()
this.savePreference()
}
@@ -316,30 +322,29 @@ export class AlignmentComponent implements AfterViewInit, OnDestroy {
this.darvRequest.capture.exposureTime = this.darvRequest.exposureTime * 1000000
this.darvRequest.capture.exposureDelay = this.darvRequest.initialPause
await this.openCameraImage()
- this.id = await this.api.darvStart(this.camera, this.guideOutput, this.darvRequest)
+ await this.api.darvStart(this.camera, this.guideOutput, this.darvRequest)
}
darvStop() {
- this.api.darvStop(this.id)
+ this.api.darvStop(this.camera)
}
async tppaStart() {
this.alignmentMethod = 'TPPA'
await this.openCameraImage()
- this.id = await this.api.tppaStart(this.camera, this.mount, this.tppaRequest)
+ await this.api.tppaStart(this.camera, this.mount, this.tppaRequest)
}
tppaPause() {
- this.status = 'PAUSING'
- this.api.tppaPause(this.id)
+ return this.api.tppaPause(this.camera)
}
tppaUnpause() {
- this.api.tppaUnpause(this.id)
+ return this.api.tppaUnpause(this.camera)
}
tppaStop() {
- this.api.tppaStop(this.id)
+ return this.api.tppaStop(this.camera)
}
openCameraImage() {
@@ -350,18 +355,24 @@ export class AlignmentComponent implements AfterViewInit, OnDestroy {
const preference = this.preference.alignmentPreference.get()
this.tppaRequest.startFromCurrentPosition = preference.tppaStartFromCurrentPosition
- this.tppaRequest.eastDirection = preference.tppaEastDirection
+ this.tppaRequest.stepDirection = preference.tppaStepDirection
this.tppaRequest.compensateRefraction = preference.tppaCompensateRefraction
this.tppaRequest.stopTrackingWhenDone = preference.tppaStopTrackingWhenDone
- this.tppaRequest.stepDistance = preference.tppaStepDistance
+ this.tppaRequest.stepDuration = preference.tppaStepDuration
this.tppaRequest.plateSolver.type = preference.tppaPlateSolverType
this.darvRequest.initialPause = preference.darvInitialPause
this.darvRequest.exposureTime = preference.darvExposureTime
this.darvHemisphere = preference.darvHemisphere
- if (this.camera.name) {
- Object.assign(this.tppaRequest.capture, this.preference.cameraStartCaptureForTPPA(this.camera).get(this.tppaRequest.capture))
- Object.assign(this.darvRequest.capture, this.preference.cameraStartCaptureForDARV(this.camera).get(this.darvRequest.capture))
+ if (this.camera.id) {
+ const cameraPreference = this.preference.cameraPreference(this.camera).get()
+ Object.assign(this.tppaRequest.capture, this.preference.cameraStartCaptureForTPPA(this.camera).get(cameraPreference))
+ Object.assign(this.darvRequest.capture, this.preference.cameraStartCaptureForDARV(this.camera).get(cameraPreference))
+
+ if (this.camera.connected) {
+ updateCameraStartCaptureFromCamera(this.tppaRequest.capture, this.camera)
+ updateCameraStartCaptureFromCamera(this.darvRequest.capture, this.camera)
+ }
}
this.plateSolverChanged()
@@ -376,10 +387,10 @@ export class AlignmentComponent implements AfterViewInit, OnDestroy {
const preference: AlignmentPreference = {
tppaStartFromCurrentPosition: this.tppaRequest.startFromCurrentPosition,
- tppaEastDirection: this.tppaRequest.eastDirection,
+ tppaStepDirection: this.tppaRequest.stepDirection,
tppaCompensateRefraction: this.tppaRequest.compensateRefraction,
tppaStopTrackingWhenDone: this.tppaRequest.stopTrackingWhenDone,
- tppaStepDistance: this.tppaRequest.stepDistance,
+ tppaStepDuration: this.tppaRequest.stepDuration,
tppaPlateSolverType: this.tppaRequest.plateSolver.type,
darvInitialPause: this.darvRequest.initialPause,
darvExposureTime: this.darvRequest.exposureTime,
diff --git a/desktop/src/app/app-routing.module.ts b/desktop/src/app/app-routing.module.ts
index 989fc38bb..bdd1b6a47 100644
--- a/desktop/src/app/app-routing.module.ts
+++ b/desktop/src/app/app-routing.module.ts
@@ -16,6 +16,7 @@ import { HomeComponent } from './home/home.component'
import { ImageComponent } from './image/image.component'
import { INDIComponent } from './indi/indi.component'
import { MountComponent } from './mount/mount.component'
+import { RotatorComponent } from './rotator/rotator.component'
import { SequencerComponent } from './sequencer/sequencer.component'
import { SettingsComponent } from './settings/settings.component'
@@ -45,6 +46,10 @@ const routes: Routes = [
path: 'mount',
component: MountComponent,
},
+ {
+ path: 'rotator',
+ component: RotatorComponent,
+ },
{
path: 'guider',
component: GuiderComponent,
diff --git a/desktop/src/app/app.component.html b/desktop/src/app/app.component.html
index fef76d594..d6c47560e 100644
--- a/desktop/src/app/app.component.html
+++ b/desktop/src/app/app.component.html
@@ -1,4 +1,4 @@
-
Azimuth
{{ tppaAzimuthError }}
- {{ tppaAzimuthErrorDirection }}
+ {{ tppaAzimuthErrorDirection }}
Altitude
{{ tppaAltitudeError }}
- {{ tppaAltitudeErrorDirection }}
+ {{ tppaAltitudeErrorDirection }}
Total
@@ -96,14 +89,15 @@
+ @if (pausingOrPaused) {
+
-
@@ -145,6 +139,17 @@
styleClass="ml-4" pTooltip="View image" tooltipPosition="bottom" size="small" />
+
+ 1. Locate a star in the Meridian and close to declination 0.
+ 2. Start DARV and wait for routine to complete.
+ 3. If you see V shaped track, adjust the Azimuth and repeat the step 2 till you get a line.
+ 4. Locate a star in the Eastern or Western horizon and close to declination 0.
+ 5. Start DARV and wait for routine to complete.
+ 6. If you see V shaped track, adjust the Altitude and repeat the step 5 till you get a line.
+ 7. Increase the drift time and repeat the step 1 to get a more accurate alignment.
+
+ {{ title }}
diff --git a/desktop/src/app/app.component.scss b/desktop/src/app/app.component.scss
index 011a140d7..67a9efabd 100644
--- a/desktop/src/app/app.component.scss
+++ b/desktop/src/app/app.component.scss
@@ -24,4 +24,9 @@
width: 16px;
}
}
+
+ #main {
+ margin-left: 2px;
+ margin-right: 2px;
+ }
}
\ No newline at end of file
diff --git a/desktop/src/app/app.component.ts b/desktop/src/app/app.component.ts
index 0ece200c6..a9058300f 100644
--- a/desktop/src/app/app.component.ts
+++ b/desktop/src/app/app.component.ts
@@ -22,6 +22,7 @@ export class AppComponent implements AfterViewInit {
subTitle? = ''
backgroundColor = '#212121'
topMenu: ExtendedMenuItem[] = []
+ showTopBar = true
get title() {
return this.windowTitle.getTitle()
diff --git a/desktop/src/app/app.module.ts b/desktop/src/app/app.module.ts
index 423d76b89..74dad403c 100644
--- a/desktop/src/app/app.module.ts
+++ b/desktop/src/app/app.module.ts
@@ -5,6 +5,7 @@ import { LOCALE_ID, NgModule } from '@angular/core'
import { FormsModule } from '@angular/forms'
import { BrowserModule } from '@angular/platform-browser'
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
+import { AccordionModule } from 'primeng/accordion'
import { ConfirmationService, MessageService } from 'primeng/api'
import { BadgeModule } from 'primeng/badge'
import { ButtonModule } from 'primeng/button'
@@ -39,6 +40,7 @@ import { TagModule } from 'primeng/tag'
import { TieredMenuModule } from 'primeng/tieredmenu'
import { ToastModule } from 'primeng/toast'
import { TooltipModule } from 'primeng/tooltip'
+import { TreeModule } from 'primeng/tree'
import { CameraExposureComponent } from '../shared/components/camera-exposure/camera-exposure.component'
import { DeviceListButtonComponent } from '../shared/components/device-list-button/device-list-button.component'
import { DeviceListMenuComponent } from '../shared/components/device-list-menu/device-list-menu.component'
@@ -47,6 +49,7 @@ import { HistogramComponent } from '../shared/components/histogram/histogram.com
import { MapComponent } from '../shared/components/map/map.component'
import { MenuItemComponent } from '../shared/components/menu-item/menu-item.component'
import { MoonComponent } from '../shared/components/moon/moon.component'
+import { SlideMenuComponent } from '../shared/components/slide-menu/slide-menu.component'
import { LocationDialog } from '../shared/dialogs/location/location.dialog'
import { NoDropdownDirective } from '../shared/directives/no-dropdown.directive'
import { StopPropagationDirective } from '../shared/directives/stop-propagation.directive'
@@ -76,6 +79,7 @@ import { ImageComponent } from './image/image.component'
import { INDIComponent } from './indi/indi.component'
import { INDIPropertyComponent } from './indi/property/indi-property.component'
import { MountComponent } from './mount/mount.component'
+import { RotatorComponent } from './rotator/rotator.component'
import { SequencerComponent } from './sequencer/sequencer.component'
import { SettingsComponent } from './settings/settings.component'
@@ -108,18 +112,21 @@ import { SettingsComponent } from './settings/settings.component'
INDIComponent,
INDIPropertyComponent,
LocationDialog,
+ MapComponent,
MenuItemComponent,
MoonComponent,
MountComponent,
NoDropdownDirective,
- MapComponent,
+ RotatorComponent,
SequencerComponent,
SettingsComponent,
SkyObjectPipe,
+ SlideMenuComponent,
StopPropagationDirective,
WinPipe,
],
imports: [
+ AccordionModule,
AppRoutingModule,
BadgeModule,
BrowserAnimationsModule,
@@ -160,6 +167,7 @@ import { SettingsComponent } from './settings/settings.component'
TieredMenuModule,
ToastModule,
TooltipModule,
+ TreeModule,
],
providers: [
AnglePipe,
diff --git a/desktop/src/app/atlas/atlas.component.html b/desktop/src/app/atlas/atlas.component.html
index 7b16f9fe8..b8ab9cc80 100644
--- a/desktop/src/app/atlas/atlas.component.html
+++ b/desktop/src/app/atlas/atlas.component.html
@@ -441,5 +441,5 @@
-
-
+
+
-
+Groups
+
+
-
-
-
- Type
- #
- Filter
- Duration
- Size
- Bin
- T. (°C)
- Gain
-
-
-
-
- {{ item.key.type }}
- {{ item.frames.length }}
- {{ 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 }}
-
+
+
+
-
-
-
+ @if (node.data.type === 'NAME') {
+ {{ node.label }}
+ } @else if (node.data.type === 'GROUP') {
+
+
+ } @else if (node.data.type === 'FRAME') {
+
+
+ }
+
+ @if (node.data.type === 'NAME') {
+
+
-
- Frames
-
-
-
-
-
-
- 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 }}
-
-
-
+
+
-
-
+
+
+
+
-
-
-
-
-
-
-
-
- Cooler ({{ camera.coolerPower | number: '1.1-1' }}%)
+ Cooler ({{ camera.coolerPower | number: '1.1-1' }}%)
- Dew heater
+ Dew heater
@@ -92,7 +92,7 @@
- Exposure Mode
+ Exposure Mode
@@ -149,7 +149,7 @@
- Subframe
+ Subframe
@@ -200,27 +200,10 @@
-
-
- @if (equipment.mount?.id || equipment.wheel?.id || equipment.focuser?.id) {
-
- {{ equipment.mount?.name }}
-
-
- {{ equipment.wheel?.name }}
-
-
- {{ equipment.focuser?.name }}
-
- } @else {
-
- No devices to snoop
-
- }
-
-
diff --git a/desktop/src/app/focuser/focuser.component.ts b/desktop/src/app/focuser/focuser.component.ts
index 9e7f62522..d25235a30 100644
--- a/desktop/src/app/focuser/focuser.component.ts
+++ b/desktop/src/app/focuser/focuser.component.ts
@@ -3,8 +3,8 @@ import { ActivatedRoute } from '@angular/router'
import hotkeys from 'hotkeys-js'
import { ApiService } from '../../shared/services/api.service'
import { ElectronService } from '../../shared/services/electron.service'
-import { LocalStorageService } from '../../shared/services/local-storage.service'
-import { EMPTY_FOCUSER, Focuser, FocuserPreference, focuserPreferenceKey } from '../../shared/types/focuser.types'
+import { PreferenceService } from '../../shared/services/preference.service'
+import { EMPTY_FOCUSER, Focuser } from '../../shared/types/focuser.types'
import { AppComponent } from '../app.component'
@Component({
@@ -17,26 +17,14 @@ export class FocuserComponent implements AfterViewInit, OnDestroy {
readonly focuser = structuredClone(EMPTY_FOCUSER)
moving = false
- position = 0
- hasThermometer = false
- temperature = 0
- canAbsoluteMove = false
- canRelativeMove = false
- canAbort = false
- canReverse = false
- reversed = false
- canSync = false
- hasBacklash = false
- maxPosition = 0
-
stepsRelative = 0
stepsAbsolute = 0
constructor(
private app: AppComponent,
private api: ApiService,
- private electron: ElectronService,
- private storage: LocalStorageService,
+ electron: ElectronService,
+ private preference: PreferenceService,
private route: ActivatedRoute,
ngZone: NgZone,
) {
@@ -69,10 +57,10 @@ export class FocuserComponent implements AfterViewInit, OnDestroy {
hotkeys('shift+right', (event) => { event.preventDefault(); this.moveOut(0.5) })
hotkeys('space', (event) => { event.preventDefault(); this.abort() })
hotkeys('ctrl+enter', (event) => { event.preventDefault(); this.moveTo() })
- hotkeys('up', (event) => { event.preventDefault(); this.stepsRelative = Math.min(this.maxPosition, this.stepsRelative + 1) })
+ hotkeys('up', (event) => { event.preventDefault(); this.stepsRelative = Math.min(this.focuser.maxPosition, this.stepsRelative + 1) })
hotkeys('down', (event) => { event.preventDefault(); this.stepsRelative = Math.max(0, this.stepsRelative - 1) })
hotkeys('-', (event) => { event.preventDefault(); this.stepsAbsolute = Math.max(0, this.stepsAbsolute - 1) })
- hotkeys('=', (event) => { event.preventDefault(); this.stepsAbsolute = Math.min(this.maxPosition, this.stepsAbsolute + 1) })
+ hotkeys('=', (event) => { event.preventDefault(); this.stepsAbsolute = Math.min(this.focuser.maxPosition, this.stepsAbsolute + 1) })
}
async ngAfterViewInit() {
@@ -88,8 +76,8 @@ export class FocuserComponent implements AfterViewInit, OnDestroy {
}
async focuserChanged(focuser?: Focuser) {
- if (focuser && focuser.name) {
- focuser = await this.api.focuser(focuser.name)
+ if (focuser && focuser.id) {
+ focuser = await this.api.focuser(focuser.id)
Object.assign(this.focuser, focuser)
this.loadPreference()
@@ -109,33 +97,33 @@ export class FocuserComponent implements AfterViewInit, OnDestroy {
}
}
- moveIn(stepSize: number = 1) {
+ async moveIn(stepSize: number = 1) {
if (!this.moving) {
this.moving = true
- this.api.focuserMoveIn(this.focuser, Math.trunc(this.stepsRelative * stepSize))
+ await this.api.focuserMoveIn(this.focuser, Math.trunc(this.stepsRelative * stepSize))
this.savePreference()
}
}
- moveOut(stepSize: number = 1) {
+ async moveOut(stepSize: number = 1) {
if (!this.moving) {
this.moving = true
- this.api.focuserMoveOut(this.focuser, Math.trunc(this.stepsRelative * stepSize))
+ await this.api.focuserMoveOut(this.focuser, Math.trunc(this.stepsRelative * stepSize))
this.savePreference()
}
}
- moveTo() {
- if (!this.moving && this.stepsAbsolute !== this.position) {
+ async moveTo() {
+ if (!this.moving && this.stepsAbsolute !== this.focuser.position) {
this.moving = true
- this.api.focuserMoveTo(this.focuser, this.stepsAbsolute)
+ await this.api.focuserMoveTo(this.focuser, this.stepsAbsolute)
this.savePreference()
}
}
- sync() {
+ async sync() {
if (!this.moving) {
- this.api.focuserSync(this.focuser, this.stepsAbsolute)
+ await this.api.focuserSync(this.focuser, this.stepsAbsolute)
this.savePreference()
}
}
@@ -145,27 +133,14 @@ export class FocuserComponent implements AfterViewInit, OnDestroy {
}
private update() {
- if (!this.focuser.name) {
- return
+ if (this.focuser.id) {
+ this.moving = this.focuser.moving
}
-
- this.moving = this.focuser.moving
- this.position = this.focuser.position
- this.hasThermometer = this.focuser.hasThermometer
- this.temperature = this.focuser.temperature
- this.canAbsoluteMove = this.focuser.canAbsoluteMove
- this.canRelativeMove = this.focuser.canRelativeMove
- this.canAbort = this.focuser.canAbort
- this.canReverse = this.focuser.canReverse
- this.reversed = this.focuser.reversed
- this.canSync = this.focuser.canSync
- this.hasBacklash = this.focuser.hasBacklash
- this.maxPosition = this.focuser.maxPosition
}
private loadPreference() {
- if (this.focuser.name) {
- const preference = this.storage.get(focuserPreferenceKey(this.focuser), {})
+ if (this.focuser.id) {
+ const preference = this.preference.focuserPreference(this.focuser).get()
this.stepsRelative = preference.stepsRelative ?? 100
this.stepsAbsolute = preference.stepsAbsolute ?? this.focuser.position
}
@@ -173,12 +148,10 @@ export class FocuserComponent implements AfterViewInit, OnDestroy {
private savePreference() {
if (this.focuser.connected) {
- const preference: FocuserPreference = {
- stepsRelative: this.stepsRelative,
- stepsAbsolute: this.stepsAbsolute,
- }
-
- this.storage.set(focuserPreferenceKey(this.focuser), preference)
+ const preference = this.preference.focuserPreference(this.focuser).get()
+ preference.stepsAbsolute = this.stepsAbsolute
+ preference.stepsRelative = this.stepsRelative
+ this.preference.focuserPreference(this.focuser).set(preference)
}
}
}
\ No newline at end of file
diff --git a/desktop/src/app/framing/framing.component.ts b/desktop/src/app/framing/framing.component.ts
index 390825b78..8e6936846 100644
--- a/desktop/src/app/framing/framing.component.ts
+++ b/desktop/src/app/framing/framing.component.ts
@@ -96,11 +96,12 @@ export class FramingComponent implements AfterViewInit, OnDestroy {
}
private frameFromData(data: FramingData) {
+ console.info(data)
this.rightAscension = data.rightAscension ?? this.rightAscension
this.declination = data.declination ?? this.declination
- this.width = data.width ?? this.width
- this.height = data.height ?? this.height
- this.fov = data.fov ?? this.fov
+ this.width = data.width || this.width
+ this.height = data.height || this.height
+ this.fov = data.fov || this.fov
if (data.rotation === 0 || data.rotation) this.rotation = data.rotation
if (data.rightAscension && data.declination) {
diff --git a/desktop/src/app/guider/guider.component.ts b/desktop/src/app/guider/guider.component.ts
index 70ff30f5e..a3c79fd0c 100644
--- a/desktop/src/app/guider/guider.component.ts
+++ b/desktop/src/app/guider/guider.component.ts
@@ -366,8 +366,8 @@ export class GuiderComponent implements AfterViewInit, OnDestroy {
}
async guideOutputChanged() {
- if (this.guideOutput) {
- const guideOutput = await this.api.guideOutput(this.guideOutput.name)
+ if (this.guideOutput?.id) {
+ const guideOutput = await this.api.guideOutput(this.guideOutput.id)
Object.assign(this.guideOutput, guideOutput)
this.update()
diff --git a/desktop/src/app/home/home.component.html b/desktop/src/app/home/home.component.html
index 019937f3a..9bd830683 100644
--- a/desktop/src/app/home/home.component.html
+++ b/desktop/src/app/home/home.component.html
@@ -2,7 +2,7 @@
@@ -38,62 +38,63 @@
[text]="true" pTooltip="Disconnect" tooltipPosition="bottom" />
-
- Enabled
+
Dither (px)
-
+ Enabled
+
+ RA only
+
- Dither in RA only
-
-
+
{
+ if (event.device.id === this.equipment.mount?.id) {
+ ngZone.run(() => {
+ Object.assign(this.equipment.mount!, event.device)
+ })
+ }
+ })
+
+ electron.on('WHEEL.UPDATED', event => {
+ if (event.device.id === this.equipment.wheel?.id) {
+ ngZone.run(() => {
+ Object.assign(this.equipment.wheel!, event.device)
+ })
+ }
+ })
+
+ electron.on('FOCUSER.UPDATED', event => {
+ if (event.device.id === this.equipment.focuser?.id) {
+ ngZone.run(() => {
+ Object.assign(this.equipment.focuser!, event.device)
+ })
+ }
+ })
+
+ electron.on('ROTATOR.UPDATED', event => {
+ if (event.device.id === this.equipment.rotator?.id) {
+ ngZone.run(() => {
+ Object.assign(this.equipment.rotator!, event.device)
+ })
+ }
+ })
+
+ electron.on('CALIBRATION.CHANGED', () => {
+ ngZone.run(() => this.loadCalibrationGroups())
+ })
+
this.cameraModel[1].visible = !app.modal
}
@@ -203,6 +251,8 @@ export class CameraComponent implements AfterContentInit, OnDestroy {
if (!this.app.modal) {
this.loadEquipment()
}
+
+ this.loadCalibrationGroups()
}
@HostListener('window:unload')
@@ -237,8 +287,8 @@ export class CameraComponent implements AfterContentInit, OnDestroy {
}
async cameraChanged(camera?: Camera) {
- if (camera && camera.name) {
- camera = await this.api.camera(camera.name)
+ if (camera && camera.id) {
+ camera = await this.api.camera(camera.id)
Object.assign(this.camera, camera)
this.loadPreference()
@@ -254,73 +304,129 @@ export class CameraComponent implements AfterContentInit, OnDestroy {
}
private async loadEquipment() {
- const makeMountItem = (mount?: Mount) => {
- return {
- icon: mount ? 'mdi mdi-connection' : 'mdi mdi-close',
- label: mount?.name ?? 'None',
- command: () => {
- this.equipment.mount = mount
+ const buildStartTooltip = () => {
+ this.startTooltip =
+ `MOUNT: ${this.equipment.mount?.name ?? 'None'}
+ FILTER WHEEL: ${this.equipment.wheel?.name ?? 'None'}
+ FOCUSER: ${this.equipment.focuser?.name ?? 'None'}
+ ROTATOR: ${this.equipment.rotator?.name ?? 'None'}`
+ }
+
+ const makeItem = (checked: boolean, command: () => void, device?: Device) => {
+ return {
+ icon: device ? 'mdi mdi-connection' : 'mdi mdi-close',
+ label: device?.name ?? 'None',
+ checked,
+ command: async (event: SlideMenuItemCommandEvent) => {
+ command()
+ buildStartTooltip()
this.preference.equipmentForDevice(this.camera).set(this.equipment)
- this.electron.autoResizeWindow()
+ event.parent?.menu?.forEach(item => item.checked = item === event.item)
},
}
}
+ // MOUNT
+
const mounts = await this.api.mounts()
+ this.equipment.mount = mounts.find(e => e.name === this.equipment.mount?.name)
+
+ const makeMountItem = (mount?: Mount) => {
+ return makeItem(this.equipment.mount?.name === mount?.name, () => this.equipment.mount = mount, mount)
+ }
- this.cameraModel[1].items![0].items!.push(makeMountItem())
+ this.cameraModel[1].menu![0].menu!.push(makeMountItem())
for (const mount of mounts) {
- this.cameraModel[1].items![0].items!.push(makeMountItem(mount))
+ this.cameraModel[1].menu![0].menu!.push(makeMountItem(mount))
}
- this.equipment.mount = mounts.find(e => e.name === this.equipment.mount?.name)
+ // FILTER WHEEL
+
+ const wheels = await this.api.wheels()
+ this.equipment.wheel = wheels.find(e => e.name === this.equipment.wheel?.name)
const makeWheelItem = (wheel?: FilterWheel) => {
- return {
- icon: wheel ? 'mdi mdi-connection' : 'mdi mdi-close',
- label: wheel?.name ?? 'None',
- command: () => {
- this.equipment.wheel = wheel
- this.preference.equipmentForDevice(this.camera).set(this.equipment)
- this.electron.autoResizeWindow()
- },
- }
+ return makeItem(this.equipment.wheel?.name === wheel?.name, () => this.equipment.wheel = wheel, wheel)
}
- const wheels = await this.api.wheels()
-
- this.cameraModel[1].items![1].items!.push(makeWheelItem())
+ this.cameraModel[1].menu![1].menu!.push(makeWheelItem())
for (const wheel of wheels) {
- this.cameraModel[1].items![1].items!.push(makeWheelItem(wheel))
+ this.cameraModel[1].menu![1].menu!.push(makeWheelItem(wheel))
}
- this.equipment.wheel = wheels.find(e => e.name === this.equipment.wheel?.name)
+ // FOCUSER
+
+ const focusers = await this.api.focusers()
+ this.equipment.focuser = focusers.find(e => e.name === this.equipment.focuser?.name)
const makeFocuserItem = (focuser?: Focuser) => {
- return {
- icon: focuser ? 'mdi mdi-connection' : 'mdi mdi-close',
- label: focuser?.name ?? 'None',
- command: () => {
- this.equipment.focuser = focuser
- this.preference.equipmentForDevice(this.camera).set(this.equipment)
- this.electron.autoResizeWindow()
+ return makeItem(this.equipment.focuser?.name === focuser?.name, () => this.equipment.focuser = focuser, focuser)
+ }
+
+ this.cameraModel[1].menu![2].menu!.push(makeFocuserItem())
+
+ for (const focuser of focusers) {
+ this.cameraModel[1].menu![2].menu!.push(makeFocuserItem(focuser))
+ }
+
+ // ROTATOR
+
+ const rotators = await this.api.rotators()
+ this.equipment.rotator = rotators.find(e => e.name === this.equipment.rotator?.name)
+
+ const makeRotatorItem = (rotator?: Rotator) => {
+ return makeItem(this.equipment.rotator?.name === rotator?.name, () => this.equipment.rotator = rotator, rotator)
+ }
+
+ this.cameraModel[1].menu![3].menu!.push(makeRotatorItem())
+
+ for (const rotator of rotators) {
+ this.cameraModel[1].menu![3].menu!.push(makeRotatorItem(rotator))
+ }
+
+ buildStartTooltip()
+ }
+
+ private async loadCalibrationGroups() {
+ const groups = await this.api.calibrationGroups()
+ const found = !!groups.find(e => this.request.calibrationGroup === e)
+
+ if (!found) {
+ this.request.calibrationGroup = undefined
+ }
+
+ const makeItem = (name?: string) => {
+ return {
+ label: name ?? 'None',
+ icon: name ? 'mdi mdi-wrench' : 'mdi mdi-close',
+ checked: this.request.calibrationGroup === name,
+ command: (event: SlideMenuItemCommandEvent) => {
+ this.request.calibrationGroup = name
+ this.loadCalibrationGroups()
},
}
}
- const focusers = await this.api.focusers()
+ const menu: ExtendedMenuItem[] = []
- this.cameraModel[1].items![2].items!.push(makeFocuserItem())
+ menu.push({
+ icon: 'mdi mdi-wrench',
+ label: 'Open Calibration',
+ command: () => {
+ return this.browserWindow.openCalibration({ bringToFront: true })
+ },
+ })
- for (const focuser of focusers) {
- this.cameraModel[1].items![2].items!.push(makeFocuserItem(focuser))
- }
+ menu.push(SEPARATOR_MENU_ITEM)
+ menu.push(makeItem())
- this.equipment.focuser = focusers.find(e => e.name === this.equipment.focuser?.name)
+ for (const group of groups) {
+ menu.push(makeItem(group))
+ }
- this.electron.autoResizeWindow()
+ this.calibrationModel = menu
}
connect() {
@@ -379,11 +485,7 @@ export class CameraComponent implements AfterContentInit, OnDestroy {
}
openCameraImage() {
- return this.browserWindow.openCameraImage(this.camera)
- }
-
- openCameraCalibration() {
- return this.browserWindow.openCalibration({ data: this.camera, bringToFront: true })
+ return this.browserWindow.openCameraImage(this.camera, 'CAMERA', this.request)
}
private makeCameraStartCapture(): CameraStartCapture {
@@ -406,7 +508,7 @@ export class CameraComponent implements AfterContentInit, OnDestroy {
async startCapture() {
await this.openCameraImage()
- await this.api.cameraSnoop(this.camera, this.equipment.mount, this.equipment.wheel, this.equipment.focuser)
+ await this.api.cameraSnoop(this.camera, this.equipment)
await this.api.cameraStartCapture(this.camera, this.makeCameraStartCapture())
this.preference.equipmentForDevice(this.camera).set(this.equipment)
}
@@ -465,7 +567,7 @@ export class CameraComponent implements AfterContentInit, OnDestroy {
}
private update() {
- if (this.camera.name) {
+ if (this.camera.id) {
if (this.camera.connected) {
updateCameraStartCaptureFromCamera(this.request, this.camera)
this.updateExposureUnit(this.exposureTimeUnit)
@@ -514,7 +616,7 @@ export class CameraComponent implements AfterContentInit, OnDestroy {
this.request.dither!.amount = preference.dither?.amount ?? 1.5
this.request.dither!.afterExposures = preference.dither?.afterExposures ?? 1
- this.equipment = this.preference.equipmentForDevice(this.camera).get()
+ Object.assign(this.equipment, this.preference.equipmentForDevice(this.camera).get())
}
}
@@ -526,6 +628,7 @@ export class CameraComponent implements AfterContentInit, OnDestroy {
exposureTimeUnit: this.exposureTimeUnit,
exposureMode: this.exposureMode,
subFrame: this.subFrame,
+ savePath: this.request.savePath || this.savePath,
}
this.preference.cameraPreference(this.camera).set(preference)
diff --git a/desktop/src/app/filterwheel/filterwheel.component.html b/desktop/src/app/filterwheel/filterwheel.component.html
index 70d651311..d9f6693d2 100644
--- a/desktop/src/app/filterwheel/filterwheel.component.html
+++ b/desktop/src/app/filterwheel/filterwheel.component.html
@@ -64,7 +64,7 @@
()
readonly request: FlatWizardRequest = {
- captureRequest: structuredClone(EMPTY_CAMERA_START_CAPTURE),
+ capture: structuredClone(EMPTY_CAMERA_START_CAPTURE),
exposureMin: 1,
exposureMax: 2000,
meanTarget: 32768,
@@ -54,7 +55,7 @@ export class FlatWizardComponent implements AfterViewInit, OnDestroy {
constructor(
app: AppComponent,
private api: ApiService,
- electron: ElectronService,
+ private electron: ElectronService,
private browserWindow: BrowserWindowService,
private prime: PrimeService,
private preference: PreferenceService,
@@ -63,27 +64,22 @@ export class FlatWizardComponent implements AfterViewInit, OnDestroy {
app.title = 'Flat Wizard'
electron.on('FLAT_WIZARD.ELAPSED', event => {
- if (event.state === 'EXPOSURING' && event.capture && event.capture.camera?.id === this.camera?.id) {
- ngZone.run(() => {
- this.running = this.cameraExposure.handleCameraCaptureEvent(event.capture!, true)
- })
- } else if (event.state === 'CAPTURED') {
- ngZone.run(() => {
+ ngZone.run(() => {
+ if (event.state === 'EXPOSURING' && event.capture && event.capture.camera?.id === this.camera?.id) {
+ this.running = true
+ this.cameraExposure.handleCameraCaptureEvent(event.capture!, true)
+ } else if (event.state === 'CAPTURED') {
this.running = false
- this.prime.message(`Flat frame saved at ${event.savedPath}`)
- })
- } else if (event.state === 'FAILED') {
- ngZone.run(() => {
+ this.savedPath = event.savedPath
+ this.electron.autoResizeWindow()
+ this.prime.message(`Flat frame captured`)
+ } else if (event.state === 'FAILED') {
this.running = false
+ this.savedPath = undefined
+ this.electron.autoResizeWindow()
this.prime.message(`Failed to find an optimal exposure time from given parameters`, 'error')
- })
- }
-
- if (!this.running) {
- ngZone.run(() => {
- this.cameraExposure.reset()
- })
- }
+ }
+ })
})
electron.on('CAMERA.UPDATED', event => {
@@ -158,13 +154,17 @@ export class FlatWizardComponent implements AfterViewInit, OnDestroy {
ngOnDestroy() { }
async showCameraDialog() {
- if (this.camera.name && await CameraComponent.showAsDialog(this.browserWindow, 'FLAT_WIZARD', this.camera, this.request.captureRequest)) {
- this.preference.cameraStartCaptureForFlatWizard(this.camera).set(this.request.captureRequest)
+ if (this.camera.id && await CameraComponent.showAsDialog(this.browserWindow, 'FLAT_WIZARD', this.camera, this.request.capture)) {
+ this.preference.cameraStartCaptureForFlatWizard(this.camera).set(this.request.capture)
}
}
cameraChanged() {
- this.updateEntryFromCamera(this.camera)
+ if (this.camera.id) {
+ const cameraPreference = this.preference.cameraPreference(this.camera).get()
+ this.request.capture = this.preference.cameraStartCaptureForFlatWizard(this.camera).get(cameraPreference)
+ this.updateEntryFromCamera(this.camera)
+ }
}
wheelConnect() {
@@ -176,43 +176,51 @@ export class FlatWizardComponent implements AfterViewInit, OnDestroy {
}
private updateEntryFromCamera(camera?: Camera) {
- if (camera) {
- const request = this.preference.cameraStartCaptureForFlatWizard(camera).get(this.request.captureRequest)
-
- if (camera.connected) {
- updateCameraStartCaptureFromCamera(request, camera)
- }
-
- this.request.captureRequest = request
+ if (camera && camera.connected) {
+ updateCameraStartCaptureFromCamera(this.request.capture, camera)
}
}
wheelChanged() {
if (this.wheel) {
let filters: FilterSlot[] = []
+ let filtersChanged = true
if (this.wheel.count <= 0) {
this.filters = []
- this.selectedFilters = []
return
} else if (this.wheel.count !== this.filters.length) {
filters = new Array(this.wheel.count)
} else {
filters = this.filters
+ filtersChanged = false
}
- const preference = this.preference.wheelPreference(this.wheel).get()
+ if (filtersChanged) {
+ const preference = this.preference.wheelPreference(this.wheel).get()
+
+ 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
+ }
- for (let position = 1; position <= filters.length; position++) {
- const name = preference.names?.[position - 1] ?? `Filter #${position}`
- const filter = { position, name, dark: false, offset: 0 }
- filters[position - 1] = filter
+ this.filters = filters
+ this.selectedFilters = this.selectedFiltersMap.get(this.wheel.name) ?? []
+ this.selectedFiltersMap.set(this.wheel.name, this.selectedFilters)
}
+ }
+ }
- this.filters = filters
+ async chooseSavePath() {
+ const defaultPath = this.request.capture.savePath
+ const path = await this.electron.openDirectory({ defaultPath })
- this.selectedFilters = this.selectedFiltersMap.get(this.wheel.name) ?? []
- this.selectedFiltersMap.set(this.wheel.name, this.selectedFilters)
+ if (path) {
+ this.request.capture.savePath = path
+ this.savePreference()
}
}
@@ -226,4 +234,10 @@ export class FlatWizardComponent implements AfterViewInit, OnDestroy {
stop() {
this.api.flatWizardStop(this.camera)
}
+
+ savePreference() {
+ if (this.camera.id) {
+ this.preference.cameraStartCaptureForFlatWizard(this.camera).set(this.request.capture)
+ }
+ }
}
diff --git a/desktop/src/app/focuser/focuser.component.html b/desktop/src/app/focuser/focuser.component.html
index 52d394f2f..52fd7de6b 100644
--- a/desktop/src/app/focuser/focuser.component.html
+++ b/desktop/src/app/focuser/focuser.component.html
@@ -17,41 +17,41 @@
-
-
+
+
@@ -35,7 +47,7 @@
+
+
+
+
+
- {{ temperature }}°C
+ {{ focuser.temperature | number: '1.2-2' }}°C
-
-
-
-
-
+
+
+ styleClass="min-w-full w-full px-1 py-2 flex-column">
+ styleClass="min-w-full w-full px-1 py-2 flex-column">
+ styleClass="min-w-full w-full px-1 py-2 flex-column">
+ styleClass="min-w-full w-full px-1 py-2 flex-column">
+ styleClass="min-w-full w-full px-1 py-2 flex-column">
(type: K) {
+ private openDevice(type: K, header: string) {
this.deviceModel.length = 0
const devices: Device[] = type === 'CAMERA' ? this.cameras
: type === 'MOUNT' ? this.mounts
: type === 'FOCUSER' ? this.focusers
: type === 'WHEEL' ? this.wheels
- : []
+ : type === 'ROTATOR' ? this.rotators
+ : []
if (devices.length === 0) return
if (devices.length === 1) return this.openDeviceWindow(type, devices[0] as any)
@@ -318,6 +342,7 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
})
}
+ this.deviceMenu.header = header
this.deviceMenu.show()
}
@@ -335,22 +360,26 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
case 'WHEEL':
this.browserWindow.openWheel({ bringToFront: true, data: device as FilterWheel })
break
+ case 'ROTATOR':
+ this.browserWindow.openRotator({ bringToFront: true, data: device as Rotator })
+ break
}
}
private async openImage(force: boolean = false) {
if (force || this.cameras.length === 0) {
- const defaultPath = this.preference.homeImageDirectory.get()
- const filePath = await this.electron.openFits({ defaultPath })
+ const preference = this.preference.homePreference.get()
+ const path = await this.electron.openImage({ defaultPath: preference.imagePath })
- if (filePath) {
- this.preference.homeImageDirectory.set(path.dirname(filePath))
- this.browserWindow.openImage({ path: filePath, source: 'PATH' })
+ if (path) {
+ preference.imagePath = dirname(path)
+ this.preference.homePreference.set(preference)
+ this.browserWindow.openImage({ path, source: 'PATH' })
}
} else {
const camera = await this.imageMenu.show(this.cameras)
- if (camera) {
+ if (camera && camera !== 'NONE') {
this.browserWindow.openCameraImage(camera)
}
}
@@ -362,7 +391,8 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
case 'CAMERA':
case 'FOCUSER':
case 'WHEEL':
- this.openDevice(type)
+ case 'ROTATOR':
+ this.openDevice(type, type)
break
case 'GUIDER':
this.browserWindow.openGuider({ bringToFront: true })
@@ -414,14 +444,6 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
}
} catch {
this.connection.connected = false
-
- this.cameras = []
- this.mounts = []
- this.focusers = []
- this.wheels = []
- this.domes = []
- this.rotators = []
- this.switches = []
}
} else {
const statuses = await this.api.connectionStatuses()
@@ -431,6 +453,8 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
if (!connection.connected &&
(status.host === connection.host || status.ip === connection.host) &&
status.port === connection.port) {
+ connection.id = status.id
+ connection.type = status.type
connection.connected = true
this.connection = connection
break
@@ -442,5 +466,62 @@ export class HomeComponent implements AfterContentInit, OnDestroy {
}
}
}
+
+ if (!this.connection?.connected) {
+ this.cameras = []
+ this.mounts = []
+ this.focusers = []
+ this.wheels = []
+ this.domes = []
+ this.rotators = []
+ this.switches = []
+ }
+ }
+
+ private scrollPageOf(element: Element) {
+ return parseInt(element.getAttribute('scroll-page') || '0')
+ }
+
+ scrolled(event: Event) {
+ function isVisible(element: Element) {
+ const bound = element.getBoundingClientRect()
+
+ return bound.top >= 0 &&
+ bound.left >= 0 &&
+ bound.bottom <= (window.innerHeight || document.documentElement.clientHeight) &&
+ bound.right <= (window.innerWidth || document.documentElement.clientWidth)
+ }
+
+ let page = 0
+ const scrollChidren = document.getElementsByClassName('scroll-child')
+
+ for (let i = 0; i < scrollChidren.length; i++) {
+ const child = scrollChidren[i]
+
+ if (isVisible(child)) {
+ page = Math.max(page, this.scrollPageOf(child))
+ }
+ }
+
+ this.currentPage = page
+ }
+
+ scrollTo(event: Event, page: number) {
+ this.currentPage = page
+ this.scrollToPage(page)
+ event.stopImmediatePropagation()
+ }
+
+ scrollToPage(page: number) {
+ const scrollChidren = document.getElementsByClassName('scroll-child')
+
+ for (let i = 0; i < scrollChidren.length; i++) {
+ const child = scrollChidren[i]
+
+ if (this.scrollPageOf(child) === page) {
+ child.scrollIntoView({ behavior: 'smooth' })
+ break
+ }
+ }
}
}
diff --git a/desktop/src/app/image/image.component.html b/desktop/src/app/image/image.component.html
index e2fb0d440..ed6372920 100644
--- a/desktop/src/app/image/image.component.html
+++ b/desktop/src/app/image/image.component.html
@@ -10,7 +10,7 @@
@@ -50,18 +50,20 @@
-
Camera
Mount
Guider
Filter Wheel
Focuser
-
+
Rotator
-
+
Dome
-
+
Switch
-
+
+ styleClass="min-w-full w-full px-1 py-2 flex-column">
+ styleClass="min-w-full w-full px-1 py-2 flex-column">
+ styleClass="min-w-full w-full px-1 py-2 flex-column">
+ styleClass="min-w-full w-full px-1 py-2 flex-column">
-
@@ -193,4 +198,4 @@
Sky Atlas
Alignment
Sequencer
-
+
Image Viewer
-
+
Framing
Flat Wizard
INDI
-
+
+
Calculator
-
+
Settings
-
+
+
About
+
+
+
- X: {{ roiX }} Y: {{ roiY }} W: {{ roiWidth }} H: {{ roiHeight }}
+ X: {{ imageROI.x }} Y: {{ imageROI.y }} W: {{ imageROI.width }} H: {{ imageROI.height }}
-
-
-
+
+
-
@@ -146,27 +148,27 @@
-
-
-
-
+
-
+
@@ -174,8 +176,8 @@
-
@@ -184,60 +186,60 @@
-
+
-
+
-
+
-
+
+ [value]="(solver.solved.width.toFixed(2)) + ' x ' + (solver.solved.height.toFixed(2))" />
-
+
-
@@ -245,17 +247,18 @@
@@ -276,16 +279,17 @@
-
-
-
+
-
{{ item | enum }}
@@ -302,9 +306,9 @@
-
@@ -314,10 +318,10 @@
-
+
Name
@@ -406,7 +410,7 @@
-
@@ -292,4 +293,4 @@
-
@@ -483,15 +487,15 @@
-->
-
-
- @for (item of fovs; track $index) {
+
+
+
+
+
+
+(mountPreferenceKey(this.mount), {})
this.targetCoordinateType = preference.targetCoordinateType ?? 'JNOW'
this.targetRightAscension = preference.targetRightAscension ?? '00h00m00s'
diff --git a/desktop/src/app/rotator/rotator.component.html b/desktop/src/app/rotator/rotator.component.html
new file mode 100644
index 000000000..845f17a58
--- /dev/null
+++ b/desktop/src/app/rotator/rotator.component.html
@@ -0,0 +1,50 @@
+
+ @for (item of fov.fovs; track $index) {
-
-
-
+
+
+
+
+
diff --git a/desktop/src/app/image/image.component.ts b/desktop/src/app/image/image.component.ts
index 3b3c4d9e4..4440b1f58 100644
--- a/desktop/src/app/image/image.component.ts
+++ b/desktop/src/app/image/image.component.ts
@@ -1,14 +1,14 @@
-import { AfterViewInit, Component, ElementRef, HostListener, NgZone, OnDestroy, ViewChild } from '@angular/core'
+import { AfterViewInit, Component, ElementRef, HostListener, NgZone, OnDestroy, ViewChild, computed, model } from '@angular/core'
import { ActivatedRoute } from '@angular/router'
import { Interactable } from '@interactjs/types/index'
import hotkeys from 'hotkeys-js'
import interact from 'interactjs'
import createPanZoom, { PanZoom } from 'panzoom'
-import * as path from 'path'
-import { MenuItem } from 'primeng/api'
+import { basename, dirname, extname } from 'path'
import { ContextMenu } from 'primeng/contextmenu'
import { DeviceListMenuComponent } from '../../shared/components/device-list-menu/device-list-menu.component'
import { HistogramComponent } from '../../shared/components/histogram/histogram.component'
+import { ExtendedMenuItem } from '../../shared/components/menu-item/menu-item.component'
import { SEPARATOR_MENU_ITEM } from '../../shared/constants'
import { ApiService } from '../../shared/services/api.service'
import { BrowserWindowService } from '../../shared/services/browser-window.service'
@@ -17,7 +17,7 @@ import { PreferenceService } from '../../shared/services/preference.service'
import { PrimeService } from '../../shared/services/prime.service'
import { CheckableMenuItem, ToggleableMenuItem } from '../../shared/types/app.types'
import { Angle, AstronomicalObject, DeepSkyObject, EquatorialCoordinateJ2000, Star } from '../../shared/types/atlas.types'
-import { DEFAULT_FOV, DetectedStar, EMPTY_IMAGE_SOLVED, FITSHeaderItem, FOV, FOVCamera, FOVTelescope, ImageAnnotation, ImageChannel, ImageData, ImageInfo, ImagePreference, ImageSolved, ImageStatisticsBitOption, SCNRProtectionMethod, SCNR_PROTECTION_METHODS } from '../../shared/types/image.types'
+import { DEFAULT_FOV, EMPTY_IMAGE_SOLVED, FOV, IMAGE_STATISTICS_BIT_OPTIONS, ImageAnnotation, ImageAnnotationDialog, ImageChannel, ImageData, ImageDetectStars, ImageFITSHeadersDialog, ImageFOVDialog, ImageInfo, ImageROI, ImageSCNRDialog, ImageSaveDialog, ImageSolved, ImageSolverDialog, ImageStatisticsBitOption, ImageStretchDialog, ImageTransformation, SCNR_PROTECTION_METHODS } from '../../shared/types/image.types'
import { Mount } from '../../shared/types/mount.types'
import { DEFAULT_SOLVER_TYPES } from '../../shared/types/settings.types'
import { CoordinateInterpolator, InterpolatedCoordinate } from '../../shared/utils/coordinate-interpolation'
@@ -45,40 +45,67 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
@ViewChild('histogram')
private readonly histogram!: HistogramComponent
- debayer = true
- calibrate = true
- mirrorHorizontal = false
- mirrorVertical = false
- invert = false
-
- readonly scnrChannelOptions: ImageChannel[] = ['NONE', 'RED', 'GREEN', 'BLUE']
- readonly scnrProtectionMethodOptions: SCNRProtectionMethod[] = [...SCNR_PROTECTION_METHODS]
-
- showSCNRDialog = false
- scnrChannel: ImageChannel = 'NONE'
- scnrAmount = 0.5
- scnrProtectionMethod: SCNRProtectionMethod = 'AVERAGE_NEUTRAL'
-
- showAnnotationDialog = false
- annotateWithStarsAndDSOs = true
- annotateWithMinorPlanets = false
- annotateWithMinorPlanetsMagLimit = 12.0
-
- autoStretched = true
- showStretchingDialog = false
- stretchShadowHighlight = [0, 65536]
- stretchMidtone = 32768
-
- showSolverDialog = false
- solving = false
- solved = false
- solverBlind = true
- solverCenterRA: Angle = ''
- solverCenterDEC: Angle = ''
- solverRadius = 4
- readonly imageSolved = structuredClone(EMPTY_IMAGE_SOLVED)
- readonly solverTypes = Array.from(DEFAULT_SOLVER_TYPES)
- solverType = this.solverTypes[0]
+ imageInfo?: ImageInfo
+ private imageURL!: string
+ imageData: ImageData = {}
+
+ readonly scnrChannels: { name: string, value?: ImageChannel }[] = [
+ { name: 'None', value: undefined },
+ { name: 'Red', value: 'RED' },
+ { name: 'Green', value: 'GREEN' },
+ { name: 'Blue', value: 'BLUE' },
+ ]
+ readonly scnrMethods = Array.from(SCNR_PROTECTION_METHODS)
+ readonly scnr: ImageSCNRDialog = {
+ showDialog: false,
+ amount: 0.5,
+ method: 'AVERAGE_NEUTRAL',
+ }
+
+ readonly stretch: ImageStretchDialog = {
+ showDialog: false,
+ auto: true,
+ shadow: 0,
+ highlight: 1,
+ midtone: 0.5
+ }
+
+ readonly stretchShadow = model(0)
+ readonly stretchHighlight = model(65536)
+ readonly stretchMidtone = model(32768)
+ readonly stretchShadowAndHighlight = computed(() => [this.stretchShadow(), this.stretchHighlight()])
+
+ readonly transformation: ImageTransformation = {
+ force: false,
+ debayer: true,
+ stretch: this.stretch,
+ mirrorHorizontal: false,
+ mirrorVertical: false,
+ invert: false,
+ scnr: this.scnr
+ }
+
+ calibrationViaCamera = true
+
+ readonly annotation: ImageAnnotationDialog = {
+ showDialog: false,
+ useStarsAndDSOs: true,
+ useMinorPlanets: false,
+ minorPlanetsMagLimit: 18.0,
+ useSimbad: false
+ }
+
+ readonly solver: ImageSolverDialog = {
+ showDialog: false,
+ solving: false,
+ blind: true,
+ centerRA: '',
+ centerDEC: '',
+ radius: 4,
+ solved: structuredClone(EMPTY_IMAGE_SOLVED),
+ types: Array.from(DEFAULT_SOLVER_TYPES),
+ type: 'ASTAP'
+ }
crossHair = false
annotations: ImageAnnotation[] = []
@@ -87,37 +114,30 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
annotationInfo?: AstronomicalObject & Partial
annotationIsVisible = false
- detectedStars: DetectedStar[] = []
- detectedStarsIsVisible = false
+ readonly detectedStars: ImageDetectStars = {
+ visible: false,
+ stars: []
+ }
- showFITSHeadersDialog = false
- fitsHeaders: FITSHeaderItem[] = []
+ readonly fitsHeaders: ImageFITSHeadersDialog = {
+ showDialog: false,
+ headers: []
+ }
showStatisticsDialog = false
- readonly statisticsBitOptions: ImageStatisticsBitOption[] = [
- { name: 'Normalized: [0, 1]', rangeMax: 1, bitLength: 16 },
- { name: '8-bit: [0, 255]', rangeMax: 255, bitLength: 8 },
- { name: '9-bit: [0, 511]', rangeMax: 511, bitLength: 9 },
- { name: '10-bit: [0, 1023]', rangeMax: 1023, bitLength: 10 },
- { name: '12-bit: [0, 4095]', rangeMax: 4095, bitLength: 12 },
- { name: '14-bit: [0, 16383]', rangeMax: 16383, bitLength: 14 },
- { name: '16-bit: [0, 65535]', rangeMax: 65535, bitLength: 16 },
- ]
-
+ readonly statisticsBitOptions: ImageStatisticsBitOption[] = IMAGE_STATISTICS_BIT_OPTIONS
statisticsBitLength = this.statisticsBitOptions[0]
- imageInfo?: ImageInfo
- showFOVDialog = false
- readonly fov = structuredClone(DEFAULT_FOV)
- fovs: FOV[] = []
- editedFOV?: FOV
- showFOVCamerasDialog = false
- fovCameras: FOVCamera[] = []
- fovCamera?: FOVCamera
- showFOVTelescopesDialog = false
- fovTelescopes: FOVTelescope[] = []
- fovTelescope?: FOVTelescope
+ readonly fov: ImageFOVDialog = {
+ ...structuredClone(DEFAULT_FOV),
+ showDialog: false,
+ fovs: [],
+ showCameraDialog: false,
+ cameras: [],
+ showTelescopeDialog: false,
+ telescopes: [],
+ }
get canAddFOV() {
return this.fov.aperture && this.fov.focalLength &&
@@ -127,39 +147,61 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
}
private panZoom?: PanZoom
- private imageURL!: string
private imageMouseX = 0
private imageMouseY = 0
- private imageData: ImageData = {}
- roiX = 0
- roiY = 0
- roiWidth = 128
- roiHeight = 128
roiInteractable?: Interactable
+ readonly imageROI: ImageROI = {
+ x: 0,
+ y: 0,
+ width: 0,
+ height: 0
+ }
+
+ readonly saveAs: ImageSaveDialog = {
+ showDialog: false,
+ format: 'FITS',
+ bitpix: 'BYTE',
+ path: '',
+ shouldBeTransformed: true,
+ transformation: this.transformation
+ }
- private readonly saveAsMenuItem: MenuItem = {
+ private readonly saveAsMenuItem: ExtendedMenuItem = {
label: 'Save as...',
icon: 'mdi mdi-content-save',
command: async () => {
- const path = await this.electron.saveFits()
- if (path) this.api.saveImageAs(this.imageData.path!, path)
+ const preference = this.preference.imagePreference.get()
+
+ const path = await this.electron.saveImage({ defaultPath: preference.savePath })
+
+ if (path) {
+ const extension = extname(path).toLowerCase()
+ this.saveAs.format = extension === '.xisf' ? 'XISF' :
+ extension === '.png' ? 'PNG' : extension === '.jpg' ? 'JPG' : 'FITS'
+ this.saveAs.bitpix = this.imageInfo?.bitpix || 'BYTE'
+ this.saveAs.path = path
+ this.saveAs.showDialog = true
+
+ preference.savePath = dirname(path)
+ this.preference.imagePreference.set(preference)
+ }
},
}
- private readonly plateSolveMenuItem: MenuItem = {
+ private readonly plateSolveMenuItem: ExtendedMenuItem = {
label: 'Plate Solve',
icon: 'mdi mdi-sigma',
command: () => {
- this.showSolverDialog = true
+ this.solver.showDialog = true
},
}
- private readonly stretchMenuItem: MenuItem = {
+ private readonly stretchMenuItem: ExtendedMenuItem = {
label: 'Stretch',
icon: 'mdi mdi-chart-histogram',
command: () => {
- this.showStretchingDialog = true
+ this.stretch.showDialog = true
},
}
@@ -173,12 +215,12 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
},
}
- private readonly scnrMenuItem: MenuItem = {
+ private readonly scnrMenuItem: ExtendedMenuItem = {
label: 'SCNR',
icon: 'mdi mdi-palette',
disabled: true,
command: () => {
- this.showSCNRDialog = true
+ this.scnr.showDialog = true
},
}
@@ -187,8 +229,8 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
icon: 'mdi mdi-flip-horizontal',
checked: false,
command: () => {
- this.mirrorHorizontal = !this.mirrorHorizontal
- this.horizontalMirrorMenuItem.checked = this.mirrorHorizontal
+ this.transformation.mirrorHorizontal = !this.transformation.mirrorHorizontal
+ this.horizontalMirrorMenuItem.checked = this.transformation.mirrorHorizontal
this.loadImage()
},
}
@@ -198,8 +240,8 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
icon: 'mdi mdi-flip-vertical',
checked: false,
command: () => {
- this.mirrorVertical = !this.mirrorVertical
- this.verticalMirrorMenuItem.checked = this.mirrorVertical
+ this.transformation.mirrorVertical = !this.transformation.mirrorVertical
+ this.verticalMirrorMenuItem.checked = this.transformation.mirrorVertical
this.loadImage()
},
}
@@ -213,18 +255,13 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
},
}
- private readonly calibrateMenuItem: CheckableMenuItem = {
- label: 'Calibrate',
- icon: 'mdi mdi-tools',
- checked: true,
- command: () => {
- this.calibrate = !this.calibrate
- this.calibrateMenuItem.checked = this.calibrate
- this.loadImage()
- },
+ private readonly calibrationMenuItem: ExtendedMenuItem = {
+ label: 'Calibration',
+ icon: 'mdi mdi-wrench',
+ items: [],
}
- private readonly statisticsMenuItem: MenuItem = {
+ private readonly statisticsMenuItem: ExtendedMenuItem = {
icon: 'mdi mdi-chart-histogram',
label: 'Statistics',
command: () => {
@@ -233,15 +270,15 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
},
}
- private readonly fitsHeaderMenuItem: MenuItem = {
+ private readonly fitsHeaderMenuItem: ExtendedMenuItem = {
icon: 'mdi mdi-list-box',
label: 'FITS Header',
command: () => {
- this.showFITSHeadersDialog = true
+ this.fitsHeaders.showDialog = true
},
}
- private readonly pointMountHereMenuItem: MenuItem = {
+ private readonly pointMountHereMenuItem: ExtendedMenuItem = {
label: 'Point mount here',
icon: 'mdi mdi-telescope',
disabled: true,
@@ -252,15 +289,15 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
},
}
- private readonly frameAtThisCoordinateMenuItem: MenuItem = {
+ private readonly frameAtThisCoordinateMenuItem: ExtendedMenuItem = {
label: 'Frame at this coordinate',
icon: 'mdi mdi-image',
disabled: true,
command: () => {
- const coordinate = this.mouseCoordinateInterpolation?.interpolateAsText(this.imageMouseX, this.imageMouseY, false, false, false)
+ const coordinate = this.mouseCoordinateInterpolation?.interpolate(this.imageMouseX, this.imageMouseY, false, false)
if (coordinate) {
- this.browserWindow.openFraming({ data: { rightAscension: coordinate.alpha, declination: coordinate.delta } })
+ this.frame(coordinate)
}
},
}
@@ -281,7 +318,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
toggleable: true,
toggled: false,
command: () => {
- this.showAnnotationDialog = true
+ this.annotation.showDialog = true
},
toggle: (event) => {
event.originalEvent?.stopImmediatePropagation()
@@ -296,14 +333,14 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
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
+ this.detectedStars.stars = await this.api.detectStars(this.imageData.path!)
+ this.detectedStars.visible = this.detectedStars.stars.length > 0
+ this.detectStarsMenuItem.toggleable = this.detectedStars.visible
+ this.detectStarsMenuItem.toggled = this.detectedStars.visible
},
toggle: (event) => {
event.originalEvent?.stopImmediatePropagation()
- this.detectedStarsIsVisible = event.checked
+ this.detectedStars.visible = event.checked
},
}
@@ -347,19 +384,19 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
},
}
- private readonly fovMenuItem: MenuItem = {
+ private readonly fovMenuItem: ExtendedMenuItem = {
label: 'Field of View',
icon: 'mdi mdi-camera-metering-spot',
command: () => {
- this.showFOVDialog = !this.showFOVDialog
+ this.fov.showDialog = !this.fov.showDialog
- if (this.showFOVDialog) {
- this.fovs.forEach(e => this.computeFOV(e))
+ if (this.fov.showDialog) {
+ this.fov.fovs.forEach(e => this.computeFOV(e))
}
},
}
- private readonly overlayMenuItem: MenuItem = {
+ private readonly overlayMenuItem: ExtendedMenuItem = {
label: 'Overlay',
icon: 'mdi mdi-layers',
items: [
@@ -382,7 +419,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
this.horizontalMirrorMenuItem,
this.verticalMirrorMenuItem,
this.invertMenuItem,
- this.calibrateMenuItem,
+ this.calibrationMenuItem,
SEPARATOR_MENU_ITEM,
this.overlayMenuItem,
this.statisticsMenuItem,
@@ -396,7 +433,8 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
private mouseCoordinateInterpolation?: CoordinateInterpolator
get isMouseCoordinateVisible() {
- return !!this.mouseCoordinate && !this.mirrorHorizontal && !this.mirrorVertical
+ return !!this.mouseCoordinate && !this.transformation.mirrorHorizontal
+ && !this.transformation.mirrorVertical
}
constructor(
@@ -411,9 +449,51 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
) {
app.title = 'Image'
+ app.topMenu.push({
+ icon: 'mdi mdi-fullscreen',
+ label: 'Fullscreen',
+ command: () => this.enterFullscreen(),
+ })
+
+ app.topMenu.push({
+ icon: 'mdi mdi-minus',
+ label: 'Zoom Out',
+ command: () => this.zoomOut(),
+ })
+
+ app.topMenu.push({
+ icon: 'mdi mdi-plus',
+ label: 'Zoom In',
+ command: () => this.zoomIn(),
+ })
+
+ app.topMenu.push({
+ icon: 'mdi mdi-numeric-0',
+ label: 'Reset Zoom',
+ command: () => this.resetZoom(false),
+ })
+
+ app.topMenu.push({
+ icon: 'mdi mdi-fit-to-screen',
+ label: 'Fit to Screen',
+ command: () => this.resetZoom(true),
+ })
+
+ this.stretchShadow.subscribe(value => {
+ this.stretch.shadow = value / 65536
+ })
+
+ this.stretchHighlight.subscribe(value => {
+ this.stretch.highlight = value / 65536
+ })
+
+ this.stretchMidtone.subscribe(value => {
+ this.stretch.midtone = value / 65536
+ })
+
electron.on('CAMERA.CAPTURE_ELAPSED', async (event) => {
if (event.state === 'EXPOSURE_FINISHED' && event.camera.id === this.imageData.camera?.id) {
- await this.closeImage(event.savePath !== this.imageData.path)
+ await this.closeImage(true)
ngZone.run(() => {
this.imageData.path = event.savePath
@@ -431,17 +511,27 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
})
})
+ electron.on('CALIBRATION.CHANGED', () => {
+ ngZone.run(() => {
+ this.loadCalibrationGroups()
+ })
+ })
+
hotkeys('ctrl+a', (event) => { event.preventDefault(); this.toggleStretch() })
hotkeys('ctrl+i', (event) => { event.preventDefault(); this.invertImage() })
hotkeys('ctrl+x', (event) => { event.preventDefault(); this.toggleCrosshair() })
hotkeys('ctrl+-', (event) => { event.preventDefault(); this.zoomOut() })
hotkeys('ctrl+=', (event) => { event.preventDefault(); this.zoomIn() })
hotkeys('ctrl+0', (event) => { event.preventDefault(); this.resetZoom() })
+ hotkeys('f12', (event) => { if (this.app.showTopBar) { event.preventDefault(); this.enterFullscreen() } })
+ hotkeys('escape', (event) => { if (!this.app.showTopBar) { event.preventDefault(); this.exitFullscreen() } })
this.loadPreference()
}
- ngAfterViewInit() {
+ async ngAfterViewInit() {
+ await this.loadCalibrationGroups()
+
this.route.queryParams.subscribe(e => {
const data = JSON.parse(decodeURIComponent(e.data)) as ImageData
this.loadImageFromData(data)
@@ -455,6 +545,77 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
this.roiInteractable?.unset()
}
+ private markCalibrationGroupItem(name?: string) {
+ this.calibrationMenuItem.items![1].checked = this.calibrationViaCamera
+
+ for (let i = 3; i < this.calibrationMenuItem.items!.length; i++) {
+ const item = this.calibrationMenuItem.items![i]
+ item.checked = item.label === (name ?? 'None')
+ item.disabled = this.calibrationViaCamera
+ }
+ }
+
+ private async loadCalibrationGroups() {
+ const groups = await this.api.calibrationGroups()
+ const found = !!groups.find(e => this.transformation.calibrationGroup === e)
+ let reloadImage = false
+
+ if (!found) {
+ reloadImage = !!this.transformation.calibrationGroup
+ this.transformation.calibrationGroup = undefined
+ this.calibrationViaCamera = true
+ }
+
+ const makeItem = (name?: string) => {
+ const label = name ?? 'None'
+ const icon = name ? 'mdi mdi-wrench' : 'mdi mdi-close'
+
+ return {
+ label, icon,
+ checked: this.transformation.calibrationGroup === name,
+ disabled: this.calibrationViaCamera,
+ command: async () => {
+ this.transformation.calibrationGroup = name
+ this.markCalibrationGroupItem(label)
+ await this.loadImage()
+ },
+ }
+ }
+
+ const menu: ExtendedMenuItem[] = []
+
+ menu.push({
+ label: 'Open',
+ icon: 'mdi mdi-wrench',
+ command: () => this.browserWindow.openCalibration()
+ })
+
+ menu.push({
+ label: 'Camera',
+ icon: 'mdi mdi-camera-iris',
+ checked: this.calibrationViaCamera,
+ command: () => {
+ this.calibrationViaCamera = !this.calibrationViaCamera
+ this.markCalibrationGroupItem(this.transformation.calibrationGroup)
+ }
+ })
+
+ menu.push(SEPARATOR_MENU_ITEM)
+ menu.push(makeItem())
+
+ for (const group of groups) {
+ menu.push(makeItem(group))
+ }
+
+ this.calibrationMenuItem.items = menu
+ this.menu.model = this.contextMenuItems
+ this.menu.cd.markForCheck()
+
+ if (reloadImage) {
+ this.loadImage()
+ }
+ }
+
private async closeImage(force: boolean = false) {
if (this.imageData.path) {
if (force) {
@@ -483,10 +644,10 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
target.setAttribute('data-y', y)
this.ngZone.run(() => {
- this.roiX = Math.round(x)
- this.roiY = Math.round(y)
- this.roiWidth = Math.round(event.rect.width / scale)
- this.roiHeight = Math.round(event.rect.height / scale)
+ this.imageROI.x = Math.round(x)
+ this.imageROI.y = Math.round(y)
+ this.imageROI.width = Math.round(event.rect.width / scale)
+ this.imageROI.height = Math.round(event.rect.height / scale)
})
}
@@ -504,8 +665,8 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
target.setAttribute('data-y', y)
this.ngZone.run(() => {
- this.roiX = Math.round(x)
- this.roiY = Math.round(y)
+ this.imageROI.x = Math.round(x)
+ this.imageROI.y = Math.round(y)
})
}
@@ -514,19 +675,23 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
this.imageData = data
+ // Not clicked on menu item.
+ if (this.calibrationViaCamera && this.transformation.calibrationGroup !== data.capture?.calibrationGroup) {
+ this.transformation.calibrationGroup = data.capture?.calibrationGroup
+ this.markCalibrationGroupItem(this.transformation.calibrationGroup)
+ }
+
if (data.source === 'FRAMING') {
this.disableAutoStretch()
- this.resetStretch(false)
- } else if (data.source === 'FLAT_WIZARD') {
- this.disableCalibrate(false)
- }
- if (!data.camera) {
- this.disableCalibrate()
+ if (this.transformation.stretch.auto) {
+ this.resetStretch(false)
+ }
+ } else if (data.source === 'FLAT_WIZARD') {
+ this.disableCalibration(false)
}
this.clearOverlay()
-
this.loadImage()
}
@@ -535,11 +700,11 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
this.annotationIsVisible = false
this.annotationMenuItem.toggleable = false
- this.detectedStars = []
- this.detectedStarsIsVisible = false
+ this.detectedStars.stars = []
+ this.detectedStars.visible = false
this.detectStarsMenuItem.toggleable = false
- Object.assign(this.imageSolved, EMPTY_IMAGE_SOLVED)
+ Object.assign(this.solver.solved, EMPTY_IMAGE_SOLVED)
this.histogram?.update([])
}
@@ -563,7 +728,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
} 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)
+ this.app.subTitle = basename(this.imageData.path)
} else {
this.app.subTitle = ''
}
@@ -571,31 +736,37 @@ 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.imageData.camera, this.calibrate, this.debayer, !!this.imageData.camera, this.autoStretched,
- this.stretchShadowHighlight[0] / 65536, this.stretchShadowHighlight[1] / 65536, this.stretchMidtone / 65536,
- this.mirrorHorizontal, this.mirrorVertical, this.invert, scnrEnabled, scnrEnabled ? this.scnrChannel : 'GREEN', this.scnrAmount, this.scnrProtectionMethod)
+
+ const transformation = structuredClone(this.transformation)
+ if (this.calibrationViaCamera) transformation.calibrationGroup = this.imageData.capture?.calibrationGroup
+ const { info, blob } = await this.api.openImage(path, transformation, this.imageData.camera)
this.imageInfo = info
this.scnrMenuItem.disabled = info.mono
- if (info.rightAscension) this.solverCenterRA = info.rightAscension
- if (info.declination) this.solverCenterDEC = info.declination
- this.solverBlind = !this.solverCenterRA || !this.solverCenterDEC
+ if (info.rightAscension) this.solver.centerRA = info.rightAscension
+ if (info.declination) this.solver.centerDEC = info.declination
+ this.solver.blind = !this.solver.centerRA || !this.solver.centerDEC
- if (this.autoStretched) {
- this.stretchShadowHighlight = [Math.trunc(info.stretchShadow * 65536), Math.trunc(info.stretchHighlight * 65536)]
- this.stretchMidtone = Math.trunc(info.stretchMidtone * 65536)
+ if (this.stretch.auto) {
+ this.stretchShadow.set(Math.trunc(info.stretchShadow * 65536))
+ this.stretchHighlight.set(Math.trunc(info.stretchHighlight * 65536))
+ this.stretchMidtone.set(Math.trunc(info.stretchMidtone * 65536))
}
this.updateImageSolved(info.solved)
- this.fitsHeaders = info.headers
+ this.fitsHeaders.headers = info.headers
if (this.imageURL) window.URL.revokeObjectURL(this.imageURL)
this.imageURL = window.URL.createObjectURL(blob)
image.src = this.imageURL
+ if (!info.camera?.id) {
+ this.calibrationViaCamera = false
+ this.markCalibrationGroupItem(this.transformation.calibrationGroup)
+ }
+
this.retrieveCoordinateInterpolation()
}
@@ -623,15 +794,20 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
}
}
+ async saveImageAs() {
+ await this.api.saveImageAs(this.imageData!.path!, this.saveAs, this.imageData.camera)
+ this.saveAs.showDialog = false
+ }
+
async annotateImage() {
try {
this.annotating = true
- this.annotations = await this.api.annotationsOfImage(this.imageData.path!,
- this.annotateWithStarsAndDSOs, this.annotateWithMinorPlanets, this.annotateWithMinorPlanetsMagLimit)
+ this.annotations = await this.api.annotationsOfImage(this.imageData.path!, this.annotation.useStarsAndDSOs,
+ this.annotation.useMinorPlanets, this.annotation.minorPlanetsMagLimit, this.annotation.useSimbad)
this.annotationIsVisible = true
this.annotationMenuItem.toggleable = this.annotations.length > 0
this.annotationMenuItem.toggled = this.annotationMenuItem.toggleable
- this.showAnnotationDialog = false
+ this.annotation.showDialog = false
} finally {
this.annotating = false
}
@@ -643,26 +819,27 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
}
private disableAutoStretch() {
- this.autoStretched = false
+ this.stretch.auto = false
this.autoStretchMenuItem.checked = false
}
- private disableCalibrate(canEnable: boolean = true) {
- this.calibrate = false
- this.calibrateMenuItem.checked = false
- this.calibrateMenuItem.disabled = !canEnable
+ private disableCalibration(canEnable: boolean = true) {
+ this.transformation.calibrationGroup = undefined
+ this.markCalibrationGroupItem(undefined)
+ this.calibrationMenuItem.disabled = !canEnable
}
autoStretch() {
- this.autoStretched = true
+ this.stretch.auto = true
this.autoStretchMenuItem.checked = true
this.loadImage()
}
resetStretch(load: boolean = true) {
- this.stretchShadowHighlight = [0, 65536]
- this.stretchMidtone = 32768
+ this.stretchShadow.set(0)
+ this.stretchHighlight.set(65536)
+ this.stretchMidtone.set(32768)
if (load) {
this.stretchImage()
@@ -670,10 +847,10 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
}
toggleStretch() {
- this.autoStretched = !this.autoStretched
- this.autoStretchMenuItem.checked = this.autoStretched
+ this.stretch.auto = !this.stretch.auto
+ this.autoStretchMenuItem.checked = this.stretch.auto
- if (!this.autoStretched) {
+ if (!this.stretch.auto) {
this.resetStretch()
} else {
this.loadImage()
@@ -686,8 +863,8 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
}
invertImage() {
- this.invert = !this.invert
- this.invertMenuItem.checked = this.invert
+ this.transformation.invert = !this.transformation.invert
+ this.invertMenuItem.checked = this.transformation.invert
this.loadImage()
}
@@ -712,9 +889,31 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
this.panZoom.smoothZoomAbs(window.innerWidth / 2, window.innerHeight / 2, scale * 0.9)
}
- resetZoom() {
- if (!this.panZoom) return
- this.panZoom.smoothZoomAbs(window.innerWidth / 2, window.innerHeight / 2, 1.0)
+ center() {
+ const { width, height } = this.image.nativeElement.getBoundingClientRect()
+ this.panZoom?.moveTo(window.innerWidth / 2 - width / 2, (window.innerHeight - 42) / 2 - height / 2)
+ }
+
+ resetZoom(fitToScreen: boolean = false, center: boolean = true) {
+ if (fitToScreen) {
+ const { width, height } = this.image.nativeElement
+ const factor = Math.min(window.innerWidth, window.innerHeight - 42) / Math.min(width, height)
+ this.panZoom?.smoothZoomAbs(window.innerWidth / 2, window.innerHeight / 2, factor)
+ } else {
+ this.panZoom?.smoothZoomAbs(window.innerWidth / 2, window.innerHeight / 2, 1.0)
+ }
+
+ if (center) {
+ this.center()
+ }
+ }
+
+ async enterFullscreen() {
+ this.app.showTopBar = !await this.electron.fullscreenWindow(true)
+ }
+
+ async exitFullscreen() {
+ this.app.showTopBar = !await this.electron.fullscreenWindow(false)
}
private async retrieveCoordinateInterpolation() {
@@ -733,33 +932,32 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
}
async solveImage() {
- this.solving = true
+ this.solver.solving = true
try {
- const options = this.preference.plateSolverOptions(this.solverType).get()
- const solved = await this.api.solveImage(options, this.imageData.path!, this.solverBlind,
- this.solverCenterRA, this.solverCenterDEC, this.solverRadius)
+ const solver = this.preference.plateSolverPreference(this.solver.type).get()
+ const solved = await this.api.solveImage(solver, this.imageData.path!, this.solver.blind,
+ this.solver.centerRA, this.solver.centerDEC, this.solver.radius)
this.savePreference()
this.updateImageSolved(solved)
} catch {
this.updateImageSolved(this.imageInfo?.solved)
} finally {
- this.solving = false
+ this.solver.solving = false
this.retrieveCoordinateInterpolation()
}
}
private updateImageSolved(solved?: ImageSolved) {
- this.solved = !!solved
- Object.assign(this.imageSolved, solved ?? EMPTY_IMAGE_SOLVED)
- this.annotationMenuItem.disabled = !this.solved
- this.fovMenuItem.disabled = !this.solved
- this.pointMountHereMenuItem.disabled = !this.solved
- this.frameAtThisCoordinateMenuItem.disabled = !this.solved
+ Object.assign(this.solver.solved, solved ?? EMPTY_IMAGE_SOLVED)
+ this.annotationMenuItem.disabled = !this.solver.solved.solved
+ this.fovMenuItem.disabled = !this.solver.solved.solved
+ this.pointMountHereMenuItem.disabled = !this.solver.solved.solved
+ this.frameAtThisCoordinateMenuItem.disabled = !this.solver.solved.solved
- if (solved) this.fovs.forEach(e => this.computeFOV(e))
- else this.fovs.forEach(e => e.computed = undefined)
+ if (solved) this.fov.fovs.forEach(e => this.computeFOV(e))
+ else this.fov.fovs.forEach(e => e.computed = undefined)
}
mountSync(coordinate: EquatorialCoordinateJ2000) {
@@ -781,7 +979,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
}
frame(coordinate: EquatorialCoordinateJ2000) {
- this.browserWindow.openFraming({ data: { rightAscension: coordinate.rightAscensionJ2000, declination: coordinate.declinationJ2000, fov: this.imageSolved!.width / 60, rotation: this.imageSolved!.orientation } })
+ this.browserWindow.openFraming({ data: { rightAscension: coordinate.rightAscensionJ2000, declination: coordinate.declinationJ2000, fov: this.solver.solved!.width / 60, rotation: this.solver.solved!.orientation } })
}
imageLoaded() {
@@ -805,69 +1003,69 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
}
async showFOVCameras() {
- if (!this.fovCameras.length) {
- this.fovCameras = await this.api.fovCameras()
+ if (!this.fov.cameras.length) {
+ this.fov.cameras = await this.api.fovCameras()
}
- this.fovCamera = undefined
- this.showFOVCamerasDialog = true
+ this.fov.camera = undefined
+ this.fov.showCameraDialog = true
}
async showFOVTelescopes() {
- if (!this.fovTelescopes.length) {
- this.fovTelescopes = await this.api.fovTelescopes()
+ if (!this.fov.telescopes.length) {
+ this.fov.telescopes = await this.api.fovTelescopes()
}
- this.fovTelescope = undefined
- this.showFOVTelescopesDialog = true
+ this.fov.telescope = undefined
+ this.fov.showTelescopeDialog = true
}
chooseCamera() {
- if (this.fovCamera) {
- this.fov.cameraSize.width = this.fovCamera.width
- this.fov.cameraSize.height = this.fovCamera.height
- this.fov.pixelSize.width = this.fovCamera.pixelSize
- this.fov.pixelSize.height = this.fovCamera.pixelSize
- this.fovCamera = undefined
- this.showFOVCamerasDialog = false
+ if (this.fov.camera) {
+ this.fov.cameraSize.width = this.fov.camera.width
+ this.fov.cameraSize.height = this.fov.camera.height
+ this.fov.pixelSize.width = this.fov.camera.pixelSize
+ this.fov.pixelSize.height = this.fov.camera.pixelSize
+ this.fov.camera = undefined
+ this.fov.showCameraDialog = false
}
}
chooseTelescope() {
- if (this.fovTelescope) {
- this.fov.aperture = this.fovTelescope.aperture
- this.fov.focalLength = this.fovTelescope.focalLength
- this.fovTelescope = undefined
- this.showFOVTelescopesDialog = false
+ if (this.fov.telescope) {
+ this.fov.aperture = this.fov.telescope.aperture
+ this.fov.focalLength = this.fov.telescope.focalLength
+ this.fov.telescope = undefined
+ this.fov.showTelescopeDialog = false
}
}
addFOV() {
if (this.computeFOV(this.fov)) {
- this.fovs.push(structuredClone(this.fov))
- this.preference.imageFOVs.set(this.fovs)
+ this.fov.fovs.push(structuredClone(this.fov))
+ this.preference.imageFOVs.set(this.fov.fovs)
}
}
editFOV(fov: FOV) {
Object.assign(this.fov, structuredClone(fov))
- this.editedFOV = fov
+ this.fov.edited = fov
}
cancelEditFOV() {
- this.editedFOV = undefined
+ this.fov.edited = undefined
}
saveFOV() {
- if (this.editedFOV && this.computeFOV(this.fov)) {
- Object.assign(this.editedFOV, structuredClone(this.fov))
- this.preference.imageFOVs.set(this.fovs)
- this.editedFOV = undefined
+ if (this.fov.edited && this.computeFOV(this.fov)) {
+ Object.assign(this.fov.edited, structuredClone(this.fov))
+ this.preference.imageFOVs.set(this.fov.fovs)
+ this.fov.edited = undefined
}
}
private computeFOV(fov: FOV) {
- if (this.imageInfo && this.imageSolved.scale > 0) {
+ if (this.imageInfo && this.solver.solved.scale > 0) {
const focalLength = fov.focalLength * (fov.barlowReducer || 1)
const resolution = {
@@ -878,8 +1076,8 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
const svg = {
x: this.imageInfo.width / 2,
y: this.imageInfo.height / 2,
- width: fov.cameraSize.width * (resolution.width / this.imageSolved.scale),
- height: fov.cameraSize.height * (resolution.height / this.imageSolved.scale),
+ width: fov.cameraSize.width * (resolution.width / this.solver.solved.scale),
+ height: fov.cameraSize.height * (resolution.height / this.solver.solved.scale),
}
svg.x += (this.imageInfo.width - svg.width) / 2
@@ -907,32 +1105,30 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
}
deleteFOV(fov: FOV) {
- const index = this.fovs.indexOf(fov)
+ const index = this.fov.fovs.indexOf(fov)
if (index >= 0) {
- if (this.fovs[index] === this.editedFOV) {
- this.editedFOV = undefined
+ if (this.fov.fovs[index] === this.fov.edited) {
+ this.fov.edited = undefined
}
- this.fovs.splice(index, 1)
- this.preference.imageFOVs.set(this.fovs)
+ this.fov.fovs.splice(index, 1)
+ this.preference.imageFOVs.set(this.fov.fovs)
}
}
private loadPreference() {
const preference = this.preference.imagePreference.get()
- this.solverRadius = preference.solverRadius ?? this.solverRadius
- this.solverType = preference.solverType ?? this.solverTypes[0]
- this.fovs = this.preference.imageFOVs.get()
- this.fovs.forEach(e => { e.enabled = false; e.computed = undefined })
+ this.solver.radius = preference.solverRadius ?? this.solver.radius
+ this.solver.type = preference.solverType ?? this.solver.types[0]
+ this.fov.fovs = this.preference.imageFOVs.get()
+ this.fov.fovs.forEach(e => { e.enabled = false; e.computed = undefined })
}
private savePreference() {
- const preference: ImagePreference = {
- solverRadius: this.solverRadius,
- solverType: this.solverType
- }
-
+ const preference = this.preference.imagePreference.get()
+ preference.solverRadius = this.solver.radius
+ preference.solverType = this.solver.type
this.preference.imagePreference.set(preference)
}
@@ -949,7 +1145,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy {
} else {
const mount = await this.deviceMenu.show(mounts)
- if (mount && mount.connected) {
+ if (mount && mount !== 'NONE' && mount.connected) {
action(mount)
return true
}
diff --git a/desktop/src/app/indi/indi.component.ts b/desktop/src/app/indi/indi.component.ts
index 13d2591cb..7469cd37b 100644
--- a/desktop/src/app/indi/indi.component.ts
+++ b/desktop/src/app/indi/indi.component.ts
@@ -72,7 +72,7 @@ export class INDIComponent implements AfterViewInit, OnDestroy {
this.route.queryParams.subscribe(e => {
const device = JSON.parse(decodeURIComponent(e.data))
- if ("name" in device && device.name) {
+ if ("id" in device && device.id) {
this.device = device
}
})
diff --git a/desktop/src/app/mount/mount.component.html b/desktop/src/app/mount/mount.component.html
index ff2761b52..0c32f55fc 100644
--- a/desktop/src/app/mount/mount.component.html
+++ b/desktop/src/app/mount/mount.component.html
@@ -10,6 +10,10 @@
+
-
-
@@ -540,15 +544,15 @@
-
@@ -561,7 +565,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Transformed
+
+
+
@@ -218,5 +222,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.type }}
+ {{ item.host }}:{{ item.port }}
+
+
+
+
+
\ No newline at end of file
diff --git a/desktop/src/app/rotator/rotator.component.scss b/desktop/src/app/rotator/rotator.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/desktop/src/app/rotator/rotator.component.ts b/desktop/src/app/rotator/rotator.component.ts
new file mode 100644
index 000000000..20843f897
--- /dev/null
+++ b/desktop/src/app/rotator/rotator.component.ts
@@ -0,0 +1,132 @@
+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 { EMPTY_ROTATOR, Rotator } from '../../shared/types/rotator.types'
+import { AppComponent } from '../app.component'
+
+@Component({
+ selector: 'app-rotator',
+ templateUrl: './rotator.component.html',
+ styleUrls: ['./rotator.component.scss'],
+})
+export class RotatorComponent implements AfterViewInit, OnDestroy {
+
+ readonly rotator = structuredClone(EMPTY_ROTATOR)
+
+ moving = false
+ reversed = false
+ angle = 0
+
+ constructor(
+ private app: AppComponent,
+ private api: ApiService,
+ electron: ElectronService,
+ private preference: PreferenceService,
+ private route: ActivatedRoute,
+ ngZone: NgZone,
+ ) {
+ app.title = 'Rotator'
+
+ electron.on('ROTATOR.UPDATED', event => {
+ if (event.device.id === this.rotator.id) {
+ ngZone.run(() => {
+ Object.assign(this.rotator, event.device)
+ this.update()
+ })
+ }
+ })
+
+ electron.on('ROTATOR.DETACHED', event => {
+ if (event.device.id === this.rotator.id) {
+ ngZone.run(() => {
+ Object.assign(this.rotator, EMPTY_ROTATOR)
+ })
+ }
+ })
+ }
+
+ async ngAfterViewInit() {
+ this.route.queryParams.subscribe(e => {
+ const rotator = JSON.parse(decodeURIComponent(e.data)) as Rotator
+ this.rotatorChanged(rotator)
+ })
+ }
+
+ @HostListener('window:unload')
+ ngOnDestroy() {
+ this.abort()
+ }
+
+ async rotatorChanged(rotator?: Rotator) {
+ if (rotator && rotator.id) {
+ rotator = await this.api.rotator(rotator.id)
+ Object.assign(this.rotator, rotator)
+
+ this.loadPreference()
+ this.update()
+ }
+
+ if (this.app) {
+ this.app.subTitle = rotator?.name ?? ''
+ }
+ }
+
+ connect() {
+ if (this.rotator.connected) {
+ this.api.rotatorDisconnect(this.rotator)
+ } else {
+ this.api.rotatorConnect(this.rotator)
+ }
+ }
+
+ reverse(enabled: boolean) {
+ this.api.focuserReverse(this.rotator, enabled)
+ }
+
+ async move() {
+ if (!this.moving) {
+ this.moving = true
+ await this.api.rotatorMove(this.rotator, this.angle)
+ this.savePreference()
+ }
+ }
+
+ async sync() {
+ if (!this.moving) {
+ await this.api.rotatorSync(this.rotator, this.angle)
+ this.savePreference()
+ }
+ }
+
+ abort() {
+ this.api.rotatorAbort(this.rotator)
+ }
+
+ home() {
+ this.api.rotatorHome(this.rotator)
+ }
+
+ private update() {
+ if (this.rotator.id) {
+ this.moving = this.rotator.moving
+ this.reversed = this.rotator.reversed
+ }
+ }
+
+ private loadPreference() {
+ if (this.rotator.id) {
+ const preference = this.preference.rotatorPreference(this.rotator).get()
+ this.angle = preference.angle ?? 0
+ }
+ }
+
+ private savePreference() {
+ if (this.rotator.connected) {
+ const preference = this.preference.rotatorPreference(this.rotator).get()
+ preference.angle = this.angle
+ this.preference.rotatorPreference(this.rotator).set(preference)
+ }
+ }
+}
\ No newline at end of file
diff --git a/desktop/src/app/sequencer/sequencer.component.html b/desktop/src/app/sequencer/sequencer.component.html
index 69b4e197e..c0d2c9ed8 100644
--- a/desktop/src/app/sequencer/sequencer.component.html
+++ b/desktop/src/app/sequencer/sequencer.component.html
@@ -135,9 +135,10 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ moving ? 'moving' : 'idle' }}
+
+
+
+
+
+
+
+
+
+ Reversed
+
+
+
+
+
-
@@ -189,7 +190,7 @@
-
-
-
-
-
-
-
-
- {{ item.label }}
-
-
-
- ()
-
- readonly database: DatabaseEntry[] = []
- databaseEntry?: DatabaseEntry
-
- readonly menu: MenuItem[] = [
- {
- icon: 'mdi mdi-map-marker',
- label: 'Location',
- },
- {
- icon: 'mdi mdi-sigma',
- label: 'Plate Solver',
- },
- {
- icon: 'mdi mdi-database',
- label: 'Local Storage',
- },
- ]
-
- selectedMenu = this.menu[0]
+ readonly solvers = new Map()
constructor(
app: AppComponent,
@@ -58,16 +36,8 @@ export class SettingsComponent implements AfterViewInit, OnDestroy {
this.location = preference.selectedLocation.get(this.locations[0])
for (const type of this.solverTypes) {
- this.solvers.set(type, preference.plateSolverOptions(type).get())
+ this.solvers.set(type, preference.plateSolverPreference(type).get())
}
-
- for (let i = 0; i < localStorage.length; i++) {
- const key = localStorage.key(i)!
- const value = localStorage.getItem(key)
- this.database.push({ key, value })
- }
-
- this.database.sort(compareBy('key', textComparator))
}
async ngAfterViewInit() { }
@@ -139,19 +109,9 @@ export class SettingsComponent implements AfterViewInit, OnDestroy {
}
}
- deleteDatabaseEntry() {
- if (this.databaseEntry) {
- localStorage.removeItem(this.databaseEntry.key)
-
- const index = this.database.indexOf(this.databaseEntry)
- this.database.splice(index, 1)
- this.databaseEntry = undefined
- }
- }
-
save() {
for (const type of this.solverTypes) {
- this.preference.plateSolverOptions(type).set(this.solvers.get(type)!)
+ this.preference.plateSolverPreference(type).set(this.solvers.get(type)!)
}
}
}
\ No newline at end of file
diff --git a/desktop/src/shared/components/camera-exposure/camera-exposure.component.html b/desktop/src/shared/components/camera-exposure/camera-exposure.component.html
index 0b4fc1559..c832817ce 100644
--- a/desktop/src/shared/components/camera-exposure/camera-exposure.component.html
+++ b/desktop/src/shared/components/camera-exposure/camera-exposure.component.html
@@ -1,47 +1,45 @@
(devices: T[]) {
- const model: MenuItem[] = []
+ show(devices: T[], selected?: NoInfer) {
+ const model: ExtendedMenuItem[] = []
- return new Promise((resolve) => {
+ return new Promise((resolve) => {
if (devices.length <= 0) {
resolve(undefined)
this.prime.message('Please connect your equipment first!', 'warn')
@@ -49,10 +56,21 @@ export class DeviceListMenuComponent {
model.push(SEPARATOR_MENU_ITEM)
}
+ if (this.hasNone) {
+ model.push({
+ icon: 'mdi mdi-close',
+ label: 'None',
+ command: () => {
+ resolve('NONE')
+ },
+ })
+ }
+
for (const device of devices.sort(deviceComparator)) {
model.push({
icon: 'mdi mdi-connection',
label: device.name,
+ checked: selected === device,
disabled: this.disableIfDeviceIsNotConnected && !device.connected,
command: () => {
resolve(device)
diff --git a/desktop/src/shared/components/dialog-menu/dialog-menu.component.html b/desktop/src/shared/components/dialog-menu/dialog-menu.component.html
index 05cb72c40..b47d4b1e8 100644
--- a/desktop/src/shared/components/dialog-menu/dialog-menu.component.html
+++ b/desktop/src/shared/components/dialog-menu/dialog-menu.component.html
@@ -1,4 +1,5 @@
-
\ No newline at end of file
diff --git a/desktop/src/shared/components/dialog-menu/dialog-menu.component.scss b/desktop/src/shared/components/dialog-menu/dialog-menu.component.scss
index c73707ea5..9900160b2 100644
--- a/desktop/src/shared/components/dialog-menu/dialog-menu.component.scss
+++ b/desktop/src/shared/components/dialog-menu/dialog-menu.component.scss
@@ -1,13 +1,5 @@
:host {
::ng-deep {
- .p-slidemenu {
- background: #272727;
- color: rgba(255, 255, 255, 0.87);
- border: 0px;
- border-radius: 0px;
- padding: 12px;
- }
-
.p-menuitem-content {
border-radius: 4px;
}
diff --git a/desktop/src/shared/components/dialog-menu/dialog-menu.component.ts b/desktop/src/shared/components/dialog-menu/dialog-menu.component.ts
index 886f20d06..7c811cfb5 100644
--- a/desktop/src/shared/components/dialog-menu/dialog-menu.component.ts
+++ b/desktop/src/shared/components/dialog-menu/dialog-menu.component.ts
@@ -1,6 +1,6 @@
-import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'
-import { MenuItem } from 'primeng/api'
-import { SlideMenu } from 'primeng/slidemenu'
+import { Component, EventEmitter, Input, Output } from '@angular/core'
+import { ExtendedMenuItem } from '../menu-item/menu-item.component'
+import { SlideMenuItemCommandEvent } from '../slide-menu/slide-menu.component'
@Component({
selector: 'neb-dialog-menu',
@@ -16,14 +16,15 @@ export class DialogMenuComponent {
readonly visibleChange = new EventEmitter()
@Input()
- model: MenuItem[] = []
+ model: ExtendedMenuItem[] = []
- @ViewChild('menu')
- private readonly menu!: SlideMenu
+ @Input()
+ header?: string
- viewportHeight = 35
+ @Input()
+ updateHeaderWithMenuLabel: boolean = true
- private readonly items: any[][] = []
+ private navigationHeader: (string | undefined)[] = []
show() {
this.visible = true
@@ -32,37 +33,29 @@ export class DialogMenuComponent {
hide() {
this.visible = false
+ this.navigationHeader.length = 0
this.visibleChange.emit(false)
}
- private computeViewportHeightFromProcessedItem() {
- const size = this.items[this.items.length - 1].length
-
- if (size) {
- this.viewportHeight = 35 * (size + 1)
- } else {
+ next(event: SlideMenuItemCommandEvent) {
+ if (!event.item?.menu?.length) {
this.hide()
- }
- }
-
- protected onShow() {
- const onItemClick = this.menu.onItemClick
-
- this.items.length = 0
- this.items.push(this.menu.processedItems)
+ } else {
+ this.navigationHeader.push(this.header)
- this.menu.onItemClick = (e) => {
- this.items.push(e.processedItem.items)
- this.computeViewportHeightFromProcessedItem()
- onItemClick.call(this.menu, e)
+ if (this.updateHeaderWithMenuLabel) {
+ this.header = event.item?.label
+ }
}
+ }
- const goBack = this.menu.goBack
+ back() {
+ if (this.navigationHeader.length) {
+ const header = this.navigationHeader.splice(this.navigationHeader.length - 1, 1)[0]
- this.menu.goBack = (e) => {
- this.items.splice(this.items.length - 1, 1)
- this.computeViewportHeightFromProcessedItem()
- goBack.call(this.menu, e)
+ if (this.updateHeaderWithMenuLabel) {
+ this.header = header
+ }
}
}
}
\ No newline at end of file
diff --git a/desktop/src/shared/components/menu-item/menu-item.component.html b/desktop/src/shared/components/menu-item/menu-item.component.html
index 78e6f5bd4..a1482f4b4 100644
--- a/desktop/src/shared/components/menu-item/menu-item.component.html
+++ b/desktop/src/shared/components/menu-item/menu-item.component.html
@@ -1,14 +1,13 @@
-
+
, Partial {
+ menu?: ExtendedMenuItem[]
+}
+
@Component({
selector: 'neb-menu-item',
templateUrl: './menu-item.component.html',
@@ -10,5 +14,5 @@ import { CheckableMenuItem, ToggleableMenuItem } from '../../types/app.types'
export class MenuItemComponent {
@Input({ required: true })
- readonly item!: MenuItem | CheckableMenuItem | ToggleableMenuItem
+ readonly item!: ExtendedMenuItem
}
\ No newline at end of file
diff --git a/desktop/src/shared/components/slide-menu/slide-menu.component.html b/desktop/src/shared/components/slide-menu/slide-menu.component.html
new file mode 100644
index 000000000..3cc80d1a2
--- /dev/null
+++ b/desktop/src/shared/components/slide-menu/slide-menu.component.html
@@ -0,0 +1,8 @@
+ | string | null | undefined | any
+
+ @Output()
+ readonly onNext = new EventEmitter()
+
+ @Output()
+ readonly onBack = new EventEmitter()
+
+ menu!: SlideMenu
+ private readonly navigation: SlideMenu[] = []
+
+ ngOnInit() {
+ this.processMenu(this.model, 0)
+ this.menu = this.model
+ }
+
+ back(event: MouseEvent) {
+ if (this.navigation.length) {
+ this.menu = this.navigation.splice(this.navigation.length - 1, 1)[0]
+ this.onBack.emit(undefined)
+ }
+ }
+
+ private processMenu(menu: SlideMenu, level: number, parent?: SlideMenuItem) {
+ for (const item of menu) {
+ const command = item.command
+
+ if (item.menu?.length) {
+ item.command = (event: SlideMenuItemCommandEvent) => {
+ this.menu = item.menu!
+ this.navigation.push(menu)
+ event.parent = parent
+ event.level = level
+ command?.(event)
+ this.onNext.emit(event)
+ }
+
+ this.processMenu(item.menu, level + 1, item)
+ } else {
+ item.command = (event: SlideMenuItemCommandEvent) => {
+ event.parent = parent
+ event.level = level
+ command?.(event)
+ this.onNext.emit(event)
+ }
+ }
+ }
+ }
+}
diff --git a/desktop/src/shared/constants.ts b/desktop/src/shared/constants.ts
index 0d6e1f0b3..5a2628fdf 100644
--- a/desktop/src/shared/constants.ts
+++ b/desktop/src/shared/constants.ts
@@ -1,4 +1,4 @@
-import { MenuItem } from 'primeng/api'
+import { ExtendedMenuItem } from './components/menu-item/menu-item.component'
export const EVERY_MINUTE_CRON_TIME = '0 */1 * * * *'
@@ -6,6 +6,6 @@ export const TWO_DIGITS_FORMATTER = new Intl.NumberFormat('en-US', { minimumInte
export const THREE_DIGITS_FORMATTER = new Intl.NumberFormat('en-US', { minimumIntegerDigits: 3, minimumFractionDigits: 0, maximumFractionDigits: 0 })
export const ONE_DECIMAL_PLACE_FORMATTER = new Intl.NumberFormat('en-US', { minimumFractionDigits: 1, maximumFractionDigits: 1 })
-export const SEPARATOR_MENU_ITEM: MenuItem = {
+export const SEPARATOR_MENU_ITEM: ExtendedMenuItem = {
separator: true,
}
diff --git a/desktop/src/shared/pipes/enum.pipe.ts b/desktop/src/shared/pipes/enum.pipe.ts
index 48fb830c2..c84525f23 100644
--- a/desktop/src/shared/pipes/enum.pipe.ts
+++ b/desktop/src/shared/pipes/enum.pipe.ts
@@ -6,7 +6,7 @@ import { GuideState } from '../types/guider.types'
import { SCNRProtectionMethod } from '../types/image.types'
export type EnumPipeKey = SCNRProtectionMethod | Constellation | SkyObjectType | SatelliteGroupType |
- DARVState | TPPAState | GuideState | CameraCaptureState | 'ALL'
+ DARVState | TPPAState | GuideState | CameraCaptureState | 'ALL' | string
@Pipe({ name: 'enum' })
export class EnumPipe implements PipeTransform {
@@ -328,6 +328,7 @@ export class EnumPipe implements PipeTransform {
'BACKWARD': 'Backward',
'IDLE': 'Idle',
'SLEWING': 'Slewing',
+ 'SLEWED': 'Slewed',
'SOLVING': 'Solving',
'SOLVED': 'Solved',
'COMPUTED': 'Computed',
diff --git a/desktop/src/shared/services/api.service.ts b/desktop/src/shared/services/api.service.ts
index eda61dc42..426feeabc 100644
--- a/desktop/src/shared/services/api.service.ts
+++ b/desktop/src/shared/services/api.service.ts
@@ -9,11 +9,12 @@ import { FlatWizardRequest } from '../types/flat-wizard.types'
import { Focuser } from '../types/focuser.types'
import { HipsSurvey } from '../types/framing.types'
import { GuideDirection, GuideOutput, Guider, GuiderHistoryStep, SettleInfo } from '../types/guider.types'
-import { ConnectionStatus, ConnectionType } from '../types/home.types'
-import { CoordinateInterpolation, DetectedStar, FOVCamera, FOVTelescope, ImageAnnotation, ImageChannel, ImageInfo, ImageSolved, SCNRProtectionMethod } from '../types/image.types'
-import { CelestialLocationType, Mount, SlewRate, TrackMode } from '../types/mount.types'
+import { ConnectionStatus, ConnectionType, Equipment } from '../types/home.types'
+import { CoordinateInterpolation, DetectedStar, FOVCamera, FOVTelescope, ImageAnnotation, ImageInfo, ImageSaveDialog, ImageSolved, ImageTransformation } from '../types/image.types'
+import { CelestialLocationType, Mount, MountRemoteControl, MountRemoteControlType, SlewRate, TrackMode } from '../types/mount.types'
+import { Rotator } from '../types/rotator.types'
import { SequencePlan } from '../types/sequencer.types'
-import { PlateSolverOptions } from '../types/settings.types'
+import { PlateSolverPreference } from '../types/settings.types'
import { FilterWheel } from '../types/wheel.types'
import { HttpService } from './http.service'
@@ -51,42 +52,43 @@ export class ApiService {
return this.http.get(`cameras`)
}
- camera(name: string) {
- return this.http.get(`cameras/${name}`)
+ camera(id: string) {
+ return this.http.get(`cameras/${id}`)
}
cameraConnect(camera: Camera) {
- return this.http.put(`cameras/${camera.name}/connect`)
+ return this.http.put(`cameras/${camera.id}/connect`)
}
cameraDisconnect(camera: Camera) {
- return this.http.put(`cameras/${camera.name}/disconnect`)
+ return this.http.put(`cameras/${camera.id}/disconnect`)
}
cameraIsCapturing(camera: Camera) {
- return this.http.get(`cameras/${camera.name}/capturing`)
+ return this.http.get(`cameras/${camera.id}/capturing`)
}
// TODO: Rotator
- cameraSnoop(camera: Camera, mount?: Mount, wheel?: FilterWheel, focuser?: Focuser) {
- const query = this.http.query({ mount: mount?.name, wheel: wheel?.name, focuser: focuser?.name })
- return this.http.put(`cameras/${camera.name}/snoop?${query}`)
+ cameraSnoop(camera: Camera, equipment: Equipment) {
+ const { mount, wheel, focuser, rotator } = equipment
+ const query = this.http.query({ mount: mount?.name, wheel: wheel?.name, focuser: focuser?.name, rotator: rotator?.name })
+ return this.http.put
-
+
+
+
-
+
-
-
-
-
\ No newline at end of file
diff --git a/desktop/src/app/settings/settings.component.ts b/desktop/src/app/settings/settings.component.ts
index 428981c3c..4567d72ce 100644
--- a/desktop/src/app/settings/settings.component.ts
+++ b/desktop/src/app/settings/settings.component.ts
@@ -1,14 +1,12 @@
import { AfterViewInit, Component, HostListener, OnDestroy } from '@angular/core'
import path from 'path'
-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 { PreferenceService } from '../../shared/services/preference.service'
import { PrimeService } from '../../shared/services/prime.service'
import { EMPTY_LOCATION, Location } from '../../shared/types/atlas.types'
-import { DEFAULT_SOLVER_TYPES, DatabaseEntry, PlateSolverOptions, PlateSolverType } from '../../shared/types/settings.types'
-import { compareBy, textComparator } from '../../shared/utils/comparators'
+import { DEFAULT_SOLVER_TYPES, PlateSolverPreference, PlateSolverType } from '../../shared/types/settings.types'
import { AppComponent } from '../app.component'
@Component({
@@ -23,27 +21,7 @@ export class SettingsComponent implements AfterViewInit, OnDestroy {
readonly solverTypes = Array.from(DEFAULT_SOLVER_TYPES)
solverType = this.solverTypes[0]
- readonly solvers = new Map
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
-
-
-
-
-
-
- {{ item.key }}
- {{ item.value }}
-
-
-
+
-
- {{ databaseEntry.key }}
-
-
- {{ databaseEntry.value }}
+
+
+
+
-
- {{ (state ?? 'IDLE') | enum | lowercase }}
+ {{ (info || state || 'IDLE') | enum | lowercase }}
- {{ exposure.count }} / {{ capture.amount }}
+ {{ capture.count }} / {{ capture.amount }}
+ @if (!capture.looping) {
{{ capture.progress * 100 | number:'1.1-1' }}
+ }
@if (capture.looping) {
{{ capture.elapsedTime | exposureTime }}
- } @else if(showRemainingTime) {
-
- {{ capture.remainingTime | exposureTime }}
-
} @else {
- {{ capture.elapsedTime | exposureTime }}
+ (click)="showRemainingTime = !showRemainingTime">
+
+ {{ capture.remainingTime | exposureTime }}
+
+
+ {{ capture.elapsedTime | exposureTime }}
+
}
- @if (state === 'EXPOSURING') {
-
- {{ exposure.remainingTime | exposureTime }}
+ @if (capture.amount !== 1 && (state === 'EXPOSURING' || state === 'WAITING')) {
+
+
+ {{ step.remainingTime | exposureTime }}
+
+
+ {{ step.elapsedTime | exposureTime }}
+
- {{ exposure.progress * 100 | number:'1.1-1' }}
-
- }
-
- @if (state === 'WAITING') {
-
- {{ wait.remainingTime | exposureTime }}
-
-
- {{ wait.progress * 100 | number:'1.1-1' }}
+ {{ step.progress * 100 | number:'1.1-1' }}
}
diff --git a/desktop/src/shared/components/camera-exposure/camera-exposure.component.ts b/desktop/src/shared/components/camera-exposure/camera-exposure.component.ts
index 0115b0389..c25094060 100644
--- a/desktop/src/shared/components/camera-exposure/camera-exposure.component.ts
+++ b/desktop/src/shared/components/camera-exposure/camera-exposure.component.ts
@@ -1,5 +1,5 @@
import { Component, Input } from '@angular/core'
-import { CameraCaptureElapsed, CameraCaptureState, EMPTY_CAMERA_CAPTURE_INFO, EMPTY_CAMERA_EXPOSURE_INFO, EMPTY_CAMERA_WAIT_INFO } from '../../types/camera.types'
+import { CameraCaptureEvent, CameraCaptureState, EMPTY_CAMERA_CAPTURE_INFO, EMPTY_CAMERA_STEP_INFO } from '../../types/camera.types'
@Component({
selector: 'neb-camera-exposure',
@@ -9,35 +9,35 @@ import { CameraCaptureElapsed, CameraCaptureState, EMPTY_CAMERA_CAPTURE_INFO, EM
export class CameraExposureComponent {
@Input()
- state?: CameraCaptureState = 'IDLE'
+ info?: string
@Input()
showRemainingTime: boolean = true
@Input()
- readonly exposure = structuredClone(EMPTY_CAMERA_EXPOSURE_INFO)
+ readonly step = structuredClone(EMPTY_CAMERA_STEP_INFO)
@Input()
readonly capture = structuredClone(EMPTY_CAMERA_CAPTURE_INFO)
- @Input()
- readonly wait = structuredClone(EMPTY_CAMERA_WAIT_INFO)
+ state?: CameraCaptureState = 'IDLE'
- handleCameraCaptureEvent(event: CameraCaptureElapsed, looping: boolean = false) {
+ handleCameraCaptureEvent(event: CameraCaptureEvent, looping: boolean = false) {
this.capture.elapsedTime = event.captureElapsedTime
this.capture.remainingTime = event.captureRemainingTime
this.capture.progress = event.captureProgress
- this.exposure.remainingTime = event.exposureRemainingTime
- this.exposure.progress = event.exposureProgress
- this.exposure.count = event.exposureCount
+ this.capture.count = event.exposureCount
+ if (looping) this.capture.looping = looping
+ this.step.elapsedTime = event.stepElapsedTime
+ this.step.remainingTime = event.stepRemainingTime
+ this.step.progress = event.stepProgress
if (event.state === 'EXPOSURING') {
this.state = 'EXPOSURING'
} else if (event.state === 'WAITING') {
- this.wait.remainingTime = event.waitRemainingTime
- this.wait.progress = event.waitProgress
- this.state = event.state
- } else if (event.state === 'SETTLING') {
+ this.step.elapsedTime = event.stepElapsedTime
+ this.step.remainingTime = event.stepRemainingTime
+ this.step.progress = event.stepProgress
this.state = event.state
} else if (event.state === 'CAPTURE_STARTED') {
this.capture.looping = looping || event.exposureAmount <= 0
@@ -45,23 +45,19 @@ export class CameraExposureComponent {
this.state = 'EXPOSURING'
} else if (event.state === 'EXPOSURE_STARTED') {
this.state = 'EXPOSURING'
- } else if ((!looping && event.state === 'CAPTURE_FINISHED') || (!this.capture.looping && !this.capture.remainingTime)) {
- this.state = 'IDLE'
+ } else if (event.state === 'IDLE' || event.state === 'CAPTURE_FINISHED') {
+ this.reset()
}
- return this.state !== undefined && this.state !== 'CAPTURE_FINISHED'
- && this.state !== 'IDLE' && !event.aborted
+ return this.state !== undefined
+ && this.state !== 'CAPTURE_FINISHED'
+ && this.state !== 'IDLE'
}
reset() {
this.state = 'IDLE'
- Object.assign(this.exposure, EMPTY_CAMERA_EXPOSURE_INFO)
+ Object.assign(this.step, EMPTY_CAMERA_STEP_INFO)
Object.assign(this.capture, EMPTY_CAMERA_CAPTURE_INFO)
- Object.assign(this.wait, EMPTY_CAMERA_WAIT_INFO)
- }
-
- toggleRemainingTime() {
- this.showRemainingTime = !this.showRemainingTime
}
}
\ No newline at end of file
diff --git a/desktop/src/shared/components/device-list-button/device-list-button.component.html b/desktop/src/shared/components/device-list-button/device-list-button.component.html
index dfa81f6b4..94bd838b9 100644
--- a/desktop/src/shared/components/device-list-button/device-list-button.component.html
+++ b/desktop/src/shared/components/device-list-button/device-list-button.component.html
@@ -12,4 +12,4 @@
-
{{ item.label }}
- @if (item.items?.length) {
-
- }
-
@if (item.checked) {
-
+
} @else if(item.toggleable) {
-
+
+
+
+
+
\ No newline at end of file
diff --git a/desktop/src/shared/components/slide-menu/slide-menu.component.scss b/desktop/src/shared/components/slide-menu/slide-menu.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/desktop/src/shared/components/slide-menu/slide-menu.component.ts b/desktop/src/shared/components/slide-menu/slide-menu.component.ts
new file mode 100644
index 000000000..72bf9bad9
--- /dev/null
+++ b/desktop/src/shared/components/slide-menu/slide-menu.component.ts
@@ -0,0 +1,73 @@
+import { Component, ElementRef, EventEmitter, Input, OnInit, Output, TemplateRef } from '@angular/core'
+import { MenuItemCommandEvent } from 'primeng/api'
+import { ExtendedMenuItem } from '../menu-item/menu-item.component'
+
+export type SlideMenuItem = ExtendedMenuItem
+export type SlideMenu = SlideMenuItem[]
+
+export interface SlideMenuItemCommandEvent extends MenuItemCommandEvent {
+ item?: SlideMenuItem
+ parent?: SlideMenuItem
+ level: number
+}
+
+@Component({
+ selector: 'neb-slide-menu',
+ templateUrl: './slide-menu.component.html',
+ styleUrls: ['./slide-menu.component.scss'],
+})
+export class SlideMenuComponent implements OnInit {
+
+ @Input({ required: true })
+ readonly model!: SlideMenu
+
+ @Input()
+ readonly appendTo: HTMLElement | ElementRef | TemplateRef