Skip to content

Commit

Permalink
Angular Componentization (#759)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tiagohm
tiagohm authored Dec 8, 2024
2 parents f848dec + 087b336 commit b6958bb
Show file tree
Hide file tree
Showing 111 changed files with 4,767 additions and 6,395 deletions.
2 changes: 1 addition & 1 deletion api/src/main/kotlin/nebulosa/api/mounts/MountController.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class MountController(
val id = pathParameters[ID].notNull()
val mount = connectionService.mount(id) ?: return
val rate = queryParameters["rate"].notNullOrBlank()
mountService.slewRate(mount, mount.slewRates.first { it.name == rate })
mountService.slewRate(mount, mount.slewRates.first { it.value == rate })
}

private fun move(ctx: RoutingContext) = with(ctx.call) {
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/kotlin/nebulosa/api/mounts/MountMoveTask.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ data class MountMoveTask(
LOG.d { debug("Mount Move started. mount={}, request={}", mount, request) }

mount.slewRates.takeIf { !request.speed.isNullOrBlank() }
?.find { it.name == request.speed }
?.find { it.value == request.speed }
?.also { mount.slewRate(it) }

start()
Expand Down
36 changes: 17 additions & 19 deletions desktop/src/app/about/about.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,13 @@
</div>
<div class="col-9 flex-column">
<p class="align-items-center flex font-bold gap-2 mb-0 mt-2 text-5xl">
Nebulosa
<p-tag
class="flex"
styleClass="text-lg"
[value]="version" />
<p-tag
class="flex"
styleClass="text-lg"
[value]="codename"
severity="success" />
<span>Nebulosa</span>
<neb-tag
size="large"
[label]="version" />
<neb-success
size="large"
[label]="codename" />
</p>
<p class="text-sm mt-0">
{{ description }}
Expand Down Expand Up @@ -57,13 +54,14 @@
<div
class="w-full flex flex-column overflow-y-auto py-2 gap-1"
style="height: 100px">
@for (dep of dependencies; track $index) {
<a
*ngIf="dep.link"
target="_blank"
[attr.href]="dep.link">
{{ dep.name }} ({{ dep.version }})
</a>
@for (dep of dependencies; track dep.name) {
@if (dep.link) {
<a
target="_blank"
[attr.href]="dep.link">
{{ dep.name }} ({{ dep.version }})
</a>
}
}
</div>
</p-tabPanel>
Expand All @@ -76,12 +74,12 @@
href="https://www.paypal.com/donate/?hosted_button_id=U8TGGJTKSZUCA">
<img
src="assets/images/donate-with-paypal-blue.svg"
style="height: 31px" />
style="height: 28px" />
</a>
<a
target="_blank"
href="https://github.com/sponsors/tiagohm">
<p-button
<neb-button
icon="mdi mdi-heart"
label="GitHub Sponsor" />
</a>
Expand Down
225 changes: 85 additions & 140 deletions desktop/src/app/alignment/alignment.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,11 @@
[devices]="cameras"
[(device)]="camera"
(deviceChange)="cameraChanged()" />
<p-button
[text]="true"
<neb-button
[disabled]="!camera?.name || running"
icon="mdi mdi-cog"
(onClick)="showCameraDialog()"
size="small"
pTooltip="Camera"
tooltipPosition="bottom" />
(action)="showCameraDialog()"
tooltip="Camera" />
@if (tab === 0) {
<neb-device-chooser
title="MOUNT"
Expand Down Expand Up @@ -43,17 +40,18 @@
#cameraExposure
[info]="status" />

<div
*ngIf="method === 'TPPA'"
class="absolute flex flex-row align-items-center gap-1"
style="right: 8px; top: -2px">
<p-tag
value="RA: {{ tppaResult.rightAscension }}"
[severity]="tppaResult.failed ? 'danger' : 'info'" />
<p-tag
value="DEC: {{ tppaResult.declination }}"
[severity]="tppaResult.failed ? 'danger' : 'info'" />
</div>
@if (method === 'TPPA') {
<div
class="absolute flex flex-row align-items-center gap-1"
style="right: 8px; top: -2px">
<neb-tag
label="RA: {{ tppaResult.rightAscension }}"
[severity]="tppaResult.failed ? 'danger' : 'info'" />
<neb-tag
label="DEC: {{ tppaResult.declination }}"
[severity]="tppaResult.failed ? 'danger' : 'info'" />
</div>
}
</div>
</div>
<div class="grid relative">
Expand All @@ -62,64 +60,40 @@
<p-tabPanel header="TPPA">
<div class="grid mt-3">
<div class="col-5 gap-2 align-items-center">
<p-floatLabel class="w-full">
<p-dropdown
[options]="'PLATE_SOLVER' | dropdownOptions | enumDropdown"
[(ngModel)]="tppaRequest.plateSolver.type"
styleClass="p-inputtext-sm border-0"
optionLabel="label"
optionValue="value"
[autoDisplayFirst]="false"
(ngModelChange)="savePreference()" />
<label>Plate Solver</label>
</p-floatLabel>
<neb-dropdown-enum
label="Plate Solver"
[options]="'PLATE_SOLVER' | dropdownOptions"
[(value)]="tppaRequest.plateSolver.type"
(valueChange)="savePreference()" />
</div>
<div class="col-4 align-items-center">
<p-floatLabel>
<p-inputNumber
styleClass="p-inputtext-sm border-0 max-w-full"
[(ngModel)]="tppaRequest.stepDuration"
[showButtons]="true"
[min]="1"
[max]="60"
(ngModelChange)="savePreference()"
spinnableNumber />
<label>Step duration (s)</label>
</p-floatLabel>
<neb-input-number
label="Step duration (s)"
[min]="1"
[max]="60"
[(value)]="tppaRequest.stepDuration"
(valueChange)="savePreference()" />
</div>
<div class="col-3 flex flex-column align-items-center justify-content-start">
<p-floatLabel class="w-full">
<p-dropdown
[options]="'GUIDE_DIRECTION_WE' | dropdownOptions | enumDropdown"
[(ngModel)]="tppaRequest.stepDirection"
optionsLabel="label"
optionsValue="value"
styleClass="p-inputtext-sm border-0"
[autoDisplayFirst]="false"
(ngModelChange)="savePreference()" />
<label>Direction</label>
</p-floatLabel>
<neb-dropdown-enum
label="Direction"
[options]="'GUIDE_DIRECTION_WE' | dropdownOptions"
[(value)]="tppaRequest.stepDirection"
(valueChange)="savePreference()" />
</div>
<div class="col-5 align-items-center">
<p-floatLabel class="w-full">
<p-dropdown
[disabled]="!mount?.connected"
[options]="mount?.slewRates"
[(ngModel)]="tppaRequest.stepSpeed"
styleClass="p-inputtext-sm border-0"
optionLabel="label"
optionValue="name"
[autoDisplayFirst]="false"
(ngModelChange)="savePreference()" />
<label>Step speed</label>
</p-floatLabel>
<neb-dropdown-item
label="Step speed"
[disabled]="!mount?.connected"
[options]="mount?.slewRates ?? []"
[(value)]="tppaRequest.stepSpeed"
(valueChange)="savePreference()" />
</div>
<div class="col-7 flex align-items-center justify-content-center text-center gap-2 text-sm">
<p-checkbox
[binary]="true"
[(ngModel)]="tppaRequest.stopTrackingWhenDone"
<neb-checkbox
label="Stop tracking when done"
(ngModelChange)="savePreference()" />
[(value)]="tppaRequest.stopTrackingWhenDone"
(valueChange)="savePreference()" />
</div>
</div>
<div class="grid mt-2">
Expand All @@ -141,66 +115,51 @@
<div class="grid mt-2">
<div class="col-12 flex align-items-center justify-content-center gap-1">
@if (pausingOrPaused) {
<p-button
<neb-button
[disabled]="status === 'PAUSING'"
label="Unpause"
(onClick)="tppaUnpause()"
(action)="tppaUnpause()"
icon="mdi mdi-play"
severity="success"
size="small"
[text]="true" />
severity="success" />
} @else if (!running) {
<p-button
<neb-button
[disabled]="!camera || !camera.connected || !mount || !mount.connected || mount.parked || mount.parking || mount.slewing || running"
label="Start"
(onClick)="tppaStart()"
(action)="tppaStart()"
icon="mdi mdi-play"
severity="success"
size="small"
[text]="true" />
severity="success" />
} @else {
<neb-button
label="Pause"
(action)="tppaPause()"
icon="mdi mdi-pause"
severity="info" />
}
<p-button
*ngIf="running && !pausingOrPaused"
label="Pause"
(onClick)="tppaPause()"
icon="mdi mdi-pause"
severity="info"
size="small"
[text]="true" />
<p-button
<neb-button
[disabled]="!camera || !camera.connected || !mount || !mount.connected || !running"
label="Abort"
(onClick)="tppaStop()"
(action)="tppaStop()"
icon="mdi mdi-stop"
severity="danger"
size="small"
[text]="true" />
<p-button
severity="danger" />
<neb-button
[disabled]="!camera?.connected"
(onClick)="openCameraImage()"
(action)="openCameraImage()"
icon="mdi mdi-image"
[text]="true"
styleClass="ml-4"
pTooltip="View image"
tooltipPosition="bottom"
size="small" />
class="ml-4"
tooltip="View image"
tooltipPosition="top" />
</div>
</div>
</p-tabPanel>
<p-tabPanel header="DARV">
<div class="grid mt-3">
<div class="col-4">
<p-floatLabel>
<p-inputNumber
styleClass="p-inputtext-sm border-0 max-w-full"
[(ngModel)]="darvRequest.capture.exposureDelay"
[showButtons]="true"
[min]="1"
[max]="60"
(ngModelChange)="savePreference()"
spinnableNumber />
<label>Initial pause (s)</label>
</p-floatLabel>
<neb-input-number
label="Initial pause (s)"
[min]="1"
[max]="60"
[(value)]="darvRequest.capture.exposureDelay"
(valueChange)="savePreference()" />
</div>
<div class="col-4">
<neb-exposure-time
Expand All @@ -212,59 +171,45 @@
label="Drift for" />
</div>
<div class="col-4">
<p-floatLabel class="w-full">
<p-dropdown
[options]="'HEMISPHERE' | dropdownOptions | enumDropdown"
[(ngModel)]="preference.darvHemisphere"
styleClass="p-inputtext-sm border-0"
optionsLabel="label"
optionsValue="value"
[autoDisplayFirst]="false"
(ngModelChange)="savePreference()" />
<label>Hemisphere</label>
</p-floatLabel>
<neb-dropdown-enum
label="Hemisphere"
[options]="'HEMISPHERE' | dropdownOptions"
[(value)]="preference.darvHemisphere"
(valueChange)="savePreference()" />
</div>
</div>
<div class="grid mt-2">
<div class="col-12 flex align-items-center justify-content-center gap-1">
<p-button
<neb-button
[disabled]="!camera || !camera.connected || !guideOutput || !guideOutput.connected || running"
label="Start"
(onClick)="darvStart()"
(action)="darvStart()"
icon="mdi mdi-play"
severity="success"
size="small"
[text]="true" />
<p-button
severity="success" />
<neb-button
[disabled]="!camera || !camera.connected || !guideOutput || !guideOutput.connected || !running"
label="Abort"
(onClick)="darvStop()"
(action)="darvStop()"
icon="mdi mdi-stop"
severity="danger"
size="small"
[text]="true" />
<p-button
severity="danger" />
<neb-button
[disabled]="!camera?.connected"
(onClick)="openCameraImage()"
(action)="openCameraImage()"
icon="mdi mdi-image"
[text]="true"
styleClass="ml-4"
pTooltip="View image"
tooltipPosition="bottom"
size="small"
[text]="true" />
class="ml-4"
tooltip="View image"
tooltipPosition="top" />
</div>
</div>
</p-tabPanel>
</p-tabView>
</div>
<p-button
[text]="true"
<neb-button
severity="info"
icon="mdi mdi-information"
styleClass="absolute"
class="absolute"
[style]="{ right: '8px', top: '5px' }"
(onClick)="tab === 0 ? tppaInfo.toggle($event) : darvInfo.toggle($event)" />
(action)="tab === 0 ? tppaInfo.toggle($event) : darvInfo.toggle($event)" />

<p-overlayPanel
#tppaInfo
Expand Down
Loading

0 comments on commit b6958bb

Please sign in to comment.