diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 88cfc8c51..05557ac63 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -24,8 +24,10 @@ dependencies { implementation(project(":nebulosa-log")) implementation(project(":nebulosa-lx200-protocol")) implementation(project(":nebulosa-nova")) + implementation(project(":nebulosa-pixinsight")) implementation(project(":nebulosa-sbd")) implementation(project(":nebulosa-simbad")) + implementation(project(":nebulosa-siril")) implementation(project(":nebulosa-stellarium-protocol")) implementation(project(":nebulosa-wcs")) implementation(project(":nebulosa-xisf")) diff --git a/api/src/main/kotlin/nebulosa/api/alignment/polar/darv/DARVTask.kt b/api/src/main/kotlin/nebulosa/api/alignment/polar/darv/DARVTask.kt index 65e4ea05c..73842019a 100644 --- a/api/src/main/kotlin/nebulosa/api/alignment/polar/darv/DARVTask.kt +++ b/api/src/main/kotlin/nebulosa/api/alignment/polar/darv/DARVTask.kt @@ -17,6 +17,7 @@ import nebulosa.indi.device.camera.Camera import nebulosa.indi.device.camera.CameraEvent import nebulosa.indi.device.camera.FrameType import nebulosa.indi.device.guide.GuideOutput +import nebulosa.indi.device.mount.Mount import nebulosa.log.loggerFor import java.nio.file.Files import java.time.Duration @@ -64,7 +65,7 @@ data class DARVTask( override fun execute(cancellationToken: CancellationToken) { LOG.info("DARV started. camera={}, guideOutput={}, request={}", camera, guideOutput, request) - camera.snoop(listOf(guideOutput)) + if (guideOutput is Mount) camera.snoop(camera.snoopedDevices.filter { it !is Mount } + guideOutput) val task = SplitTask(listOf(cameraCaptureTask, Task.of(delayTask, forwardGuidePulseTask, backwardGuidePulseTask)), executor) task.execute(cancellationToken) diff --git a/api/src/main/kotlin/nebulosa/api/alignment/polar/tppa/TPPAStartRequest.kt b/api/src/main/kotlin/nebulosa/api/alignment/polar/tppa/TPPAStartRequest.kt index acb655885..0377eb526 100644 --- a/api/src/main/kotlin/nebulosa/api/alignment/polar/tppa/TPPAStartRequest.kt +++ b/api/src/main/kotlin/nebulosa/api/alignment/polar/tppa/TPPAStartRequest.kt @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties import jakarta.validation.Valid import jakarta.validation.constraints.NotNull import nebulosa.api.cameras.CameraStartCaptureRequest -import nebulosa.api.solver.PlateSolverOptions +import nebulosa.api.platesolver.PlateSolverRequest import nebulosa.guiding.GuideDirection import org.hibernate.validator.constraints.time.DurationMin import org.springframework.boot.convert.DurationUnit @@ -13,7 +13,7 @@ import java.time.temporal.ChronoUnit data class TPPAStartRequest( @JsonIgnoreProperties("camera", "focuser", "wheel") @JvmField val capture: CameraStartCaptureRequest = CameraStartCaptureRequest.EMPTY, - @field:NotNull @Valid @JvmField val plateSolver: PlateSolverOptions = PlateSolverOptions.EMPTY, + @field:NotNull @Valid @JvmField val plateSolver: PlateSolverRequest = PlateSolverRequest.EMPTY, @JvmField val startFromCurrentPosition: Boolean = true, @JvmField val compensateRefraction: Boolean = false, @JvmField val stopTrackingWhenDone: Boolean = true, diff --git a/api/src/main/kotlin/nebulosa/api/alignment/polar/tppa/TPPATask.kt b/api/src/main/kotlin/nebulosa/api/alignment/polar/tppa/TPPATask.kt index e3ae706ff..b3d5ceeb1 100644 --- a/api/src/main/kotlin/nebulosa/api/alignment/polar/tppa/TPPATask.kt +++ b/api/src/main/kotlin/nebulosa/api/alignment/polar/tppa/TPPATask.kt @@ -21,7 +21,7 @@ import nebulosa.log.loggerFor import nebulosa.math.Angle import nebulosa.math.formatHMS import nebulosa.math.formatSignedDMS -import nebulosa.plate.solving.PlateSolver +import nebulosa.platesolver.PlateSolver import java.nio.file.Files import java.nio.file.Path import java.time.Duration @@ -84,7 +84,7 @@ data class TPPATask( captureEvent = event if (event.state == CameraCaptureState.EXPOSURE_FINISHED) { - savedImage = event.savePath!! + savedImage = event.savedPath!! } if (!finished.get()) { @@ -110,7 +110,7 @@ data class TPPATask( rightAscension = mount?.rightAscension ?: 0.0 declination = mount?.declination ?: 0.0 - camera.snoop(listOf(mount)) + camera.snoop(camera.snoopedDevices.filter { it !is Mount } + mount) cancellationToken.listenToPause(this) diff --git a/api/src/main/kotlin/nebulosa/api/atlas/SatelliteRepository.kt b/api/src/main/kotlin/nebulosa/api/atlas/SatelliteRepository.kt index 4b576a6ac..8ed07bd53 100644 --- a/api/src/main/kotlin/nebulosa/api/atlas/SatelliteRepository.kt +++ b/api/src/main/kotlin/nebulosa/api/atlas/SatelliteRepository.kt @@ -1,9 +1,7 @@ package nebulosa.api.atlas import io.objectbox.Box -import io.objectbox.query.QueryBuilder.StringOrder.CASE_INSENSITIVE import io.objectbox.query.QueryBuilder.StringOrder.CASE_SENSITIVE -import io.objectbox.query.QueryCondition import nebulosa.api.repositories.BoxRepository import org.springframework.beans.factory.annotation.Qualifier import org.springframework.stereotype.Component @@ -11,22 +9,10 @@ import org.springframework.stereotype.Component @Component class SatelliteRepository(@Qualifier("satelliteBox") override val box: Box) : BoxRepository() { - fun search(text: String? = null, groups: List = emptyList()): List { - val builder = box.query() - .also { if (!text.isNullOrBlank()) it.contains(SatelliteEntity_.name, text, CASE_INSENSITIVE) } + fun search(text: String? = null, groups: Iterable = emptyList()): List { + val groupCondition = or(groups.map { SatelliteEntity_.groups.containsElement(it.name, CASE_SENSITIVE) }) + val condition = and(if (text.isNullOrBlank()) null else SatelliteEntity_.name.containsInsensitive(text), groupCondition) - if (groups.isNotEmpty()) { - var condition: QueryCondition = SatelliteEntity_.groups.containsElement(groups[0].name, CASE_SENSITIVE) - - for (i in 1 until groups.size) { - condition = condition.or(SatelliteEntity_.groups.containsElement(groups[i].name, CASE_SENSITIVE)) - } - - builder.apply(condition) - } - - return builder - .build() - .use { it.findLazy() } + return (condition?.let(box::query) ?: box.query()).build().use { it.findLazy() } } } diff --git a/api/src/main/kotlin/nebulosa/api/atlas/SimbadEntityRepository.kt b/api/src/main/kotlin/nebulosa/api/atlas/SimbadEntityRepository.kt index 54040bec7..a91e14892 100644 --- a/api/src/main/kotlin/nebulosa/api/atlas/SimbadEntityRepository.kt +++ b/api/src/main/kotlin/nebulosa/api/atlas/SimbadEntityRepository.kt @@ -2,20 +2,17 @@ package nebulosa.api.atlas import io.objectbox.Box import io.objectbox.kotlin.equal -import io.objectbox.query.QueryBuilder.StringOrder.CASE_INSENSITIVE -import io.objectbox.query.QueryFilter import nebulosa.api.repositories.BoxRepository import nebulosa.math.Angle import nebulosa.math.toDegrees import nebulosa.nova.astrometry.Constellation import nebulosa.skycatalog.SkyObject -import nebulosa.skycatalog.SkyObjectInsideCoordinate import nebulosa.skycatalog.SkyObjectType import org.springframework.beans.factory.annotation.Qualifier import org.springframework.stereotype.Component @Component -class SimbadEntityRepository(@Qualifier("simbadEntityBox") override val box: Box) : BoxRepository() { +class SimbadEntityRepository(@Qualifier("simbadBox") override val box: Box) : BoxRepository() { fun find( name: String? = null, constellation: Constellation? = null, @@ -23,28 +20,20 @@ class SimbadEntityRepository(@Qualifier("simbadEntityBox") override val box: Box magnitudeMin: Double = SkyObject.MAGNITUDE_MIN, magnitudeMax: Double = SkyObject.MAGNITUDE_MAX, type: SkyObjectType? = null, ): List { - val useFilter = radius > 0.0 && radius.toDegrees > 0.1 - - return box.query() - .also { - if (magnitudeMin in SkyObject.MAGNITUDE_RANGE) it.greaterOrEqual(SimbadEntity_.magnitude, magnitudeMin) - if (magnitudeMax in SkyObject.MAGNITUDE_RANGE) it.lessOrEqual(SimbadEntity_.magnitude, magnitudeMax) - if (type != null) it.equal(SimbadEntity_.type, type.ordinal) - if (constellation != null) it.equal(SimbadEntity_.constellation, constellation.ordinal) - - if (!name.isNullOrBlank()) { - it.contains(SimbadEntity_.name, name, CASE_INSENSITIVE) - } - - if (useFilter) it.filter(object : QueryFilter { - private val filter = SkyObjectInsideCoordinate(rightAscension, declination, radius) - - override fun keep(entity: SimbadEntity) = filter.test(entity) - }) - - it.order(SimbadEntity_.magnitude) - } - .build() - .use { if (useFilter) it.find() else it.find(0, 5000) } + val useFilter = radius > 0.0 && radius.toDegrees in 0.1..90.0 + + val condition = and( + if (magnitudeMin in SkyObject.MAGNITUDE_RANGE) SimbadEntity_.magnitude.greaterOrEqual(magnitudeMin) else null, + if (magnitudeMax in SkyObject.MAGNITUDE_RANGE) SimbadEntity_.magnitude.lessOrEqual(magnitudeMax) else null, + if (type != null) SimbadEntity_.type equal type.ordinal else null, + if (constellation != null) SimbadEntity_.constellation equal constellation.ordinal else null, + if (name.isNullOrBlank()) null else SimbadEntity_.name containsInsensitive name, + ) + + return with(condition?.let(box::query) ?: box.query()) { + if (useFilter) filter(SkyObjectInsideCoordinate(rightAscension, declination, radius)) + order(SimbadEntity_.magnitude) + build() + }.use { if (useFilter) it.find() else it.find(0, 5000) } } } diff --git a/nebulosa-skycatalog/src/main/kotlin/nebulosa/skycatalog/SkyObjectInsideCoordinate.kt b/api/src/main/kotlin/nebulosa/api/atlas/SkyObjectInsideCoordinate.kt similarity index 78% rename from nebulosa-skycatalog/src/main/kotlin/nebulosa/skycatalog/SkyObjectInsideCoordinate.kt rename to api/src/main/kotlin/nebulosa/api/atlas/SkyObjectInsideCoordinate.kt index b4f94da39..10b0857bb 100644 --- a/nebulosa-skycatalog/src/main/kotlin/nebulosa/skycatalog/SkyObjectInsideCoordinate.kt +++ b/api/src/main/kotlin/nebulosa/api/atlas/SkyObjectInsideCoordinate.kt @@ -1,5 +1,6 @@ -package nebulosa.skycatalog +package nebulosa.api.atlas +import io.objectbox.query.QueryFilter import nebulosa.math.Angle import nebulosa.math.cos import nebulosa.math.sin @@ -11,12 +12,12 @@ data class SkyObjectInsideCoordinate( private val rightAscension: Angle, private val declination: Angle, private val radius: Angle, -) : SkyObjectFilter { +) : QueryFilter { private val sinDEC = declination.sin private val cosDEC = declination.cos - override fun test(o: SkyObject): Boolean { + override fun keep(o: SimbadEntity): Boolean { return acos(sin(o.declinationJ2000) * sinDEC + cos(o.declinationJ2000) * cosDEC * cos(o.rightAscensionJ2000 - rightAscension)) <= radius } } diff --git a/api/src/main/kotlin/nebulosa/api/autofocus/AutoFocusRequest.kt b/api/src/main/kotlin/nebulosa/api/autofocus/AutoFocusRequest.kt index 5f1c5edd1..1ba8511da 100644 --- a/api/src/main/kotlin/nebulosa/api/autofocus/AutoFocusRequest.kt +++ b/api/src/main/kotlin/nebulosa/api/autofocus/AutoFocusRequest.kt @@ -2,7 +2,7 @@ package nebulosa.api.autofocus import nebulosa.api.cameras.CameraStartCaptureRequest import nebulosa.api.focusers.BacklashCompensation -import nebulosa.api.stardetection.StarDetectionOptions +import nebulosa.api.stardetector.StarDetectionRequest data class AutoFocusRequest( @JvmField val fittingMode: AutoFocusFittingMode = AutoFocusFittingMode.HYPERBOLIC, @@ -12,5 +12,5 @@ data class AutoFocusRequest( @JvmField val initialOffsetSteps: Int = 4, @JvmField val stepSize: Int = 50, @JvmField val totalNumberOfAttempts: Int = 1, - @JvmField val starDetector: StarDetectionOptions = StarDetectionOptions.EMPTY, + @JvmField val starDetector: StarDetectionRequest = StarDetectionRequest.EMPTY, ) diff --git a/api/src/main/kotlin/nebulosa/api/autofocus/AutoFocusTask.kt b/api/src/main/kotlin/nebulosa/api/autofocus/AutoFocusTask.kt index 249e5c51d..9f0995f60 100644 --- a/api/src/main/kotlin/nebulosa/api/autofocus/AutoFocusTask.kt +++ b/api/src/main/kotlin/nebulosa/api/autofocus/AutoFocusTask.kt @@ -19,8 +19,8 @@ import nebulosa.indi.device.camera.FrameType import nebulosa.indi.device.focuser.Focuser import nebulosa.indi.device.focuser.FocuserEvent import nebulosa.log.loggerFor -import nebulosa.star.detection.ImageStar -import nebulosa.star.detection.StarDetector +import nebulosa.stardetector.StarDetector +import nebulosa.stardetector.StarPoint import java.nio.file.Files import java.nio.file.Path import java.time.Duration @@ -85,7 +85,7 @@ data class AutoFocusTask( var numberOfAttempts = 0 val maximumFocusPoints = request.capture.exposureAmount * request.initialOffsetSteps * 10 - // camera.snoop(listOf(focuser)) + camera.snoop(camera.snoopedDevices.filter { it !is Focuser } + focuser) while (!exited && !cancellationToken.isCancelled) { numberOfAttempts++ @@ -220,7 +220,7 @@ data class AutoFocusTask( if (event.state == CameraCaptureState.EXPOSURE_FINISHED) { sendEvent(AutoFocusState.EXPOSURED, event) sendEvent(AutoFocusState.ANALYSING) - val detectedStars = starDetection.detect(event.savePath!!) + val detectedStars = starDetection.detect(event.savedPath!!) starCount = detectedStars.size LOG.info("detected $starCount stars") starHFD = detectedStars.measureDetectedStars() @@ -401,7 +401,7 @@ data class AutoFocusTask( } @JvmStatic - private fun List.measureDetectedStars(): Double { + private fun List.measureDetectedStars(): Double { return if (isEmpty()) 0.0 else if (size == 1) this[0].hfd else if (size == 2) (this[0].hfd + this[1].hfd) / 2.0 diff --git a/api/src/main/kotlin/nebulosa/api/beans/configurations/BeanConfiguration.kt b/api/src/main/kotlin/nebulosa/api/beans/configurations/BeanConfiguration.kt index b03a02883..65918224a 100644 --- a/api/src/main/kotlin/nebulosa/api/beans/configurations/BeanConfiguration.kt +++ b/api/src/main/kotlin/nebulosa/api/beans/configurations/BeanConfiguration.kt @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.module.SimpleModule import com.fasterxml.jackson.databind.ser.std.StdSerializer import com.fasterxml.jackson.module.kotlin.kotlinModule import io.objectbox.BoxStore +import io.objectbox.kotlin.boxFor import nebulosa.api.atlas.SatelliteEntity import nebulosa.api.atlas.SimbadEntity import nebulosa.api.calibration.CalibrationFrameEntity @@ -170,16 +171,16 @@ class BeanConfiguration { .build()!! @Bean - fun calibrationFrameBox(boxStore: BoxStore) = boxStore.boxFor(CalibrationFrameEntity::class.java)!! + fun calibrationFrameBox(boxStore: BoxStore) = boxStore.boxFor() @Bean - fun preferenceBox(boxStore: BoxStore) = boxStore.boxFor(PreferenceEntity::class.java)!! + fun preferenceBox(boxStore: BoxStore) = boxStore.boxFor() @Bean - fun satelliteBox(boxStore: BoxStore) = boxStore.boxFor(SatelliteEntity::class.java)!! + fun satelliteBox(boxStore: BoxStore) = boxStore.boxFor() @Bean - fun simbadEntityBox(@Qualifier("simbadBoxStore") boxStore: BoxStore) = boxStore.boxFor(SimbadEntity::class.java)!! + fun simbadBox(@Qualifier("simbadBoxStore") boxStore: BoxStore) = boxStore.boxFor() @Bean fun webMvcConfigurer( diff --git a/api/src/main/kotlin/nebulosa/api/beans/converters/angle/DeclinationDeserializer.kt b/api/src/main/kotlin/nebulosa/api/beans/converters/angle/DeclinationDeserializer.kt index 01e170cfe..0ed5dcbd1 100644 --- a/api/src/main/kotlin/nebulosa/api/beans/converters/angle/DeclinationDeserializer.kt +++ b/api/src/main/kotlin/nebulosa/api/beans/converters/angle/DeclinationDeserializer.kt @@ -1,3 +1,3 @@ package nebulosa.api.beans.converters.angle -class DeclinationDeserializer : AngleDeserializer(true) +class DeclinationDeserializer : AngleDeserializer(false) diff --git a/api/src/main/kotlin/nebulosa/api/beans/converters/angle/DegreesDeserializer.kt b/api/src/main/kotlin/nebulosa/api/beans/converters/angle/DegreesDeserializer.kt new file mode 100644 index 000000000..b97011eec --- /dev/null +++ b/api/src/main/kotlin/nebulosa/api/beans/converters/angle/DegreesDeserializer.kt @@ -0,0 +1,3 @@ +package nebulosa.api.beans.converters.angle + +class DegreesDeserializer : AngleDeserializer(false, defaultValue = 0.0) diff --git a/api/src/main/kotlin/nebulosa/api/calibration/CalibrationFrameProvider.kt b/api/src/main/kotlin/nebulosa/api/calibration/CalibrationFrameProvider.kt new file mode 100644 index 000000000..0c3ed2a06 --- /dev/null +++ b/api/src/main/kotlin/nebulosa/api/calibration/CalibrationFrameProvider.kt @@ -0,0 +1,20 @@ +package nebulosa.api.calibration + +interface CalibrationFrameProvider { + + fun findBestDarkFrames( + name: String, temperature: Double, width: Int, height: Int, + binX: Int, binY: Int = binX, exposureTimeInMicroseconds: Long = 0L, + gain: Double = 0.0, + ): List + + fun findBestFlatFrames( + name: String, width: Int, height: Int, + binX: Int, binY: Int = binX, filter: String? = null + ): List + + fun findBestBiasFrames( + name: String, width: Int, height: Int, + binX: Int, binY: Int = binX, gain: Double = 0.0, + ): List +} diff --git a/api/src/main/kotlin/nebulosa/api/calibration/CalibrationFrameRepository.kt b/api/src/main/kotlin/nebulosa/api/calibration/CalibrationFrameRepository.kt index 10399bf92..056d8ac54 100644 --- a/api/src/main/kotlin/nebulosa/api/calibration/CalibrationFrameRepository.kt +++ b/api/src/main/kotlin/nebulosa/api/calibration/CalibrationFrameRepository.kt @@ -2,8 +2,6 @@ package nebulosa.api.calibration import io.objectbox.Box import io.objectbox.kotlin.equal -import io.objectbox.query.QueryBuilder.StringOrder.CASE_INSENSITIVE -import io.objectbox.query.QueryBuilder.StringOrder.CASE_SENSITIVE import nebulosa.api.repositories.BoxRepository import nebulosa.indi.device.camera.FrameType import org.springframework.beans.factory.annotation.Qualifier @@ -16,64 +14,60 @@ class CalibrationFrameRepository(@Qualifier("calibrationFrameBox") override val fun groups() = box.all.map { it.name }.distinct() fun findAll(name: String): List { - return box.query() - .equal(CalibrationFrameEntity_.name, name, CASE_SENSITIVE) - .build() - .use { it.find() } + return box.query(CalibrationFrameEntity_.name equal name) + .build().use { it.find() } } @Synchronized fun delete(name: String, path: String) { - return box.query() - .equal(CalibrationFrameEntity_.name, name, CASE_SENSITIVE) - .equal(CalibrationFrameEntity_.path, path, CASE_SENSITIVE) - .build() - .use { it.remove() } + val condition = and(CalibrationFrameEntity_.name equal name, CalibrationFrameEntity_.path equal path) + return box.query(condition).build().use { it.remove() } } fun darkFrames(name: String, width: Int, height: Int, bin: Int, exposureTime: Long, gain: Double): List { - return box.query() - .equal(CalibrationFrameEntity_.type, FrameType.DARK.ordinal) - .equal(CalibrationFrameEntity_.enabled, true) - .equal(CalibrationFrameEntity_.name, name, CASE_SENSITIVE) - .equal(CalibrationFrameEntity_.width, width) - .equal(CalibrationFrameEntity_.height, height) - .equal(CalibrationFrameEntity_.binX, bin) - .equal(CalibrationFrameEntity_.binY, bin) - .also { if (exposureTime > 0L) it.equal(CalibrationFrameEntity_.exposureTime, exposureTime) } - .also { if (gain > 0L) it.equal(CalibrationFrameEntity_.gain, gain, 1E-3) } - .build() - .use { it.find() } + val condition = and( + CalibrationFrameEntity_.type equal FrameType.DARK.ordinal, + CalibrationFrameEntity_.enabled.isTrue, + CalibrationFrameEntity_.name equal name, + CalibrationFrameEntity_.width equal width, + CalibrationFrameEntity_.height equal height, + CalibrationFrameEntity_.binX equal bin, + CalibrationFrameEntity_.binY equal bin, + if (exposureTime > 0L) CalibrationFrameEntity_.exposureTime equal exposureTime else null, + if (gain > 0L) CalibrationFrameEntity_.gain.equal(gain, 1E-3) else null, + ) + + return box.query(condition).build().use { it.find() } } fun biasFrames(name: String, width: Int, height: Int, bin: Int, gain: Double): List { - return box.query() - .equal(CalibrationFrameEntity_.type, FrameType.BIAS.ordinal) - .equal(CalibrationFrameEntity_.enabled, true) - .equal(CalibrationFrameEntity_.name, name, CASE_SENSITIVE) - .equal(CalibrationFrameEntity_.width, width) - .equal(CalibrationFrameEntity_.height, height) - .equal(CalibrationFrameEntity_.binX, bin) - .equal(CalibrationFrameEntity_.binY, bin) - .also { if (gain > 0L) it.equal(CalibrationFrameEntity_.gain, gain, 1E-3) } - .build() - .use { it.find() } + val condition = and( + CalibrationFrameEntity_.type equal FrameType.BIAS.ordinal, + CalibrationFrameEntity_.enabled.isTrue, + CalibrationFrameEntity_.name equal name, + CalibrationFrameEntity_.width equal width, + CalibrationFrameEntity_.height equal height, + CalibrationFrameEntity_.binX equal bin, + CalibrationFrameEntity_.binY equal bin, + if (gain > 0L) CalibrationFrameEntity_.gain.equal(gain, 1E-3) else null, + ) + + return box.query(condition).build().use { it.find() } } fun flatFrames(name: String, filter: String?, width: Int, height: Int, bin: Int): List { - return box.query() - .equal(CalibrationFrameEntity_.type, FrameType.FLAT.ordinal) - .equal(CalibrationFrameEntity_.enabled, true) - .equal(CalibrationFrameEntity_.name, name, CASE_SENSITIVE) - .also { - if (filter.isNullOrBlank()) it.isNull(CalibrationFrameEntity_.filter) - else it.equal(CalibrationFrameEntity_.filter, filter, CASE_INSENSITIVE) - } - .equal(CalibrationFrameEntity_.width, width) - .equal(CalibrationFrameEntity_.height, height) - .equal(CalibrationFrameEntity_.binX, bin) - .equal(CalibrationFrameEntity_.binY, bin) - .build() - .use { it.find() } + val condition = and( + CalibrationFrameEntity_.type equal FrameType.FLAT.ordinal, + CalibrationFrameEntity_.enabled.isTrue, + CalibrationFrameEntity_.name equal name, + CalibrationFrameEntity_.width equal width, + CalibrationFrameEntity_.height equal height, + CalibrationFrameEntity_.binX equal bin, + CalibrationFrameEntity_.binY equal bin, + if (filter.isNullOrBlank()) CalibrationFrameEntity_.filter.isNull + else CalibrationFrameEntity_.filter equalInsensitive filter, + ) + + return box.query(condition).build().use { it.find() } } } diff --git a/api/src/main/kotlin/nebulosa/api/calibration/CalibrationFrameService.kt b/api/src/main/kotlin/nebulosa/api/calibration/CalibrationFrameService.kt index 8188e1b0d..012a7dbd7 100644 --- a/api/src/main/kotlin/nebulosa/api/calibration/CalibrationFrameService.kt +++ b/api/src/main/kotlin/nebulosa/api/calibration/CalibrationFrameService.kt @@ -26,31 +26,42 @@ import kotlin.math.roundToInt @Service class CalibrationFrameService( private val calibrationFrameRepository: CalibrationFrameRepository, -) { +) : CalibrationFrameProvider { fun calibrate(name: String, image: Image, createNew: Boolean = false): Image { return synchronized(image) { val darkFrame = findBestDarkFrames(name, image).firstOrNull() - val biasFrame = findBestBiasFrames(name, image).firstOrNull() + val biasFrame = if (darkFrame == null) findBestBiasFrames(name, image).firstOrNull() else null val flatFrame = findBestFlatFrames(name, image).firstOrNull() - if (darkFrame != null || biasFrame != null || flatFrame != null) { + val darkImage = darkFrame?.path?.fits()?.use(Image::open) + val biasImage = biasFrame?.path?.fits()?.use(Image::open) + var flatImage = flatFrame?.path?.fits()?.use(Image::open) + + if (darkImage != null || biasImage != null || flatImage != null) { var transformedImage = if (createNew) image.clone() else image - if (biasFrame != null) { - val calibrationImage = biasFrame.path!!.fits().use(Image::open) - transformedImage = transformedImage.transform(BiasSubtraction(calibrationImage)) + // If not using dark frames. + if (biasImage != null) { + // Subtract Master Bias from Flat Frames. + if (flatImage != null) { + flatImage = flatImage.transform(BiasSubtraction(biasImage)) + LOG.info("bias frame subtraction applied to flat frame. frame={}", biasFrame) + } + + // Subtract the Master Bias frame. + transformedImage = transformedImage.transform(BiasSubtraction(biasImage)) LOG.info("bias frame subtraction applied. frame={}", biasFrame) - } else { + } else if (darkFrame == null) { LOG.info( "no bias frames found. width={}, height={}, bin={}, gain={}", image.width, image.height, image.header.binX, image.header.gain ) } - if (darkFrame != null) { - val calibrationImage = darkFrame.path!!.fits().use(Image::open) - transformedImage = transformedImage.transform(DarkSubtraction(calibrationImage)) + // Subtract Master Dark frame. + if (darkImage != null) { + transformedImage = transformedImage.transform(DarkSubtraction(darkImage)) LOG.info("dark frame subtraction applied. frame={}", darkFrame) } else { LOG.info( @@ -59,9 +70,9 @@ class CalibrationFrameService( ) } - if (flatFrame != null) { - val calibrationImage = flatFrame.path!!.fits().use(Image::open) - transformedImage = transformedImage.transform(FlatCorrection(calibrationImage)) + // Divide the Dark-subtracted Light frame by the Master Flat frame to correct for variations in the optical path. + if (flatImage != null) { + transformedImage = transformedImage.transform(FlatCorrection(flatImage)) LOG.info("flat frame correction applied. frame={}", flatFrame) } else { LOG.info( @@ -146,13 +157,13 @@ class CalibrationFrameService( calibrationFrameRepository.delete(frame) } - // exposureTime, temperature, width, height, binX, binY, gain. - fun findBestDarkFrames(name: String, image: Image): List { - val header = image.header - val temperature = header.temperature - + override fun findBestDarkFrames( + name: String, temperature: Double, width: Int, height: Int, + binX: Int, binY: Int, exposureTimeInMicroseconds: Long, + gain: Double, + ): List { val frames = calibrationFrameRepository - .darkFrames(name, image.width, image.height, header.binX, header.exposureTimeInMicroseconds, header.gain) + .darkFrames(name, width, height, binX, exposureTimeInMicroseconds, gain) if (frames.isEmpty()) return emptyList() @@ -164,20 +175,46 @@ class CalibrationFrameService( return groupedFrames.firstEntry().value } - // filter, width, height, binX, binY. + fun findBestDarkFrames(name: String, image: Image): List { + val header = image.header + val temperature = header.temperature + val binX = header.binX + val exposureTime = header.exposureTimeInMicroseconds + + return findBestDarkFrames(name, temperature, image.width, image.height, binX, binX, exposureTime, header.gain) + } + + override fun findBestFlatFrames( + name: String, width: Int, height: Int, + binX: Int, binY: Int, filter: String? + ): List { + // TODO: Generate master from matched frames. (Subtract the master bias frame from each flat frame) + return calibrationFrameRepository + .flatFrames(name, filter, width, height, binX) + } + fun findBestFlatFrames(name: String, image: Image): List { - val filter = image.header.filter + val header = image.header + val filter = header.filter + val binX = header.binX + return findBestFlatFrames(name, image.width, image.height, binX, binX, filter) + } + + override fun findBestBiasFrames( + name: String, width: Int, height: Int, + binX: Int, binY: Int, gain: Double, + ): List { // TODO: Generate master from matched frames. return calibrationFrameRepository - .flatFrames(name, filter, image.width, image.height, image.header.binX) + .biasFrames(name, width, height, binX, gain) } - // width, height, binX, binY, gain. fun findBestBiasFrames(name: String, image: Image): List { - // TODO: Generate master from matched frames. - return calibrationFrameRepository - .biasFrames(name, image.width, image.height, image.header.binX, image.header.gain) + val header = image.header + val binX = header.binX + + return findBestBiasFrames(name, image.width, image.height, binX, binX, image.header.gain) } companion object { diff --git a/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureEvent.kt b/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureEvent.kt index 805551724..7bcd3f6e2 100644 --- a/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureEvent.kt +++ b/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureEvent.kt @@ -1,12 +1,14 @@ package nebulosa.api.cameras +import com.fasterxml.jackson.annotation.JsonIgnore import nebulosa.api.messages.MessageEvent import nebulosa.indi.device.camera.Camera import java.nio.file.Path import java.time.Duration data class CameraCaptureEvent( - @JvmField val camera: Camera, + @JvmField @field:JsonIgnore val task: CameraCaptureTask, + @JvmField val camera: Camera = task.camera, @JvmField val state: CameraCaptureState = CameraCaptureState.IDLE, @JvmField val exposureAmount: Int = 0, @JvmField val exposureCount: Int = 0, @@ -16,15 +18,10 @@ data class CameraCaptureEvent( @JvmField val stepRemainingTime: Duration = Duration.ZERO, @JvmField val stepElapsedTime: Duration = Duration.ZERO, @JvmField val stepProgress: Double = 0.0, - @JvmField val savePath: Path? = null, + @JvmField val savedPath: Path? = null, + @JvmField val liveStackedPath: Path? = null, + @JvmField val capture: CameraStartCaptureRequest? = null, ) : MessageEvent { override val eventName = "CAMERA.CAPTURE_ELAPSED" - - companion object { - - @JvmStatic - fun exposureFinished(camera: Camera, savePath: Path) = - CameraCaptureEvent(camera, CameraCaptureState.EXPOSURE_FINISHED, savePath = savePath) - } } diff --git a/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureExecutor.kt b/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureExecutor.kt index 0c0a83e91..572dd53cc 100644 --- a/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureExecutor.kt +++ b/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureExecutor.kt @@ -2,6 +2,7 @@ package nebulosa.api.cameras import io.reactivex.rxjava3.functions.Consumer import nebulosa.api.beans.annotations.Subscriber +import nebulosa.api.calibration.CalibrationFrameService import nebulosa.api.messages.MessageService import nebulosa.guiding.Guider import nebulosa.indi.device.camera.Camera @@ -18,6 +19,7 @@ class CameraCaptureExecutor( private val messageService: MessageService, private val guider: Guider, private val threadPoolTaskExecutor: ThreadPoolTaskExecutor, + private val calibrationFrameService: CalibrationFrameService, ) : Consumer, CameraEventAware { private val jobs = ConcurrentHashMap.newKeySet(2) @@ -36,7 +38,7 @@ class CameraCaptureExecutor( check(camera.connected) { "${camera.name} Camera is not connected" } check(jobs.none { it.task.camera === camera }) { "${camera.name} Camera Capture is already in progress" } - val task = CameraCaptureTask(camera, request, guider, executor = threadPoolTaskExecutor) + val task = CameraCaptureTask(camera, request, guider, executor = threadPoolTaskExecutor, calibrationFrameProvider = calibrationFrameService) task.subscribe(this) with(CameraCaptureJob(task)) { @@ -46,6 +48,14 @@ class CameraCaptureExecutor( } } + fun pause(camera: Camera) { + jobs.find { it.task.camera === camera }?.pause() + } + + fun unpause(camera: Camera) { + jobs.find { it.task.camera === camera }?.unpause() + } + fun stop(camera: Camera) { jobs.find { it.task.camera === camera }?.stop() } diff --git a/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureState.kt b/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureState.kt index 4052d019a..7b575976f 100644 --- a/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureState.kt +++ b/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureState.kt @@ -8,6 +8,9 @@ enum class CameraCaptureState { WAITING, SETTLING, DITHERING, + STACKING, + PAUSING, + PAUSED, EXPOSURE_FINISHED, CAPTURE_FINISHED, } diff --git a/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureTask.kt b/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureTask.kt index 6d6ade6f0..a8ecd486c 100644 --- a/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureTask.kt +++ b/api/src/main/kotlin/nebulosa/api/cameras/CameraCaptureTask.kt @@ -2,20 +2,28 @@ package nebulosa.api.cameras import com.fasterxml.jackson.annotation.JsonIgnore import io.reactivex.rxjava3.functions.Consumer +import nebulosa.api.calibration.CalibrationFrameProvider +import nebulosa.api.guiding.DitherAfterExposureEvent import nebulosa.api.guiding.DitherAfterExposureTask import nebulosa.api.guiding.WaitForSettleTask +import nebulosa.api.livestacker.LiveStackingRequest import nebulosa.api.tasks.AbstractTask import nebulosa.api.tasks.SplitTask import nebulosa.api.tasks.delay.DelayEvent import nebulosa.api.tasks.delay.DelayTask import nebulosa.common.concurrency.cancel.CancellationToken +import nebulosa.common.concurrency.latch.PauseListener import nebulosa.guiding.Guider import nebulosa.indi.device.camera.Camera import nebulosa.indi.device.camera.CameraEvent +import nebulosa.indi.device.filterwheel.FilterWheel +import nebulosa.livestacker.LiveStacker import nebulosa.log.loggerFor import java.nio.file.Path import java.time.Duration import java.util.concurrent.Executor +import java.util.concurrent.atomic.AtomicBoolean +import kotlin.io.path.exists data class CameraCaptureTask( @JvmField val camera: Camera, @@ -24,7 +32,8 @@ data class CameraCaptureTask( private val useFirstExposure: Boolean = false, private val exposureMaxRepeat: Int = 0, private val executor: Executor? = null, -) : AbstractTask(), Consumer, CameraEventAware { + private val calibrationFrameProvider: CalibrationFrameProvider? = null, +) : AbstractTask(), Consumer, PauseListener, CameraEventAware { private val delayTask = DelayTask(request.exposureDelay) private val waitForSettleTask = WaitForSettleTask(guider) @@ -32,7 +41,6 @@ data class CameraCaptureTask( private val cameraExposureTask = CameraExposureTask(camera, request) private val ditherAfterExposureTask = DitherAfterExposureTask(guider, request.dither) - @Volatile private var state = CameraCaptureState.IDLE @Volatile private var exposureCount = 0 @Volatile private var captureRemainingTime = Duration.ZERO @Volatile private var prevCaptureElapsedTime = Duration.ZERO @@ -41,12 +49,16 @@ data class CameraCaptureTask( @Volatile private var stepRemainingTime = Duration.ZERO @Volatile private var stepElapsedTime = Duration.ZERO @Volatile private var stepProgress = 0.0 - @Volatile private var savePath: Path? = null + @Volatile private var savedPath: Path? = null + @Volatile private var liveStackedPath: Path? = null @JvmField @JsonIgnore val estimatedCaptureTime: Duration = if (request.isLoop) Duration.ZERO else Duration.ofNanos(request.exposureTime.toNanos() * request.exposureAmount + request.exposureDelay.toNanos() * (request.exposureAmount - if (useFirstExposure) 0 else 1)) @Volatile private var exposureRepeatCount = 0 + @Volatile private var liveStacker: LiveStacker? = null + + private val pausing = AtomicBoolean() init { delayTask.subscribe(this) @@ -62,19 +74,93 @@ data class CameraCaptureTask( cameraExposureTask.handleCameraEvent(event) } + override fun onPause(paused: Boolean) { + pausing.set(paused) + + if (paused) { + sendEvent(CameraCaptureState.PAUSING) + } + } + + private fun LiveStackingRequest.processCalibrationGroup(): LiveStackingRequest { + return if (calibrationFrameProvider != null && enabled && + !request.calibrationGroup.isNullOrBlank() && (dark == null || flat == null || bias == null) + ) { + val calibrationGroup = request.calibrationGroup + val temperature = camera.temperature + val binX = request.binX + val binY = request.binY + val width = request.width / binX + val height = request.height / binY + val exposureTime = request.exposureTime.toNanos() / 1000 + val gain = request.gain.toDouble() + + val wheel = camera.snoopedDevices.firstOrNull { it is FilterWheel } as? FilterWheel + val filter = wheel?.let { it.names.getOrNull(it.position - 1) } + + LOG.info( + "find calibration frames for live stacking. group={}, temperature={}, binX={}, binY={}. width={}, height={}, exposureTime={}, gain={}, filter={}", + calibrationGroup, temperature, binX, binY, width, height, exposureTime, gain, filter + ) + + val newDark = dark?.takeIf { it.exists() } ?: calibrationFrameProvider + .findBestDarkFrames(calibrationGroup, temperature, width, height, binX, binY, exposureTime, gain) + .firstOrNull() + ?.path + + val newFlat = flat?.takeIf { it.exists() } ?: calibrationFrameProvider + .findBestFlatFrames(calibrationGroup, width, height, binX, binY, filter) + .firstOrNull() + ?.path + + val newBias = if (newDark != null) null else bias?.takeIf { it.exists() } ?: calibrationFrameProvider + .findBestBiasFrames(calibrationGroup, width, height, binX, binY) + .firstOrNull() + ?.path + + LOG.info("live stacking will use calibration frames. group={}, dark={}, flat={}, bias={}", calibrationGroup, newDark, newFlat, newBias) + + copy(dark = newDark, flat = newFlat, bias = newBias) + } else { + this + } + } + override fun execute(cancellationToken: CancellationToken) { LOG.info("Camera Capture started. camera={}, request={}, exposureCount={}", camera, request, exposureCount) cameraExposureTask.reset() + pausing.set(false) + cancellationToken.listenToPause(this) + + if (liveStacker == null && request.liveStacking.enabled && + (request.isLoop || request.exposureAmount > 1 || exposureMaxRepeat > 1) + ) { + try { + liveStacker = request.liveStacking.processCalibrationGroup().get() + liveStacker!!.start() + } catch (e: Throwable) { + LOG.error("failed to start live stacking. request={}", request.liveStacking, e) + + liveStacker?.close() + liveStacker = null + } + } + while (!cancellationToken.isCancelled && !cameraExposureTask.isAborted && ((exposureMaxRepeat > 0 && exposureRepeatCount < exposureMaxRepeat) || (exposureMaxRepeat <= 0 && (request.isLoop || exposureCount < request.exposureAmount))) ) { + if (cancellationToken.isPaused) { + pausing.set(false) + sendEvent(CameraCaptureState.PAUSED) + cancellationToken.waitForPause() + } + if (exposureCount == 0) { - state = CameraCaptureState.CAPTURE_STARTED - sendEvent() + sendEvent(CameraCaptureState.CAPTURE_STARTED) if (guider != null) { if (useFirstExposure) { @@ -107,11 +193,12 @@ data class CameraCaptureTask( } } - if (state != CameraCaptureState.CAPTURE_FINISHED) { - state = CameraCaptureState.CAPTURE_FINISHED - sendEvent() - } + pausing.set(false) + cancellationToken.unlistenToPause(this) + + sendEvent(CameraCaptureState.CAPTURE_FINISHED) + liveStacker?.close() exposureRepeatCount = 0 LOG.info("Camera Capture finished. camera={}, request={}, exposureCount={}", camera, request, exposureCount) @@ -119,72 +206,90 @@ data class CameraCaptureTask( @Synchronized override fun accept(event: Any) { - when (event) { + val state = when (event) { is DelayEvent -> { - state = CameraCaptureState.WAITING captureElapsedTime += event.waitTime stepElapsedTime = event.task.duration - event.remainingTime stepRemainingTime = event.remainingTime stepProgress = event.progress + CameraCaptureState.WAITING } is CameraExposureEvent -> { when (event.state) { CameraExposureState.STARTED -> { - state = CameraCaptureState.EXPOSURE_STARTED prevCaptureElapsedTime = captureElapsedTime exposureCount++ exposureRepeatCount++ + CameraCaptureState.EXPOSURE_STARTED } CameraExposureState.ELAPSED -> { - state = CameraCaptureState.EXPOSURING captureElapsedTime = prevCaptureElapsedTime + event.elapsedTime stepElapsedTime = event.elapsedTime stepRemainingTime = event.remainingTime stepProgress = event.progress + CameraCaptureState.EXPOSURING } CameraExposureState.FINISHED -> { - state = CameraCaptureState.EXPOSURE_FINISHED captureElapsedTime = prevCaptureElapsedTime + request.exposureTime - savePath = event.savedPath + savedPath = event.savedPath + liveStackedPath = addFrameToLiveStacker(savedPath) + CameraCaptureState.EXPOSURE_FINISHED } CameraExposureState.IDLE -> { - state = CameraCaptureState.CAPTURE_FINISHED + CameraCaptureState.CAPTURE_FINISHED } } } - else -> return LOG.warn("unknown event: {}", event) + is DitherAfterExposureEvent -> { + CameraCaptureState.DITHERING + } + else -> { + return LOG.warn("unknown event: {}", event) + } } - sendEvent() + sendEvent(state) } - private fun sendEvent() { + private fun sendEvent(state: CameraCaptureState) { if (state != CameraCaptureState.IDLE && !request.isLoop) { captureRemainingTime = if (estimatedCaptureTime > captureElapsedTime) estimatedCaptureTime - captureElapsedTime else Duration.ZERO captureProgress = (estimatedCaptureTime - captureRemainingTime).toNanos().toDouble() / estimatedCaptureTime.toNanos() } + val isExposureFinished = state == CameraCaptureState.EXPOSURE_FINISHED + val event = CameraCaptureEvent( - camera, state, request.exposureAmount, exposureCount, + this, camera, if (pausing.get() && !isExposureFinished) CameraCaptureState.PAUSING else state, request.exposureAmount, exposureCount, captureRemainingTime, captureElapsedTime, captureProgress, stepRemainingTime, stepElapsedTime, stepProgress, - savePath + savedPath, liveStackedPath, + if (isExposureFinished) request else null ) onNext(event) } + private fun addFrameToLiveStacker(path: Path?): Path? { + return if (path == null || liveStacker == null) { + null + } else { + sendEvent(CameraCaptureState.STACKING) + liveStacker!!.add(path) + } + } + override fun close() { delayTask.close() waitForSettleTask.close() delayAndWaitForSettleSplitTask.close() cameraExposureTask.close() ditherAfterExposureTask.close() + liveStacker?.close() super.close() } override fun reset() { - state = CameraCaptureState.IDLE exposureCount = 0 captureRemainingTime = Duration.ZERO prevCaptureElapsedTime = Duration.ZERO @@ -193,12 +298,14 @@ data class CameraCaptureTask( stepRemainingTime = Duration.ZERO stepElapsedTime = Duration.ZERO stepProgress = 0.0 - savePath = null + savedPath = null + liveStackedPath = null delayTask.reset() cameraExposureTask.reset() ditherAfterExposureTask.reset() + pausing.set(false) exposureRepeatCount = 0 } diff --git a/api/src/main/kotlin/nebulosa/api/cameras/CameraController.kt b/api/src/main/kotlin/nebulosa/api/cameras/CameraController.kt index 58f4e460b..38dd89fc6 100644 --- a/api/src/main/kotlin/nebulosa/api/cameras/CameraController.kt +++ b/api/src/main/kotlin/nebulosa/api/cameras/CameraController.kt @@ -61,6 +61,16 @@ class CameraController( @RequestBody body: CameraStartCaptureRequest, ) = cameraService.startCapture(camera, body) + @PutMapping("{camera}/capture/pause") + fun pauseCapture(camera: Camera) { + cameraService.pauseCapture(camera) + } + + @PutMapping("{camera}/capture/unpause") + fun unpauseCapture(camera: Camera) { + cameraService.unpauseCapture(camera) + } + @PutMapping("{camera}/capture/abort") fun abortCapture(camera: Camera) { cameraService.abortCapture(camera) diff --git a/api/src/main/kotlin/nebulosa/api/cameras/CameraService.kt b/api/src/main/kotlin/nebulosa/api/cameras/CameraService.kt index ddd92e97a..f92b075bf 100644 --- a/api/src/main/kotlin/nebulosa/api/cameras/CameraService.kt +++ b/api/src/main/kotlin/nebulosa/api/cameras/CameraService.kt @@ -43,6 +43,14 @@ class CameraService( cameraCaptureExecutor.execute(camera, request.copy(savePath = savePath)) } + fun pauseCapture(camera: Camera) { + cameraCaptureExecutor.pause(camera) + } + + fun unpauseCapture(camera: Camera) { + cameraCaptureExecutor.unpause(camera) + } + @Synchronized fun abortCapture(camera: Camera) { cameraCaptureExecutor.stop(camera) diff --git a/api/src/main/kotlin/nebulosa/api/cameras/CameraStartCaptureRequest.kt b/api/src/main/kotlin/nebulosa/api/cameras/CameraStartCaptureRequest.kt index c39ab7323..ac243e9d7 100644 --- a/api/src/main/kotlin/nebulosa/api/cameras/CameraStartCaptureRequest.kt +++ b/api/src/main/kotlin/nebulosa/api/cameras/CameraStartCaptureRequest.kt @@ -4,6 +4,7 @@ import jakarta.validation.Valid import jakarta.validation.constraints.Positive import jakarta.validation.constraints.PositiveOrZero import nebulosa.api.guiding.DitherAfterExposureRequest +import nebulosa.api.livestacker.LiveStackingRequest import nebulosa.indi.device.camera.FrameType import org.hibernate.validator.constraints.Range import org.hibernate.validator.constraints.time.DurationMax @@ -35,6 +36,7 @@ data class CameraStartCaptureRequest( @JvmField val autoSubFolderMode: AutoSubFolderMode = AutoSubFolderMode.OFF, @field:Valid @JvmField val dither: DitherAfterExposureRequest = DitherAfterExposureRequest.DISABLED, @JvmField val calibrationGroup: String? = null, + @JvmField val liveStacking: LiveStackingRequest = LiveStackingRequest.EMPTY, // Filter Wheel. @JvmField val filterPosition: Int = 0, @JvmField val shutterPosition: Int = 0, diff --git a/api/src/main/kotlin/nebulosa/api/framing/FramingService.kt b/api/src/main/kotlin/nebulosa/api/framing/FramingService.kt index 6a31eb37a..5ed33f323 100644 --- a/api/src/main/kotlin/nebulosa/api/framing/FramingService.kt +++ b/api/src/main/kotlin/nebulosa/api/framing/FramingService.kt @@ -7,7 +7,7 @@ import nebulosa.image.Image import nebulosa.io.transferAndCloseOutput import nebulosa.log.loggerFor import nebulosa.math.Angle -import nebulosa.plate.solving.PlateSolution +import nebulosa.platesolver.PlateSolution import org.springframework.stereotype.Service import java.nio.file.Files import java.nio.file.Path diff --git a/api/src/main/kotlin/nebulosa/api/guiding/DitherAfterExposureTask.kt b/api/src/main/kotlin/nebulosa/api/guiding/DitherAfterExposureTask.kt index aa59f6828..74e58df06 100644 --- a/api/src/main/kotlin/nebulosa/api/guiding/DitherAfterExposureTask.kt +++ b/api/src/main/kotlin/nebulosa/api/guiding/DitherAfterExposureTask.kt @@ -19,7 +19,6 @@ data class DitherAfterExposureTask( private val ditherLatch = CountUpDownLatch() - @Volatile private var state = DitherAfterExposureState.IDLE @Volatile private var dx = 0.0 @Volatile private var dy = 0.0 @Volatile private var elapsedTime = Duration.ZERO @@ -36,21 +35,19 @@ data class DitherAfterExposureTask( guider.registerGuiderListener(this) ditherLatch.countUp() - state = DitherAfterExposureState.STARTED - sendEvent() + sendEvent(DitherAfterExposureState.STARTED) elapsedTime = Duration.ofMillis(measureTimeMillis { guider.dither(request.amount, request.raOnly) ditherLatch.await() }) } finally { - state = DitherAfterExposureState.FINISHED - sendEvent() + sendEvent(DitherAfterExposureState.FINISHED) guider.unregisterGuiderListener(this) cancellationToken.unlisten(this) - LOG.info("Dither finished. request={}", request) + LOG.info("Dither finished. elapsedTime={}, request={}", elapsedTime, request) } } } @@ -58,10 +55,9 @@ data class DitherAfterExposureTask( override fun onDithered(dx: Double, dy: Double) { this.dx = dx this.dy = dy - state = DitherAfterExposureState.DITHERED + sendEvent(DitherAfterExposureState.DITHERED) LOG.info("dithered. dx={}, dy={}", dx, dy) - ditherLatch.reset() } @@ -73,10 +69,9 @@ data class DitherAfterExposureTask( dx = 0.0 dy = 0.0 elapsedTime = Duration.ZERO - state = DitherAfterExposureState.IDLE } - private fun sendEvent() { + private fun sendEvent(state: DitherAfterExposureState) { onNext(DitherAfterExposureEvent(this, state, dx, dy, elapsedTime)) } diff --git a/api/src/main/kotlin/nebulosa/api/image/ImageBucket.kt b/api/src/main/kotlin/nebulosa/api/image/ImageBucket.kt index 7d51daeb3..ac5670f67 100644 --- a/api/src/main/kotlin/nebulosa/api/image/ImageBucket.kt +++ b/api/src/main/kotlin/nebulosa/api/image/ImageBucket.kt @@ -2,26 +2,33 @@ package nebulosa.api.image import nebulosa.fits.fits import nebulosa.image.Image -import nebulosa.plate.solving.PlateSolution +import nebulosa.log.loggerFor +import nebulosa.platesolver.PlateSolution import nebulosa.xisf.xisf import org.springframework.stereotype.Component +import java.io.Closeable import java.nio.file.Path +import java.util.* +import java.util.concurrent.ConcurrentHashMap +import kotlin.concurrent.timer import kotlin.io.path.extension @Component -class ImageBucket { +class ImageBucket : Closeable { data class OpenedImage( - @JvmField val image: Image, + @JvmField var image: Image? = null, @JvmField var solution: PlateSolution? = null, @JvmField val debayer: Boolean = true, + @JvmField var openedAt: Long = System.currentTimeMillis(), ) - private val bucket = HashMap(256) + private val bucket = ConcurrentHashMap(8) + private val timer = timer("Image Bucket Timer", true, IMAGES_MAX_TIME, IMAGES_MAX_TIME, ::deleteUnusedImages) @Synchronized - fun put(path: Path, image: Image, solution: PlateSolution? = null, debayer: Boolean = true) { - bucket[path] = OpenedImage(image, solution ?: PlateSolution.from(image.header), debayer) + fun put(path: Path, image: Image, solution: PlateSolution? = null, debayer: Boolean = true): OpenedImage { + return OpenedImage(image, solution ?: PlateSolution.from(image.header), debayer).also { bucket[path] = it } } @Synchronized @@ -32,11 +39,17 @@ class ImageBucket { } @Synchronized - fun open(path: Path, debayer: Boolean = true, solution: PlateSolution? = null, force: Boolean = false): Image { + fun open( + path: Path, debayer: Boolean = this[path]?.debayer ?: true, + solution: PlateSolution? = null, force: Boolean = false + ): OpenedImage { val openedImage = this[path] if (openedImage != null && !force && debayer == openedImage.debayer) { - return openedImage.image + if (openedImage.image != null && solution == null) { + openedImage.openedAt = System.currentTimeMillis() + return openedImage + } } val representation = when (path.extension.lowercase()) { @@ -46,8 +59,7 @@ class ImageBucket { } val image = representation.use { Image.open(it, debayer) } - put(path, image, solution, debayer) - return image + return put(path, image, solution ?: openedImage?.solution, debayer) } @Synchronized @@ -60,7 +72,7 @@ class ImageBucket { } operator fun contains(path: Path): Boolean { - return path in bucket + return bucket.containsKey(path) } operator fun contains(image: Image): Boolean { @@ -70,4 +82,29 @@ class ImageBucket { operator fun contains(solution: PlateSolution): Boolean { return bucket.any { it.value.solution === solution } } + + override fun close() { + timer.cancel() + } + + @Suppress("UNUSED_PARAMETER") + private fun deleteUnusedImages(task: TimerTask) { + val currentTime = System.currentTimeMillis() + + synchronized(this) { + for ((path, image) in bucket) { + if (currentTime - image.openedAt >= IMAGES_MAX_TIME) { + image.image = null + LOG.info("image at {} has been disposed", path) + } + } + } + } + + companion object { + + private const val IMAGES_MAX_TIME = 1000 * 60 * 5L // 5 min + + @JvmStatic private val LOG = loggerFor() + } } diff --git a/api/src/main/kotlin/nebulosa/api/image/ImageService.kt b/api/src/main/kotlin/nebulosa/api/image/ImageService.kt index ff452a3e2..d73785c67 100644 --- a/api/src/main/kotlin/nebulosa/api/image/ImageService.kt +++ b/api/src/main/kotlin/nebulosa/api/image/ImageService.kt @@ -82,8 +82,8 @@ class ImageService( path: Path, camera: Camera?, transformation: ImageTransformation, output: HttpServletResponse, ) { - val image = imageBucket.open(path, transformation.debayer, force = transformation.force) - val (transformedImage, statistics, stretchParams, instrument) = image.transform(true, transformation, ImageOperation.OPEN, camera) + val (image, calibration) = imageBucket.open(path, transformation.debayer, force = transformation.force) + val (transformedImage, statistics, stretchParams, instrument) = image!!.transform(true, transformation, ImageOperation.OPEN, camera) val info = ImageInfo( path, @@ -91,7 +91,7 @@ class ImageService( stretchParams!!.shadow, stretchParams.highlight, stretchParams.midtone, transformedImage.header.rightAscension.takeIf { it.isFinite() }, transformedImage.header.declination.takeIf { it.isFinite() }, - imageBucket[path]?.solution?.let(::ImageSolved), + calibration?.let(::ImageSolved), transformedImage.header.mapNotNull { if (it.isCommentStyle) null else ImageHeaderItem(it.key, it.value) }, transformedImage.header.bitpix, instrument, statistics, ) @@ -170,9 +170,9 @@ class ImageService( minorPlanetMagLimit: Double = 12.0, useSimbad: Boolean = false, location: Location? = null, ): List { - val (image, calibration) = imageBucket[path] ?: return emptyList() + val (image, calibration) = imageBucket.open(path) - if (calibration.isNullOrEmpty() || !calibration.solved) { + if (image == null || calibration.isNullOrEmpty() || !calibration.solved) { return emptyList() } @@ -267,8 +267,8 @@ class ImageService( return annotations } - fun saveImageAs(inputPath: Path, save: SaveImage, camera: Camera?) { - val (image) = imageBucket[inputPath]?.image?.transform(save.shouldBeTransformed, save.transformation, ImageOperation.SAVE) + fun saveImageAs(path: Path, save: SaveImage, camera: Camera?) { + val (image) = imageBucket.open(path).image?.transform(save.shouldBeTransformed, save.transformation, ImageOperation.SAVE) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "Image not found") require(save.path != null) @@ -295,9 +295,9 @@ class ImageService( } fun coordinateInterpolation(path: Path): CoordinateInterpolation? { - val (image, calibration) = imageBucket[path] ?: return null + val (image, calibration) = imageBucket.open(path) - if (calibration.isNullOrEmpty() || !calibration.solved) { + if (image == null || calibration.isNullOrEmpty() || !calibration.solved) { return null } @@ -331,8 +331,7 @@ class ImageService( } fun histogram(path: Path, bitLength: Int = 16): IntArray { - val (image) = imageBucket[path] ?: return IntArray(0) - return image.compute(Histogram(bitLength = bitLength)) + return imageBucket.open(path).image?.compute(Histogram(bitLength = bitLength)) ?: IntArray(0) } companion object { diff --git a/api/src/main/kotlin/nebulosa/api/image/ImageSolved.kt b/api/src/main/kotlin/nebulosa/api/image/ImageSolved.kt index aaf2a8122..5823fffc0 100644 --- a/api/src/main/kotlin/nebulosa/api/image/ImageSolved.kt +++ b/api/src/main/kotlin/nebulosa/api/image/ImageSolved.kt @@ -1,7 +1,7 @@ package nebulosa.api.image import nebulosa.math.* -import nebulosa.plate.solving.PlateSolution +import nebulosa.platesolver.PlateSolution data class ImageSolved( val solved: Boolean = false, diff --git a/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackerType.kt b/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackerType.kt new file mode 100644 index 000000000..c6d1dbe84 --- /dev/null +++ b/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackerType.kt @@ -0,0 +1,6 @@ +package nebulosa.api.livestacker + +enum class LiveStackerType { + SIRIL, + PIXINSIGHT, +} diff --git a/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackingController.kt b/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackingController.kt new file mode 100644 index 000000000..03acb8096 --- /dev/null +++ b/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackingController.kt @@ -0,0 +1,27 @@ +package nebulosa.api.livestacker + +import jakarta.validation.Valid +import jakarta.validation.constraints.NotBlank +import nebulosa.indi.device.camera.Camera +import org.springframework.web.bind.annotation.* +import java.nio.file.Path + +@RestController +@RequestMapping("live-stacking") +class LiveStackingController(private val liveStackingService: LiveStackingService) { + + @PutMapping("{camera}/start") + fun start(camera: Camera, @RequestBody body: LiveStackingRequest) { + liveStackingService.start(camera, body) + } + + @PutMapping("{camera}/add") + fun add(camera: Camera, @RequestParam @Valid @NotBlank path: Path): Path? { + return liveStackingService.add(camera, path) + } + + @PutMapping("{camera}/stop") + fun stop(camera: Camera) { + liveStackingService.stop(camera) + } +} diff --git a/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackingRequest.kt b/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackingRequest.kt new file mode 100644 index 000000000..f44d606ff --- /dev/null +++ b/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackingRequest.kt @@ -0,0 +1,48 @@ +package nebulosa.api.livestacker + +import nebulosa.livestacker.LiveStacker +import nebulosa.pixinsight.livestacker.PixInsightLiveStacker +import nebulosa.pixinsight.script.PixInsightIsRunning +import nebulosa.pixinsight.script.PixInsightScriptRunner +import nebulosa.pixinsight.script.PixInsightStartup +import nebulosa.siril.livestacker.SirilLiveStacker +import org.jetbrains.annotations.NotNull +import java.nio.file.Files +import java.nio.file.Path +import java.util.function.Supplier + +data class LiveStackingRequest( + @JvmField val enabled: Boolean = false, + @JvmField val type: LiveStackerType = LiveStackerType.SIRIL, + @JvmField @field:NotNull val executablePath: Path? = null, + @JvmField val dark: Path? = null, + @JvmField val flat: Path? = null, + @JvmField val bias: Path? = null, + @JvmField val use32Bits: Boolean = false, + @JvmField val slot: Int = 1, +) : Supplier { + + override fun get(): LiveStacker { + val workingDirectory = Files.createTempDirectory("ls-") + + return when (type) { + LiveStackerType.SIRIL -> SirilLiveStacker(executablePath!!, workingDirectory, dark, flat, use32Bits) + LiveStackerType.PIXINSIGHT -> { + val runner = PixInsightScriptRunner(executablePath!!) + + if (!PixInsightIsRunning(slot).use { it.runSync(runner) }) { + if (!PixInsightStartup(slot).use { it.runSync(runner) }) { + throw IllegalStateException("unable to start PixInsight") + } + } + + PixInsightLiveStacker(runner, workingDirectory, dark, flat, bias, use32Bits, slot) + } + } + } + + companion object { + + @JvmStatic val EMPTY = LiveStackingRequest() + } +} diff --git a/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackingService.kt b/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackingService.kt new file mode 100644 index 000000000..deebb2c68 --- /dev/null +++ b/api/src/main/kotlin/nebulosa/api/livestacker/LiveStackingService.kt @@ -0,0 +1,29 @@ +package nebulosa.api.livestacker + +import nebulosa.indi.device.camera.Camera +import nebulosa.livestacker.LiveStacker +import org.springframework.stereotype.Service +import java.nio.file.Path +import java.util.concurrent.ConcurrentHashMap + +@Service +class LiveStackingService { + + private val liveStackers = ConcurrentHashMap(2) + + fun start(camera: Camera, options: LiveStackingRequest) { + stop(camera) + + val liveStacker = options.get() + liveStackers[camera] = liveStacker + liveStacker.start() + } + + fun add(camera: Camera, path: Path): Path? { + return liveStackers[camera]?.add(path) + } + + fun stop(camera: Camera) { + liveStackers.remove(camera)?.stop() + } +} diff --git a/api/src/main/kotlin/nebulosa/api/mounts/MountService.kt b/api/src/main/kotlin/nebulosa/api/mounts/MountService.kt index 08d2e882f..e60a61a74 100644 --- a/api/src/main/kotlin/nebulosa/api/mounts/MountService.kt +++ b/api/src/main/kotlin/nebulosa/api/mounts/MountService.kt @@ -224,11 +224,10 @@ class MountService( } fun pointMountHere(mount: Mount, path: Path, x: Double, y: Double) { - val calibration = imageBucket[path]?.solution ?: return + val calibration = imageBucket.open(path).solution ?: return if (calibration.isNotEmpty() && calibration.solved) { - val wcs = WCS(calibration) - val (rightAscension, declination) = wcs.use { it.pixToSky(x, y) } // J2000 + val (rightAscension, declination) = WCS(calibration).use { it.pixToSky(x, y) } // J2000 val icrf = ICRF.equatorial(calibration.rightAscension, calibration.declination) val (calibratedRA, calibratedDEC) = icrf.equatorialAtDate() diff --git a/api/src/main/kotlin/nebulosa/api/solver/PlateSolverController.kt b/api/src/main/kotlin/nebulosa/api/platesolver/PlateSolverController.kt similarity index 90% rename from api/src/main/kotlin/nebulosa/api/solver/PlateSolverController.kt rename to api/src/main/kotlin/nebulosa/api/platesolver/PlateSolverController.kt index f4936f0fa..b21d1c08d 100644 --- a/api/src/main/kotlin/nebulosa/api/solver/PlateSolverController.kt +++ b/api/src/main/kotlin/nebulosa/api/platesolver/PlateSolverController.kt @@ -1,4 +1,4 @@ -package nebulosa.api.solver +package nebulosa.api.platesolver import jakarta.validation.Valid import nebulosa.api.beans.converters.angle.AngleParam @@ -15,7 +15,7 @@ class PlateSolverController( @PutMapping fun solveImage( @RequestParam path: Path, - @RequestBody @Valid solver: PlateSolverOptions, + @RequestBody @Valid solver: PlateSolverRequest, @RequestParam(required = false, defaultValue = "true") blind: Boolean, @AngleParam(required = false, isHours = true, defaultValue = "0.0") centerRA: Angle, @AngleParam(required = false, defaultValue = "0.0") centerDEC: Angle, diff --git a/api/src/main/kotlin/nebulosa/api/solver/PlateSolverOptions.kt b/api/src/main/kotlin/nebulosa/api/platesolver/PlateSolverRequest.kt similarity index 72% rename from api/src/main/kotlin/nebulosa/api/solver/PlateSolverOptions.kt rename to api/src/main/kotlin/nebulosa/api/platesolver/PlateSolverRequest.kt index 1612c43cc..dfd73f7d0 100644 --- a/api/src/main/kotlin/nebulosa/api/solver/PlateSolverOptions.kt +++ b/api/src/main/kotlin/nebulosa/api/platesolver/PlateSolverRequest.kt @@ -1,9 +1,10 @@ -package nebulosa.api.solver +package nebulosa.api.platesolver -import nebulosa.astap.plate.solving.AstapPlateSolver +import nebulosa.astap.platesolver.AstapPlateSolver import nebulosa.astrometrynet.nova.NovaAstrometryNetService -import nebulosa.astrometrynet.plate.solving.LocalAstrometryNetPlateSolver -import nebulosa.astrometrynet.plate.solving.NovaAstrometryNetPlateSolver +import nebulosa.astrometrynet.platesolver.LocalAstrometryNetPlateSolver +import nebulosa.astrometrynet.platesolver.NovaAstrometryNetPlateSolver +import nebulosa.siril.platesolver.SirilPlateSolver import okhttp3.OkHttpClient import org.hibernate.validator.constraints.time.DurationMax import org.hibernate.validator.constraints.time.DurationMin @@ -12,10 +13,12 @@ import java.nio.file.Path import java.time.Duration import java.time.temporal.ChronoUnit -data class PlateSolverOptions( +data class PlateSolverRequest( @JvmField val type: PlateSolverType = PlateSolverType.ASTROMETRY_NET_ONLINE, @JvmField val executablePath: Path? = null, @JvmField val downsampleFactor: Int = 0, + @JvmField val focalLength: Double = 0.0, + @JvmField val pixelSize: Double = 0.0, @JvmField val apiUrl: String = "", @JvmField val apiKey: String = "", @field:DurationMin(seconds = 0) @field:DurationMax(minutes = 5) @field:DurationUnit(ChronoUnit.SECONDS) @@ -31,12 +34,13 @@ data class PlateSolverOptions( val service = NOVA_ASTROMETRY_NET_CACHE.getOrPut(key) { NovaAstrometryNetService(apiUrl, httpClient) } NovaAstrometryNetPlateSolver(service, apiKey) } + PlateSolverType.SIRIL -> SirilPlateSolver(executablePath!!, focalLength, pixelSize) } } companion object { - @JvmStatic val EMPTY = PlateSolverOptions() + @JvmStatic val EMPTY = PlateSolverRequest() @JvmStatic private val NOVA_ASTROMETRY_NET_CACHE = HashMap() } } diff --git a/api/src/main/kotlin/nebulosa/api/solver/PlateSolverService.kt b/api/src/main/kotlin/nebulosa/api/platesolver/PlateSolverService.kt similarity index 72% rename from api/src/main/kotlin/nebulosa/api/solver/PlateSolverService.kt rename to api/src/main/kotlin/nebulosa/api/platesolver/PlateSolverService.kt index 61f0e0790..aa7fbb45c 100644 --- a/api/src/main/kotlin/nebulosa/api/solver/PlateSolverService.kt +++ b/api/src/main/kotlin/nebulosa/api/platesolver/PlateSolverService.kt @@ -1,4 +1,4 @@ -package nebulosa.api.solver +package nebulosa.api.platesolver import nebulosa.api.image.ImageBucket import nebulosa.api.image.ImageSolved @@ -14,7 +14,7 @@ class PlateSolverService( ) { fun solveImage( - options: PlateSolverOptions, path: Path, + options: PlateSolverRequest, path: Path, centerRA: Angle, centerDEC: Angle, radius: Angle, ): ImageSolved { val calibration = solve(options, path, centerRA, centerDEC, radius) @@ -24,8 +24,7 @@ class PlateSolverService( @Synchronized fun solve( - options: PlateSolverOptions, path: Path, + options: PlateSolverRequest, path: Path, centerRA: Angle = 0.0, centerDEC: Angle = 0.0, radius: Angle = 0.0, - ) = options.get(httpClient) - .solve(path, null, centerRA, centerDEC, radius, 1, options.timeout.takeIf { it.toSeconds() > 0 }) + ) = options.get(httpClient).solve(path, null, centerRA, centerDEC, radius, options.downsampleFactor, options.timeout) } diff --git a/api/src/main/kotlin/nebulosa/api/solver/PlateSolverType.kt b/api/src/main/kotlin/nebulosa/api/platesolver/PlateSolverType.kt similarity index 67% rename from api/src/main/kotlin/nebulosa/api/solver/PlateSolverType.kt rename to api/src/main/kotlin/nebulosa/api/platesolver/PlateSolverType.kt index 4ef5b34f5..3c85a9a86 100644 --- a/api/src/main/kotlin/nebulosa/api/solver/PlateSolverType.kt +++ b/api/src/main/kotlin/nebulosa/api/platesolver/PlateSolverType.kt @@ -1,7 +1,8 @@ -package nebulosa.api.solver +package nebulosa.api.platesolver enum class PlateSolverType { ASTAP, ASTROMETRY_NET, ASTROMETRY_NET_ONLINE, + SIRIL, } diff --git a/api/src/main/kotlin/nebulosa/api/preferences/PreferenceRepository.kt b/api/src/main/kotlin/nebulosa/api/preferences/PreferenceRepository.kt index c341870c5..ce5ea8fba 100644 --- a/api/src/main/kotlin/nebulosa/api/preferences/PreferenceRepository.kt +++ b/api/src/main/kotlin/nebulosa/api/preferences/PreferenceRepository.kt @@ -1,7 +1,7 @@ package nebulosa.api.preferences import io.objectbox.Box -import io.objectbox.query.QueryBuilder.StringOrder.CASE_SENSITIVE +import io.objectbox.kotlin.equal import nebulosa.api.repositories.BoxRepository import org.springframework.beans.factory.annotation.Qualifier import org.springframework.stereotype.Component @@ -10,24 +10,18 @@ import org.springframework.stereotype.Component class PreferenceRepository(@Qualifier("preferenceBox") override val box: Box) : BoxRepository() { fun existsByKey(key: String): Boolean { - return box.query() - .equal(PreferenceEntity_.key, key, CASE_SENSITIVE) - .build() - .use { it.findUnique() != null } + return box.query(PreferenceEntity_.key equal key) + .build().use { it.findUnique() != null } } fun findByKey(key: String): PreferenceEntity? { - return box.query() - .equal(PreferenceEntity_.key, key, CASE_SENSITIVE) - .build() - .use { it.findUnique() } + return box.query(PreferenceEntity_.key equal key) + .build().use { it.findUnique() } } @Synchronized fun deleteByKey(key: String) { - return box.query() - .equal(PreferenceEntity_.key, key, CASE_SENSITIVE) - .build() - .use { it.remove() } + return box.query(PreferenceEntity_.key equal key) + .build().use { it.remove() } } } diff --git a/api/src/main/kotlin/nebulosa/api/repositories/BoxRepository.kt b/api/src/main/kotlin/nebulosa/api/repositories/BoxRepository.kt index 98223b3c4..702837d54 100644 --- a/api/src/main/kotlin/nebulosa/api/repositories/BoxRepository.kt +++ b/api/src/main/kotlin/nebulosa/api/repositories/BoxRepository.kt @@ -1,6 +1,13 @@ package nebulosa.api.repositories import io.objectbox.Box +import io.objectbox.Property +import io.objectbox.kotlin.and +import io.objectbox.kotlin.equal +import io.objectbox.kotlin.or +import io.objectbox.query.PropertyQueryCondition +import io.objectbox.query.QueryBuilder.StringOrder +import io.objectbox.query.QueryCondition import nebulosa.api.database.BoxEntity abstract class BoxRepository : Collection { @@ -58,4 +65,53 @@ abstract class BoxRepository : Collection { override fun contains(element: T): Boolean { return element.id in box } + + companion object { + + inline val Property.isTrue + get() = this equal true + + inline val Property.isFalse + get() = this equal false + + @Suppress("NOTHING_TO_INLINE") + inline infix fun Property.equalInsensitive(value: String): PropertyQueryCondition { + return equal(value, StringOrder.CASE_INSENSITIVE) + } + + @Suppress("NOTHING_TO_INLINE") + inline infix fun Property.containsInsensitive(value: String): PropertyQueryCondition { + return contains(value, StringOrder.CASE_INSENSITIVE) + } + + @JvmStatic + fun and(condition: QueryCondition, vararg conditions: QueryCondition?): QueryCondition { + return conditions.fold(condition) { a, b -> if (b == null) a else a and b } + } + + @JvmStatic + fun and(vararg conditions: QueryCondition?): QueryCondition? { + return if (conditions.isEmpty()) null else conditions.reduce { a, b -> if (b == null) a else a?.and(b) ?: b } + } + + @JvmStatic + fun and(conditions: Collection?>): QueryCondition? { + return if (conditions.isEmpty()) null else conditions.reduce { a, b -> if (b == null) a else a?.and(b) ?: b } + } + + @JvmStatic + fun or(condition: QueryCondition, vararg conditions: QueryCondition?): QueryCondition { + return conditions.fold(condition) { a, b -> if (b == null) a else a or b } + } + + @JvmStatic + fun or(vararg conditions: QueryCondition?): QueryCondition? { + return if (conditions.isEmpty()) null else conditions.reduce { a, b -> if (b == null) a else a?.or(b) ?: b } + } + + @JvmStatic + fun or(conditions: Collection?>): QueryCondition? { + return if (conditions.isEmpty()) null else conditions.reduce { a, b -> if (b == null) a else a?.or(b) ?: b } + } + } } diff --git a/api/src/main/kotlin/nebulosa/api/sequencer/SequencerController.kt b/api/src/main/kotlin/nebulosa/api/sequencer/SequencerController.kt index fd36445da..17f9d715a 100644 --- a/api/src/main/kotlin/nebulosa/api/sequencer/SequencerController.kt +++ b/api/src/main/kotlin/nebulosa/api/sequencer/SequencerController.kt @@ -5,6 +5,7 @@ import nebulosa.indi.device.camera.Camera import nebulosa.indi.device.filterwheel.FilterWheel import nebulosa.indi.device.focuser.Focuser import nebulosa.indi.device.mount.Mount +import nebulosa.indi.device.rotator.Rotator import org.springframework.web.bind.annotation.* @RestController @@ -16,9 +17,9 @@ class SequencerController( @PutMapping("{camera}/start") fun start( camera: Camera, - mount: Mount?, wheel: FilterWheel?, focuser: Focuser?, + mount: Mount?, wheel: FilterWheel?, focuser: Focuser?, rotator: Rotator?, @RequestBody @Valid body: SequencePlanRequest, - ) = sequencerService.start(camera, body, mount, wheel, focuser) + ) = sequencerService.start(camera, body, mount, wheel, focuser, rotator) @PutMapping("{camera}/stop") fun stop(camera: Camera) { diff --git a/api/src/main/kotlin/nebulosa/api/sequencer/SequencerExecutor.kt b/api/src/main/kotlin/nebulosa/api/sequencer/SequencerExecutor.kt index 4992cff28..4f3bd05eb 100644 --- a/api/src/main/kotlin/nebulosa/api/sequencer/SequencerExecutor.kt +++ b/api/src/main/kotlin/nebulosa/api/sequencer/SequencerExecutor.kt @@ -2,6 +2,7 @@ package nebulosa.api.sequencer import io.reactivex.rxjava3.functions.Consumer import nebulosa.api.beans.annotations.Subscriber +import nebulosa.api.calibration.CalibrationFrameService import nebulosa.api.cameras.CameraEventAware import nebulosa.api.focusers.FocuserEventAware import nebulosa.api.messages.MessageEvent @@ -15,6 +16,7 @@ import nebulosa.indi.device.filterwheel.FilterWheelEvent import nebulosa.indi.device.focuser.Focuser import nebulosa.indi.device.focuser.FocuserEvent import nebulosa.indi.device.mount.Mount +import nebulosa.indi.device.rotator.Rotator import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor @@ -27,6 +29,7 @@ class SequencerExecutor( private val messageService: MessageService, private val guider: Guider, private val threadPoolTaskExecutor: ThreadPoolTaskExecutor, + private val calibrationFrameService: CalibrationFrameService, ) : Consumer, CameraEventAware, WheelEventAware, FocuserEventAware { private val jobs = ConcurrentHashMap.newKeySet(1) @@ -52,7 +55,7 @@ class SequencerExecutor( fun execute( camera: Camera, request: SequencePlanRequest, - mount: Mount? = null, wheel: FilterWheel? = null, focuser: Focuser? = null, + mount: Mount? = null, wheel: FilterWheel? = null, focuser: Focuser? = null, rotator: Rotator? = null, ) { check(camera.connected) { "${camera.name} Camera is not connected" } check(jobs.none { it.task.camera === camera }) { "${camera.name} Sequencer Job is already in progress" } @@ -65,7 +68,11 @@ class SequencerExecutor( check(jobs.none { it.task.focuser === focuser }) { "${camera.name} Sequencer Job is already in progress" } } - val task = SequencerTask(camera, request, guider, mount, wheel, focuser, threadPoolTaskExecutor) + if (rotator != null && rotator.connected) { + check(jobs.none { it.task.rotator === rotator }) { "${camera.name} Sequencer Job is already in progress" } + } + + val task = SequencerTask(camera, request, guider, mount, wheel, focuser, rotator, threadPoolTaskExecutor, calibrationFrameService) task.subscribe(this) with(SequencerJob(task)) { diff --git a/api/src/main/kotlin/nebulosa/api/sequencer/SequencerService.kt b/api/src/main/kotlin/nebulosa/api/sequencer/SequencerService.kt index fe26e8e24..871fcd1f3 100644 --- a/api/src/main/kotlin/nebulosa/api/sequencer/SequencerService.kt +++ b/api/src/main/kotlin/nebulosa/api/sequencer/SequencerService.kt @@ -4,6 +4,7 @@ import nebulosa.indi.device.camera.Camera import nebulosa.indi.device.filterwheel.FilterWheel import nebulosa.indi.device.focuser.Focuser import nebulosa.indi.device.mount.Mount +import nebulosa.indi.device.rotator.Rotator import org.springframework.stereotype.Service import java.nio.file.Path import kotlin.io.path.exists @@ -18,13 +19,13 @@ class SequencerService( @Synchronized fun start( camera: Camera, request: SequencePlanRequest, - mount: Mount?, wheel: FilterWheel?, focuser: Focuser?, + mount: Mount?, wheel: FilterWheel?, focuser: Focuser?, rotator: Rotator?, ) { val savePath = request.savePath ?.takeIf { "$it".isNotBlank() && it.exists() && it.isDirectory() } ?: Path.of("$sequencesPath", (System.currentTimeMillis() / 1000).toString()) - sequencerExecutor.execute(camera, request.copy(savePath = savePath), mount, wheel, focuser) + sequencerExecutor.execute(camera, request.copy(savePath = savePath), mount, wheel, focuser, rotator) } @Synchronized diff --git a/api/src/main/kotlin/nebulosa/api/sequencer/SequencerTask.kt b/api/src/main/kotlin/nebulosa/api/sequencer/SequencerTask.kt index 4efde90bf..9b624c38d 100644 --- a/api/src/main/kotlin/nebulosa/api/sequencer/SequencerTask.kt +++ b/api/src/main/kotlin/nebulosa/api/sequencer/SequencerTask.kt @@ -1,6 +1,7 @@ package nebulosa.api.sequencer import io.reactivex.rxjava3.functions.Consumer +import nebulosa.api.calibration.CalibrationFrameProvider import nebulosa.api.cameras.* import nebulosa.api.messages.MessageEvent import nebulosa.api.tasks.AbstractTask @@ -18,6 +19,7 @@ import nebulosa.indi.device.filterwheel.FilterWheel import nebulosa.indi.device.filterwheel.FilterWheelEvent import nebulosa.indi.device.focuser.Focuser import nebulosa.indi.device.mount.Mount +import nebulosa.indi.device.rotator.Rotator import nebulosa.log.loggerFor import java.time.Duration import java.util.* @@ -36,7 +38,9 @@ data class SequencerTask( @JvmField val mount: Mount? = null, @JvmField val wheel: FilterWheel? = null, @JvmField val focuser: Focuser? = null, + @JvmField val rotator: Rotator? = null, private val executor: Executor? = null, + private val calibrationFrameProvider: CalibrationFrameProvider? = null, ) : AbstractTask(), Consumer, CameraEventAware, WheelEventAware { private val usedEntries = plan.entries.filter { it.enabled } @@ -75,7 +79,10 @@ data class SequencerTask( request.wheelMoveTask()?.also(tasks::add) // CAPTURE. - val cameraCaptureTask = CameraCaptureTask(camera, request, guider, executor = executor) + val cameraCaptureTask = CameraCaptureTask( + camera, request, guider, executor = executor, + calibrationFrameProvider = calibrationFrameProvider + ) cameraCaptureTask.subscribe(this) estimatedCaptureTime += cameraCaptureTask.estimatedCaptureTime tasks.add(cameraCaptureTask) @@ -83,7 +90,8 @@ data class SequencerTask( } else { val sequenceIdTasks = usedEntries.map { req -> SequencerIdTask(plan.entries.indexOfFirst { it === req } + 1) } val requests = usedEntries.map { mapRequest(it) } - val cameraCaptureTasks = requests.mapIndexed { i, req -> CameraCaptureTask(camera, req, guider, i > 0, 1, executor) } + val cameraCaptureTasks = requests + .mapIndexed { i, req -> CameraCaptureTask(camera, req, guider, i > 0, 1, executor, calibrationFrameProvider) } val wheelMoveTasks = requests.map { it.wheelMoveTask() } val count = IntArray(requests.size) { usedEntries[it].exposureAmount } @@ -125,7 +133,7 @@ data class SequencerTask( override fun execute(cancellationToken: CancellationToken) { LOG.info("Sequencer started. camera={}, mount={}, wheel={}, focuser={}, plan={}", camera, mount, wheel, focuser, plan) - camera.snoop(listOf(mount, wheel, focuser)) + camera.snoop(listOf(mount, wheel, focuser, rotator)) for (task in tasks) { if (cancellationToken.isCancelled) break diff --git a/api/src/main/kotlin/nebulosa/api/stardetection/StarDetectionOptions.kt b/api/src/main/kotlin/nebulosa/api/stardetection/StarDetectionOptions.kt deleted file mode 100644 index 9d3711755..000000000 --- a/api/src/main/kotlin/nebulosa/api/stardetection/StarDetectionOptions.kt +++ /dev/null @@ -1,24 +0,0 @@ -package nebulosa.api.stardetection - -import nebulosa.astap.star.detection.AstapStarDetector -import nebulosa.star.detection.StarDetector -import java.nio.file.Path -import java.time.Duration -import java.util.function.Supplier - -data class StarDetectionOptions( - @JvmField val type: StarDetectorType = StarDetectorType.ASTAP, - @JvmField val executablePath: Path? = null, - @JvmField val timeout: Duration = Duration.ZERO, - @JvmField val minSNR: Double = 0.0, -) : Supplier> { - - override fun get() = when (type) { - StarDetectorType.ASTAP -> AstapStarDetector(executablePath!!, minSNR) - } - - companion object { - - @JvmStatic val EMPTY = StarDetectionOptions() - } -} diff --git a/api/src/main/kotlin/nebulosa/api/stardetection/StarDetectorType.kt b/api/src/main/kotlin/nebulosa/api/stardetection/StarDetectorType.kt deleted file mode 100644 index 31ae2f97c..000000000 --- a/api/src/main/kotlin/nebulosa/api/stardetection/StarDetectorType.kt +++ /dev/null @@ -1,5 +0,0 @@ -package nebulosa.api.stardetection - -enum class StarDetectorType { - ASTAP -} diff --git a/api/src/main/kotlin/nebulosa/api/stardetection/StarDetectionController.kt b/api/src/main/kotlin/nebulosa/api/stardetector/StarDetectionController.kt similarity index 83% rename from api/src/main/kotlin/nebulosa/api/stardetection/StarDetectionController.kt rename to api/src/main/kotlin/nebulosa/api/stardetector/StarDetectionController.kt index 810c13811..64eaf5c5a 100644 --- a/api/src/main/kotlin/nebulosa/api/stardetection/StarDetectionController.kt +++ b/api/src/main/kotlin/nebulosa/api/stardetector/StarDetectionController.kt @@ -1,4 +1,4 @@ -package nebulosa.api.stardetection +package nebulosa.api.stardetector import jakarta.validation.Valid import org.springframework.validation.annotation.Validated @@ -13,6 +13,6 @@ class StarDetectionController(private val starDetectionService: StarDetectionSer @PutMapping fun detectStars( @RequestParam path: Path, - @RequestBody @Valid body: StarDetectionOptions + @RequestBody @Valid body: StarDetectionRequest ) = starDetectionService.detectStars(path, body) } diff --git a/api/src/main/kotlin/nebulosa/api/stardetector/StarDetectionRequest.kt b/api/src/main/kotlin/nebulosa/api/stardetector/StarDetectionRequest.kt new file mode 100644 index 000000000..c43e42c1f --- /dev/null +++ b/api/src/main/kotlin/nebulosa/api/stardetector/StarDetectionRequest.kt @@ -0,0 +1,43 @@ +package nebulosa.api.stardetector + +import nebulosa.astap.stardetector.AstapStarDetector +import nebulosa.pixinsight.script.PixInsightIsRunning +import nebulosa.pixinsight.script.PixInsightScriptRunner +import nebulosa.pixinsight.script.PixInsightStartup +import nebulosa.pixinsight.stardetector.PixInsightStarDetector +import nebulosa.siril.stardetector.SirilStarDetector +import nebulosa.stardetector.StarDetector +import java.nio.file.Path +import java.time.Duration +import java.util.function.Supplier + +data class StarDetectionRequest( + @JvmField val type: StarDetectorType = StarDetectorType.ASTAP, + @JvmField val executablePath: Path? = null, + @JvmField val timeout: Duration = Duration.ZERO, + @JvmField val minSNR: Double = 0.0, + @JvmField val maxStars: Int = 0, + @JvmField val slot: Int = 1, +) : Supplier> { + + override fun get() = when (type) { + StarDetectorType.ASTAP -> AstapStarDetector(executablePath!!, minSNR) + StarDetectorType.SIRIL -> SirilStarDetector(executablePath!!, maxStars) + StarDetectorType.PIXINSIGHT -> { + val runner = PixInsightScriptRunner(executablePath!!) + + if (!PixInsightIsRunning(slot).use { it.runSync(runner) }) { + if (!PixInsightStartup(slot).use { it.runSync(runner) }) { + throw IllegalStateException("unable to start PixInsight") + } + } + + PixInsightStarDetector(runner, slot, minSNR, timeout) + } + } + + companion object { + + @JvmStatic val EMPTY = StarDetectionRequest() + } +} diff --git a/api/src/main/kotlin/nebulosa/api/stardetection/StarDetectionService.kt b/api/src/main/kotlin/nebulosa/api/stardetector/StarDetectionService.kt similarity index 56% rename from api/src/main/kotlin/nebulosa/api/stardetection/StarDetectionService.kt rename to api/src/main/kotlin/nebulosa/api/stardetector/StarDetectionService.kt index 243239456..576bf184a 100644 --- a/api/src/main/kotlin/nebulosa/api/stardetection/StarDetectionService.kt +++ b/api/src/main/kotlin/nebulosa/api/stardetector/StarDetectionService.kt @@ -1,13 +1,13 @@ -package nebulosa.api.stardetection +package nebulosa.api.stardetector -import nebulosa.star.detection.ImageStar +import nebulosa.stardetector.StarPoint import org.springframework.stereotype.Service import java.nio.file.Path @Service class StarDetectionService { - fun detectStars(path: Path, options: StarDetectionOptions): List { + fun detectStars(path: Path, options: StarDetectionRequest): List { val starDetector = options.get() return starDetector.detect(path) } diff --git a/api/src/main/kotlin/nebulosa/api/stardetector/StarDetectorType.kt b/api/src/main/kotlin/nebulosa/api/stardetector/StarDetectorType.kt new file mode 100644 index 000000000..56f51327e --- /dev/null +++ b/api/src/main/kotlin/nebulosa/api/stardetector/StarDetectorType.kt @@ -0,0 +1,7 @@ +package nebulosa.api.stardetector + +enum class StarDetectorType { + ASTAP, + PIXINSIGHT, + SIRIL, +} diff --git a/api/src/main/kotlin/nebulosa/api/stardetector/StarPointSerializer.kt b/api/src/main/kotlin/nebulosa/api/stardetector/StarPointSerializer.kt new file mode 100644 index 000000000..907df78b3 --- /dev/null +++ b/api/src/main/kotlin/nebulosa/api/stardetector/StarPointSerializer.kt @@ -0,0 +1,24 @@ +package nebulosa.api.stardetector + +import com.fasterxml.jackson.core.JsonGenerator +import com.fasterxml.jackson.databind.SerializerProvider +import com.fasterxml.jackson.databind.ser.std.StdSerializer +import nebulosa.stardetector.StarPoint +import org.springframework.stereotype.Component + +@Component +class StarPointSerializer : StdSerializer(StarPoint::class.java) { + + override fun serialize(star: StarPoint?, gen: JsonGenerator, provider: SerializerProvider) { + if (star == null) gen.writeNull() + else { + gen.writeStartObject() + gen.writeNumberField("x", star.x) + gen.writeNumberField("y", star.y) + gen.writeNumberField("hfd", star.hfd) + gen.writeNumberField("snr", star.snr) + gen.writeNumberField("flux", star.flux) + gen.writeEndObject() + } + } +} diff --git a/api/src/main/kotlin/nebulosa/api/wizard/flat/FlatWizardTask.kt b/api/src/main/kotlin/nebulosa/api/wizard/flat/FlatWizardTask.kt index 8a0a0ec3d..4dc26907e 100644 --- a/api/src/main/kotlin/nebulosa/api/wizard/flat/FlatWizardTask.kt +++ b/api/src/main/kotlin/nebulosa/api/wizard/flat/FlatWizardTask.kt @@ -65,7 +65,7 @@ data class FlatWizardTask( capture = event if (event.state == CameraCaptureState.EXPOSURE_FINISHED) { - savedPath = event.savePath!! + savedPath = event.savedPath!! onNext(event) } diff --git a/api/src/test/kotlin/APITest.kt b/api/src/test/kotlin/APITest.kt index a71b9c688..b240c7f77 100644 --- a/api/src/test/kotlin/APITest.kt +++ b/api/src/test/kotlin/APITest.kt @@ -9,7 +9,7 @@ import nebulosa.api.autofocus.AutoFocusRequest import nebulosa.api.beans.converters.time.DurationSerializer import nebulosa.api.cameras.CameraStartCaptureRequest import nebulosa.api.connection.ConnectionType -import nebulosa.api.stardetection.StarDetectionOptions +import nebulosa.api.stardetector.StarDetectionRequest import nebulosa.common.json.PathSerializer import nebulosa.test.NonGitHubOnlyCondition import okhttp3.MediaType.Companion.toMediaType @@ -169,7 +169,7 @@ class APITest : StringSpec() { @JvmStatic private val EXPOSURE_TIME = Duration.ofSeconds(5) @JvmStatic private val CAPTURES_PATH = Path.of("/home/tiagohm/Git/nebulosa/data/captures") - @JvmStatic private val STAR_DETECTION_OPTIONS = StarDetectionOptions(executablePath = Path.of("astap")) + @JvmStatic private val STAR_DETECTION_OPTIONS = StarDetectionRequest(executablePath = Path.of("astap")) @JvmStatic private val CAMERA_START_CAPTURE_REQUEST = CameraStartCaptureRequest( exposureTime = EXPOSURE_TIME, width = 1280, height = 1024, frameFormat = "INDI_MONO", diff --git a/api/src/test/kotlin/CalibrationFrameRepositoryTest.kt b/api/src/test/kotlin/CalibrationFrameRepositoryTest.kt new file mode 100644 index 000000000..8cdd27d80 --- /dev/null +++ b/api/src/test/kotlin/CalibrationFrameRepositoryTest.kt @@ -0,0 +1,89 @@ +import io.kotest.core.spec.style.StringSpec +import io.kotest.matchers.collections.shouldBeEmpty +import io.kotest.matchers.collections.shouldHaveSize +import io.objectbox.kotlin.boxFor +import nebulosa.api.calibration.CalibrationFrameEntity +import nebulosa.api.calibration.CalibrationFrameRepository +import nebulosa.api.database.MyObjectBox +import nebulosa.indi.device.camera.FrameType +import java.util.* + +class CalibrationFrameRepositoryTest : StringSpec() { + + init { + val boxStore = MyObjectBox.builder() + .inMemory(UUID.randomUUID().toString()) + .build() + + afterSpec { + boxStore.close() + } + + val box = boxStore.boxFor() + val repository = CalibrationFrameRepository(box) + + repository.save(FrameType.DARK, 1L) + repository.save(FrameType.DARK, 2L) + repository.save(FrameType.DARK, 5L) + repository.save(FrameType.DARK, 10L) + repository.save(FrameType.DARK, 30L) + repository.save(FrameType.DARK, 60L) + repository.save(FrameType.DARK, 60L, gain = 100.0) + repository.save(FrameType.DARK, 10L, temperature = -10.0) + repository.save(FrameType.DARK, 30L, temperature = -10.0) + repository.save(FrameType.DARK, 60L, temperature = -10.0) + repository.save(FrameType.DARK, 60L, temperature = -10.0, gain = 100.0) + repository.save(FrameType.BIAS, 0L) + repository.save(FrameType.BIAS, 0L, gain = 100.0) + repository.save(FrameType.FLAT, 0L, filter = "RED") + repository.save(FrameType.FLAT, 0L, filter = "GREEN") + repository.save(FrameType.FLAT, 0L, filter = "BLUE") + repository.save(FrameType.FLAT, 0L, filter = null) + + "find all" { + repository.findAll().shouldHaveSize(17) + } + "find darks" { + repository.darkFrames(NAME, 1280, 1024, 1, 1L, 0.0).shouldHaveSize(1) + repository.darkFrames(NAME, 1280, 1024, 1, 60L, 0.0).shouldHaveSize(4) + repository.darkFrames(NAME, 1280, 1024, 1, 60L, 100.0).shouldHaveSize(2) + repository.darkFrames(NAME, 1280, 1024, 1, 60L, 50.0).shouldBeEmpty() + repository.darkFrames(NAME, 1280, 1024, 2, 60L, 100.0).shouldBeEmpty() + repository.darkFrames(NAME, 4092, 2800, 1, 60L, 100.0).shouldBeEmpty() + repository.darkFrames("ZW", 1280, 1024, 1, 1L, 0.0).shouldBeEmpty() + } + "find bias" { + repository.biasFrames(NAME, 1280, 1024, 1, 0.0).shouldHaveSize(2) + repository.biasFrames(NAME, 1280, 1024, 1, 100.0).shouldHaveSize(1) + repository.biasFrames(NAME, 1280, 1024, 1, 50.0).shouldBeEmpty() + repository.biasFrames(NAME, 1280, 1024, 2, 0.0).shouldBeEmpty() + repository.biasFrames(NAME, 4092, 2800, 1, 0.0).shouldBeEmpty() + repository.biasFrames("ZW", 1280, 1024, 2, 0.0).shouldBeEmpty() + } + "find flats" { + repository.flatFrames(NAME, null, 1280, 1024, 1).shouldHaveSize(1) + repository.flatFrames(NAME, "RED", 1280, 1024, 1).shouldHaveSize(1) + repository.flatFrames(NAME, "green", 1280, 1024, 1).shouldHaveSize(1) + repository.flatFrames(NAME, "BLUE", 1280, 1024, 1).shouldHaveSize(1) + repository.flatFrames(NAME, "RED", 1280, 1024, 2).shouldBeEmpty() + repository.flatFrames(NAME, "RED", 4092, 2800, 2).shouldBeEmpty() + repository.flatFrames(NAME, "HA", 1280, 1024, 2).shouldBeEmpty() + repository.flatFrames("ZW", "RED", 1280, 1024, 2).shouldBeEmpty() + } + } + + companion object { + + private const val NAME = "CCD Simulator" + + @JvmStatic + internal fun CalibrationFrameRepository.save( + type: FrameType, exposureTime: Long, + temperature: Double = 25.0, width: Int = 1280, height: Int = 1024, + bin: Int = 1, gain: Double = 0.0, + filter: String? = null, + ) { + save(CalibrationFrameEntity(0L, type, NAME, filter, exposureTime, temperature, width, height, bin, bin, gain)) + } + } +} diff --git a/api/src/test/kotlin/SatelliteEntityRepositoryTest.kt b/api/src/test/kotlin/SatelliteEntityRepositoryTest.kt new file mode 100644 index 000000000..759b8f6d7 --- /dev/null +++ b/api/src/test/kotlin/SatelliteEntityRepositoryTest.kt @@ -0,0 +1,53 @@ +import io.kotest.core.spec.style.StringSpec +import io.kotest.matchers.collections.shouldBeEmpty +import io.kotest.matchers.collections.shouldHaveSize +import io.objectbox.kotlin.boxFor +import nebulosa.api.atlas.SatelliteEntity +import nebulosa.api.atlas.SatelliteGroupType +import nebulosa.api.atlas.SatelliteRepository +import nebulosa.api.database.MyObjectBox +import java.util.* + +class SatelliteEntityRepositoryTest : StringSpec() { + + init { + val boxStore = MyObjectBox.builder() + .inMemory(UUID.randomUUID().toString()) + .build() + + afterSpec { + boxStore.close() + } + + val box = boxStore.boxFor() + val repository = SatelliteRepository(box) + + repository.save("ISS", SatelliteGroupType.ACTIVE, SatelliteGroupType.EDUCATION) + repository.save("StarLink", SatelliteGroupType.ACTIVE, SatelliteGroupType.STARLINK) + + "find all" { + repository.search().shouldHaveSize(2) + } + "find by name" { + repository.search("iss").shouldHaveSize(1) + } + "find by groups" { + repository.search(groups = listOf(SatelliteGroupType.ACTIVE)).shouldHaveSize(2) + repository.search(groups = listOf(SatelliteGroupType.STARLINK)).shouldHaveSize(1) + repository.search(groups = listOf(SatelliteGroupType.AMATEUR)).shouldBeEmpty() + } + "find by name and groups" { + repository.search(text = "iss", groups = listOf(SatelliteGroupType.ACTIVE)).shouldHaveSize(1) + repository.search(text = "iss", groups = listOf(SatelliteGroupType.STARLINK)).shouldBeEmpty() + repository.search(text = "starlink", groups = listOf(SatelliteGroupType.EDUCATION)).shouldBeEmpty() + } + } + + companion object { + + @JvmStatic + internal fun SatelliteRepository.save(name: String, vararg groups: SatelliteGroupType) { + save(SatelliteEntity(0L, name, "", groups.map { it.name }.toMutableList())) + } + } +} diff --git a/api/src/test/kotlin/SimbadEntityRepositoryTest.kt b/api/src/test/kotlin/SimbadEntityRepositoryTest.kt new file mode 100644 index 000000000..04483ed4f --- /dev/null +++ b/api/src/test/kotlin/SimbadEntityRepositoryTest.kt @@ -0,0 +1,79 @@ +import io.kotest.core.spec.style.StringSpec +import io.kotest.matchers.collections.shouldBeEmpty +import io.kotest.matchers.collections.shouldHaveSize +import io.kotest.matchers.doubles.shouldBeExactly +import io.kotest.matchers.shouldBe +import io.objectbox.kotlin.boxFor +import nebulosa.api.atlas.SimbadEntity +import nebulosa.api.atlas.SimbadEntityRepository +import nebulosa.api.database.MyObjectBox +import nebulosa.math.Angle +import nebulosa.math.deg +import nebulosa.math.hours +import nebulosa.nova.astrometry.Constellation +import nebulosa.skycatalog.SkyObjectType +import java.util.* + +class SimbadEntityRepositoryTest : StringSpec() { + + init { + val boxStore = MyObjectBox.builder() + .inMemory(UUID.randomUUID().toString()) + .build() + + afterSpec { + boxStore.close() + } + + val box = boxStore.boxFor() + val repository = SimbadEntityRepository(box) + + repository.save("Sirius", SkyObjectType.STAR, Constellation.CMA, -1.45, "06 45 06".hours, "-16 43 33".deg) + repository.save("Dolphin Nebula", SkyObjectType.NEBULA, Constellation.CMA, 6.91, "06 54 11".hours, "-23 55 47".deg) + repository.save("75 Tucanae", SkyObjectType.GLOBULAR_CLUSTER, Constellation.TUC, 6.58, "01 03 12".hours, "-70 50 39".deg) + repository.save("Car Nebula", SkyObjectType.NEBULA, Constellation.CAR, 5.0, "10 45 15".hours, "-59 43 35".deg) + + "find all" { + repository.find().shouldHaveSize(4).first().magnitude shouldBeExactly -1.45 + } + "find by name" { + repository.find(name = "dolphin").shouldHaveSize(1).first().name shouldBe "Dolphin Nebula" + repository.find(name = "andromeda").shouldBeEmpty() + repository.find(name = "nebula").shouldHaveSize(2).first().magnitude shouldBeExactly 5.0 + } + "find by constellation" { + repository.find(constellation = Constellation.CMA).shouldHaveSize(2).first().magnitude shouldBeExactly -1.45 + repository.find(constellation = Constellation.AND).shouldBeEmpty() + } + "find by region" { + repository.find(rightAscension = "06 45 59".hours, declination = "-20 45 29".deg, radius = 4.5.deg).shouldHaveSize(2) + .first().magnitude shouldBeExactly -1.45 + repository.find(rightAscension = "06 45 59".hours, declination = "-20 45 29".deg, radius = 4.0.deg).shouldHaveSize(1) + .first().name shouldBe "Dolphin Nebula" + repository.find(rightAscension = "00 42 43".hours, declination = "41 15 53".deg, radius = 10.deg).shouldBeEmpty() + } + "find by magnitude" { + repository.find(magnitudeMin = 5.0).shouldHaveSize(3) + repository.find(magnitudeMax = 4.9).shouldHaveSize(1).first().name shouldBe "Sirius" + repository.find(magnitudeMin = 6.6, magnitudeMax = 6.99).shouldHaveSize(1).first().name shouldBe "Dolphin Nebula" + repository.find(magnitudeMax = -2.0).shouldBeEmpty() + repository.find(magnitudeMin = 7.0).shouldBeEmpty() + repository.find(magnitudeMin = 5.1, magnitudeMax = 6.0).shouldBeEmpty() + } + "find by type" { + repository.find(type = SkyObjectType.NEBULA).shouldHaveSize(2).first().magnitude shouldBeExactly 5.0 + repository.find(type = SkyObjectType.GALAXY).shouldBeEmpty() + } + } + + companion object { + + @JvmStatic + internal fun SimbadEntityRepository.save( + name: String, type: SkyObjectType, constellation: Constellation, + magnitude: Double, rightAscension: Angle, declination: Angle, + ) { + save(SimbadEntity(0L, name, type, rightAscension, declination, magnitude, constellation = constellation)) + } + } +} diff --git a/build.gradle.kts b/build.gradle.kts index 686ead046..bc5b13abd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ buildscript { classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0") classpath("org.jetbrains.kotlin:kotlin-allopen:2.0.0") classpath("com.adarshr:gradle-test-logger-plugin:4.0.0") - classpath("io.objectbox:objectbox-gradle-plugin:4.0.0") + classpath("io.objectbox:objectbox-gradle-plugin:4.0.1") } repositories { diff --git a/data/.gitignore b/data/.gitignore index b39285bd2..d48badef8 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -2,3 +2,4 @@ simbad/ astrobin/ test/ captures/ +siril/ diff --git a/desktop/camera.png b/desktop/camera.png index 8487d530d..c25ce3252 100644 Binary files a/desktop/camera.png and b/desktop/camera.png differ diff --git a/desktop/guider.png b/desktop/guider.png index 6c2bf9829..e37d31d52 100644 Binary files a/desktop/guider.png and b/desktop/guider.png differ diff --git a/desktop/indi.png b/desktop/indi.png index 14853441d..13db4d97e 100644 Binary files a/desktop/indi.png and b/desktop/indi.png differ diff --git a/desktop/package.json b/desktop/package.json index 0466564d7..4bd615f44 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -14,7 +14,7 @@ "postinstall": "electron-builder install-app-deps", "ng": "ng", "start": "npm-run-all -p electron:serve ng:serve", - "ng:serve": "ng serve -c web", + "ng:serve": "ng serve -c web --hmr", "build": "npm run electron:serve-tsc && ng build --base-href ./", "build:dev": "npm run build -- -c dev", "build:prod": "npm run build -- -c production", diff --git a/desktop/sequencer.png b/desktop/sequencer.png index a3926c583..679d27ebc 100644 Binary files a/desktop/sequencer.png and b/desktop/sequencer.png differ diff --git a/desktop/settings.png b/desktop/settings.png index ee6099d48..80e5fde64 100644 Binary files a/desktop/settings.png and b/desktop/settings.png differ diff --git a/desktop/src/app/alignment/alignment.component.html b/desktop/src/app/alignment/alignment.component.html index 3acb4adf8..fcdc2d66b 100644 --- a/desktop/src/app/alignment/alignment.component.html +++ b/desktop/src/app/alignment/alignment.component.html @@ -83,15 +83,15 @@
@if (pausingOrPaused) { + severity="success" size="small" [text]="true" /> } @else if(!running) { + label="Start" (onClick)="tppaStart()" icon="mdi mdi-play" severity="success" size="small" [text]="true" /> } - + + icon="mdi mdi-stop" severity="danger" size="small" [text]="true" />
@@ -124,15 +124,15 @@
+ icon="mdi mdi-play" severity="success" size="small" [text]="true" /> + icon="mdi mdi-stop" severity="danger" size="small" [text]="true" /> + styleClass="ml-4" pTooltip="View image" tooltipPosition="bottom" size="small" [text]="true" />
-
+
1. Locate a star near the south 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. diff --git a/desktop/src/app/alignment/alignment.component.ts b/desktop/src/app/alignment/alignment.component.ts index ad4ceb05f..4aa54e0ce 100644 --- a/desktop/src/app/alignment/alignment.component.ts +++ b/desktop/src/app/alignment/alignment.component.ts @@ -10,7 +10,7 @@ import { Angle } from '../../shared/types/atlas.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 { EMPTY_PLATE_SOLVER_OPTIONS } from '../../shared/types/settings.types' +import { EMPTY_PLATE_SOLVER_REQUEST } from '../../shared/types/settings.types' import { deviceComparator } from '../../shared/utils/comparators' import { AppComponent } from '../app.component' import { CameraComponent } from '../camera/camera.component' @@ -40,7 +40,7 @@ export class AlignmentComponent implements AfterViewInit, OnDestroy, Pingable { readonly tppaRequest: TPPAStart = { capture: structuredClone(EMPTY_CAMERA_START_CAPTURE), - plateSolver: structuredClone(EMPTY_PLATE_SOLVER_OPTIONS), + plateSolver: structuredClone(EMPTY_PLATE_SOLVER_REQUEST), startFromCurrentPosition: true, stepDirection: 'EAST', compensateRefraction: true, @@ -224,11 +224,11 @@ export class AlignmentComponent implements AfterViewInit, OnDestroy, Pingable { }) this.loadPreference() - - pinger.register(this, 30000) } async ngAfterViewInit() { + this.pinger.register(this, 30000) + this.cameras = (await this.api.cameras()).sort(deviceComparator) this.mounts = (await this.api.mounts()).sort(deviceComparator) this.guideOutputs = (await this.api.guideOutputs()).sort(deviceComparator) @@ -294,7 +294,7 @@ export class AlignmentComponent implements AfterViewInit, OnDestroy, Pingable { } plateSolverChanged() { - this.tppaRequest.plateSolver = this.preference.plateSolverOptions(this.tppaRequest.plateSolver.type).get() + this.tppaRequest.plateSolver = this.preference.plateSolverRequest(this.tppaRequest.plateSolver.type).get() this.savePreference() } diff --git a/desktop/src/app/app.component.html b/desktop/src/app/app.component.html index d6c47560e..37f7d7c2c 100644 --- a/desktop/src/app/app.component.html +++ b/desktop/src/app/app.component.html @@ -6,9 +6,16 @@ + @if (e.toggleable) { +
+ {{ e.label }} + +
+ } @else { + } diff --git a/desktop/src/app/app.module.ts b/desktop/src/app/app.module.ts index dd8e85990..f0cd52ca6 100644 --- a/desktop/src/app/app.module.ts +++ b/desktop/src/app/app.module.ts @@ -49,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 { PathChooserComponent } from '../shared/components/path-chooser/path-chooser.component' import { SlideMenuComponent } from '../shared/components/slide-menu/slide-menu.component' import { LocationDialog } from '../shared/dialogs/location/location.dialog' import { ScrollableNumberDirective } from '../shared/directives/input-number-scrollable' @@ -56,6 +57,7 @@ import { NoDropdownDirective } from '../shared/directives/no-dropdown.directive' import { StopPropagationDirective } from '../shared/directives/stop-propagation.directive' import { LocationInterceptor } from '../shared/interceptors/location.interceptor' import { AnglePipe } from '../shared/pipes/angle.pipe' +import { DropdownOptionsPipe } from '../shared/pipes/dropdown-options' import { EnumPipe } from '../shared/pipes/enum.pipe' import { EnvPipe } from '../shared/pipes/env.pipe' import { ExposureTimePipe } from '../shared/pipes/exposureTime.pipe' @@ -100,6 +102,7 @@ import { SettingsComponent } from './settings/settings.component' DeviceChooserComponent, DeviceListMenuComponent, DialogMenuComponent, + DropdownOptionsPipe, EnumPipe, EnvPipe, ExposureTimePipe, @@ -121,6 +124,7 @@ import { SettingsComponent } from './settings/settings.component' MoonComponent, MountComponent, NoDropdownDirective, + PathChooserComponent, RotatorComponent, SequencerComponent, SettingsComponent, @@ -177,6 +181,7 @@ import { SettingsComponent } from './settings/settings.component' AnglePipe, ConfirmationService, DialogService, + DropdownOptionsPipe, EnumPipe, EnvPipe, ExposureTimePipe, diff --git a/desktop/src/app/atlas/atlas.component.html b/desktop/src/app/atlas/atlas.component.html index db73c7c19..2cdfcb5fb 100644 --- a/desktop/src/app/atlas/atlas.component.html +++ b/desktop/src/app/atlas/atlas.component.html @@ -144,8 +144,10 @@
- - + +
@@ -187,9 +189,9 @@
+ size="small" severity="info" [text]="true" pTooltip="Search" tooltipPosition="bottom" /> + size="small" [text]="true" pTooltip="Filter" tooltipPosition="bottom" />
diff --git a/desktop/src/app/autofocus/autofocus.component.html b/desktop/src/app/autofocus/autofocus.component.html index 2e39c859f..bbad649d8 100644 --- a/desktop/src/app/autofocus/autofocus.component.html +++ b/desktop/src/app/autofocus/autofocus.component.html @@ -58,7 +58,7 @@
- @@ -66,8 +66,8 @@
- +
@@ -83,7 +83,7 @@
- @@ -120,9 +120,9 @@
+ icon="mdi mdi-play" severity="success" size="small" [text]="true" /> + icon="mdi mdi-stop" severity="danger" size="small" [text]="true" />
diff --git a/desktop/src/app/autofocus/autofocus.component.ts b/desktop/src/app/autofocus/autofocus.component.ts index cec4ab6ab..b3aa3b750 100644 --- a/desktop/src/app/autofocus/autofocus.component.ts +++ b/desktop/src/app/autofocus/autofocus.component.ts @@ -302,11 +302,11 @@ export class AutoFocusComponent implements AfterViewInit, OnDestroy, Pingable { }) this.loadPreference() - - pinger.register(this, 30000) } async ngAfterViewInit() { + this.pinger.register(this, 30000) + this.cameras = (await this.api.cameras()).sort(deviceComparator) this.focusers = (await this.api.focusers()).sort(deviceComparator) } @@ -355,7 +355,7 @@ export class AutoFocusComponent implements AfterViewInit, OnDestroy, Pingable { this.clearChart() this.stepSizeForScale = this.request.stepSize - this.request.starDetector = this.preference.starDetectionOptions('ASTAP').get() + this.request.starDetector = this.preference.starDetectionRequest('ASTAP').get() return this.api.autoFocusStart(this.camera, this.focuser, this.request) } diff --git a/desktop/src/app/camera/camera.component.html b/desktop/src/app/camera/camera.component.html index c082be6b0..0996011b7 100644 --- a/desktop/src/app/camera/camera.component.html +++ b/desktop/src/app/camera/camera.component.html @@ -64,7 +64,7 @@ + icon="mdi mdi-check" size="small" severity="success" pTooltip="Apply" tooltipPosition="bottom" [text]="true" />
@@ -156,7 +156,7 @@
+ severity="info" size="small" pTooltip="Full size" tooltipPosition="bottom" [text]="true" />
@@ -203,13 +203,20 @@
+ @if (pausingOrPaused) { + + } @else if(!running) { + tooltipStyleClass="min-w-22rem flex justify-content-center" [text]="true" /> + } + + severity="danger" size="small" [text]="true" /> + severity="info" size="small" [text]="true" />
@@ -221,28 +228,70 @@
Enabled - +
RA only -
-
- + [(ngModel)]="request.dither.afterExposures" [step]="1" (ngModelChange)="savePreference()" scrollableNumber />
+ + + +
+
+ Enabled + +
+
+ + + + +
+
+ 32-bits (slower) + +
+
+ + + + +
+
+ +
+
+ +
+
+ +
+
\ No newline at end of file diff --git a/desktop/src/app/camera/camera.component.ts b/desktop/src/app/camera/camera.component.ts index 2d883b3e4..fe3e1bd95 100644 --- a/desktop/src/app/camera/camera.component.ts +++ b/desktop/src/app/camera/camera.component.ts @@ -75,43 +75,57 @@ export class CameraComponent implements AfterContentInit, OnDestroy, Pingable { } showDitherDialog = false + showLiveStackingDialog = false calibrationModel: MenuItem[] = [] - readonly cameraModel: MenuItem[] = [ - { - icon: 'icomoon random-dither', - label: 'Dither', - command: () => { - this.showDitherDialog = true - }, + private readonly ditherMenuItem: MenuItem = { + icon: 'icomoon random-dither', + label: 'Dither', + command: () => { + this.showDitherDialog = true }, - { - icon: 'mdi mdi-connection', - label: 'Snoop Devices', - subMenu: [ - { - icon: 'mdi mdi-telescope', - label: 'Mount', - subMenu: [], - }, - { - icon: 'mdi mdi-palette', - label: 'Filter Wheel', - subMenu: [], - }, - { - icon: 'mdi mdi-image-filter-center-focus', - label: 'Focuser', - subMenu: [], - }, - { - icon: 'mdi mdi-rotate-right', - label: 'Rotator', - subMenu: [], - }, - ] + } + + private readonly liveStackingMenuItem: MenuItem = { + icon: 'mdi mdi-image-multiple', + label: 'Live Stacking', + command: () => { + this.showLiveStackingDialog = true }, + } + + private readonly snoopDevicesMenuItem: MenuItem = { + icon: 'mdi mdi-connection', + label: 'Snoop Devices', + subMenu: [ + { + icon: 'mdi mdi-telescope', + label: 'Mount', + subMenu: [], + }, + { + icon: 'mdi mdi-palette', + label: 'Filter Wheel', + subMenu: [], + }, + { + icon: 'mdi mdi-image-filter-center-focus', + label: 'Focuser', + subMenu: [], + }, + { + icon: 'mdi mdi-rotate-right', + label: 'Rotator', + subMenu: [], + }, + ] + } + + readonly cameraModel: MenuItem[] = [ + this.ditherMenuItem, + this.liveStackingMenuItem, + this.snoopDevicesMenuItem, ] hasDewHeater = false @@ -162,6 +176,14 @@ export class CameraComponent implements AfterContentInit, OnDestroy, Pingable { @ViewChild('cameraExposure') private readonly cameraExposure!: CameraExposureComponent + get status() { + return this.cameraExposure?.state ?? 'IDLE' + } + + get pausingOrPaused() { + return this.status === 'PAUSING' || this.status === 'PAUSED' + } + constructor( private app: AppComponent, private api: ApiService, @@ -246,27 +268,27 @@ export class CameraComponent implements AfterContentInit, OnDestroy, Pingable { } }) - this.cameraModel[1].visible = !app.modal - - pinger.register(this, 30000) + this.snoopDevicesMenuItem.visible = !app.modal } ngAfterContentInit() { - this.route.queryParams.subscribe(e => { + this.route.queryParams.subscribe(async e => { const decodedData = JSON.parse(decodeURIComponent(e.data)) if (this.app.modal) { - this.loadCameraStartCaptureForDialogMode(decodedData) + await this.loadCameraStartCaptureForDialogMode(decodedData) } else { - this.cameraChanged(decodedData) + await this.cameraChanged(decodedData) } - }) - if (!this.app.modal) { - this.loadEquipment() - } + this.pinger.register(this, 30000) + + if (!this.app.modal) { + await this.loadEquipment() + } - this.loadCalibrationGroups() + await this.loadCalibrationGroups() + }) } @HostListener('window:unload') @@ -355,10 +377,10 @@ export class CameraComponent implements AfterContentInit, OnDestroy, Pingable { return makeItem(this.equipment.mount?.name === mount?.name, () => this.equipment.mount = mount, mount) } - this.cameraModel[1].subMenu![0].subMenu!.push(makeMountItem()) + this.snoopDevicesMenuItem.subMenu![0].subMenu!.push(makeMountItem()) for (const mount of mounts) { - this.cameraModel[1].subMenu![0].subMenu!.push(makeMountItem(mount)) + this.snoopDevicesMenuItem.subMenu![0].subMenu!.push(makeMountItem(mount)) } // FILTER WHEEL @@ -370,10 +392,10 @@ export class CameraComponent implements AfterContentInit, OnDestroy, Pingable { return makeItem(this.equipment.wheel?.name === wheel?.name, () => this.equipment.wheel = wheel, wheel) } - this.cameraModel[1].subMenu![1].subMenu!.push(makeWheelItem()) + this.snoopDevicesMenuItem.subMenu![1].subMenu!.push(makeWheelItem()) for (const wheel of wheels) { - this.cameraModel[1].subMenu![1].subMenu!.push(makeWheelItem(wheel)) + this.snoopDevicesMenuItem.subMenu![1].subMenu!.push(makeWheelItem(wheel)) } // FOCUSER @@ -385,10 +407,10 @@ export class CameraComponent implements AfterContentInit, OnDestroy, Pingable { return makeItem(this.equipment.focuser?.name === focuser?.name, () => this.equipment.focuser = focuser, focuser) } - this.cameraModel[1].subMenu![2].subMenu!.push(makeFocuserItem()) + this.snoopDevicesMenuItem.subMenu![2].subMenu!.push(makeFocuserItem()) for (const focuser of focusers) { - this.cameraModel[1].subMenu![2].subMenu!.push(makeFocuserItem(focuser)) + this.snoopDevicesMenuItem.subMenu![2].subMenu!.push(makeFocuserItem(focuser)) } // ROTATOR @@ -400,10 +422,10 @@ export class CameraComponent implements AfterContentInit, OnDestroy, Pingable { return makeItem(this.equipment.rotator?.name === rotator?.name, () => this.equipment.rotator = rotator, rotator) } - this.cameraModel[1].subMenu![3].subMenu!.push(makeRotatorItem()) + this.snoopDevicesMenuItem.subMenu![3].subMenu!.push(makeRotatorItem()) for (const rotator of rotators) { - this.cameraModel[1].subMenu![3].subMenu!.push(makeRotatorItem(rotator)) + this.snoopDevicesMenuItem.subMenu![3].subMenu!.push(makeRotatorItem(rotator)) } buildStartTooltip() @@ -424,6 +446,7 @@ export class CameraComponent implements AfterContentInit, OnDestroy, Pingable { checked: this.request.calibrationGroup === name, command: () => { this.request.calibrationGroup = name + this.savePreference() this.loadCalibrationGroups() }, } @@ -518,6 +541,10 @@ export class CameraComponent implements AfterContentInit, OnDestroy, Pingable { const exposureAmount = this.exposureMode === 'LOOP' ? 0 : (this.exposureMode === 'FIXED' ? this.request.exposureAmount : 1) const savePath = this.mode !== 'CAPTURE' ? this.request.savePath : this.savePath + const liveStackingRequest = this.preference.liveStackingRequest(this.request.liveStacking.type).get() + this.request.liveStacking.executablePath = liveStackingRequest.executablePath + this.request.liveStacking.slot = liveStackingRequest.slot || 1 + return { ...this.request, x, y, width, height, @@ -527,10 +554,23 @@ export class CameraComponent implements AfterContentInit, OnDestroy, Pingable { } async startCapture() { - await this.openCameraImage() - await this.api.cameraSnoop(this.camera, this.equipment) - await this.api.cameraStartCapture(this.camera, this.makeCameraStartCapture()) - this.preference.equipmentForDevice(this.camera).set(this.equipment) + try { + this.running = true + await this.openCameraImage() + await this.api.cameraSnoop(this.camera, this.equipment) + await this.api.cameraStartCapture(this.camera, this.makeCameraStartCapture()) + this.preference.equipmentForDevice(this.camera).set(this.equipment) + } catch { + this.running = false + } + } + + pauseCapture() { + return this.api.cameraPauseCapture(this.camera) + } + + unpauseCapture() { + return this.api.cameraUnpauseCapture(this.camera) } abortCapture() { @@ -630,11 +670,15 @@ export class CameraComponent implements AfterContentInit, OnDestroy, Pingable { this.request.gain = preference.gain ?? 0 this.request.offset = preference.offset ?? 0 this.request.frameFormat = preference.frameFormat ?? (this.camera.frameFormats[0] || '') + this.request.calibrationGroup = preference.calibrationGroup - this.request.dither!.enabled = preference.dither?.enabled ?? false - this.request.dither!.raOnly = preference.dither?.raOnly ?? false - this.request.dither!.amount = preference.dither?.amount ?? 1.5 - this.request.dither!.afterExposures = preference.dither?.afterExposures ?? 1 + if (preference.dither) { + Object.assign(this.request.dither, preference.dither) + } + + if (preference.liveStacking) { + Object.assign(this.request.liveStacking, preference.liveStacking) + } Object.assign(this.equipment, this.preference.equipmentForDevice(this.camera).get()) } diff --git a/desktop/src/app/filterwheel/filterwheel.component.html b/desktop/src/app/filterwheel/filterwheel.component.html index 9ae270e7d..eb8b6f42c 100644 --- a/desktop/src/app/filterwheel/filterwheel.component.html +++ b/desktop/src/app/filterwheel/filterwheel.component.html @@ -47,7 +47,7 @@
+ (onClick)="moveToSelectedFilter()" size="small" [text]="true" />
diff --git a/desktop/src/app/filterwheel/filterwheel.component.ts b/desktop/src/app/filterwheel/filterwheel.component.ts index 18ee4ab06..9cbdf65e0 100644 --- a/desktop/src/app/filterwheel/filterwheel.component.ts +++ b/desktop/src/app/filterwheel/filterwheel.component.ts @@ -134,22 +134,22 @@ export class FilterWheelComponent implements AfterContentInit, OnDestroy, Pingab hotkeys('7', event => { event.preventDefault(); this.moveToPosition(7) }) hotkeys('8', event => { event.preventDefault(); this.moveToPosition(8) }) hotkeys('9', event => { event.preventDefault(); this.moveToPosition(9) }) - - pinger.register(this, 30000) } async ngAfterContentInit() { - this.route.queryParams.subscribe(e => { + this.route.queryParams.subscribe(async e => { const decodedData = JSON.parse(decodeURIComponent(e.data)) if (this.app.modal) { const request = decodedData as WheelDialogInput Object.assign(this.request, request.request) this.mode = request.mode - this.wheelChanged(request.wheel) + await this.wheelChanged(request.wheel) } else { - this.wheelChanged(decodedData) + await this.wheelChanged(decodedData) } + + this.pinger.register(this, 30000) }) this.focusers = await this.api.focusers() diff --git a/desktop/src/app/flat-wizard/flat-wizard.component.html b/desktop/src/app/flat-wizard/flat-wizard.component.html index 9c6bf6135..8fb92158c 100644 --- a/desktop/src/app/flat-wizard/flat-wizard.component.html +++ b/desktop/src/app/flat-wizard/flat-wizard.component.html @@ -67,9 +67,9 @@
+ severity="success" size="small" [text]="true" /> + severity="danger" size="small" [text]="true" />
\ No newline at end of file diff --git a/desktop/src/app/flat-wizard/flat-wizard.component.ts b/desktop/src/app/flat-wizard/flat-wizard.component.ts index 41a887d19..fd02d6764 100644 --- a/desktop/src/app/flat-wizard/flat-wizard.component.ts +++ b/desktop/src/app/flat-wizard/flat-wizard.component.ts @@ -143,11 +143,11 @@ export class FlatWizardComponent implements AfterViewInit, OnDestroy, Pingable { } }) }) - - pinger.register(this, 30000) } async ngAfterViewInit() { + this.pinger.register(this, 30000) + this.cameras = (await this.api.cameras()).sort(deviceComparator) this.wheels = (await this.api.wheels()).sort(deviceComparator) } diff --git a/desktop/src/app/focuser/focuser.component.ts b/desktop/src/app/focuser/focuser.component.ts index 1c1221264..c069d991f 100644 --- a/desktop/src/app/focuser/focuser.component.ts +++ b/desktop/src/app/focuser/focuser.component.ts @@ -61,14 +61,13 @@ export class FocuserComponent implements AfterViewInit, OnDestroy, Pingable { hotkeys('down', event => { event.preventDefault(); this.stepsRelative = Math.max(0, this.stepsRelative - 1) }) hotkeys('ctrl+up', event => { event.preventDefault(); this.stepsAbsolute = Math.max(0, this.stepsAbsolute - 1) }) hotkeys('ctrl+down', event => { event.preventDefault(); this.stepsAbsolute = Math.min(this.focuser.maxPosition, this.stepsAbsolute + 1) }) - - pinger.register(this, 30000) } async ngAfterViewInit() { - this.route.queryParams.subscribe(e => { + this.route.queryParams.subscribe(async e => { const focuser = JSON.parse(decodeURIComponent(e.data)) as Focuser - this.focuserChanged(focuser) + await this.focuserChanged(focuser) + this.pinger.register(this, 30000) }) } diff --git a/desktop/src/app/guider/guider.component.html b/desktop/src/app/guider/guider.component.html index afdf8c25b..ad692a1fe 100644 --- a/desktop/src/app/guider/guider.component.html +++ b/desktop/src/app/guider/guider.component.html @@ -1,8 +1,8 @@ -
+
-
+
- + + size="small" severity="info" [text]="true" />
-
-
{{ guideState | enum | lowercase }} {{ message }}
-
- - -
-
- - - - -
-
- - - - -
-
- - - - -
-
- - - - -
-
- - - - -
-
- - - - -
-
- - - - -
-
- - - - -
-
-
-
- -
- North - East -
- - -
-
- - - - -
-
- - - - -
-
- - - - -
-
- -
-
- - - -
+
+ + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+
+
+ +
+ North + East +
+ + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ +
+
+ + + +
+
+
- +
-
- -
-
+
+
+ +
diff --git a/desktop/src/app/guider/guider.component.ts b/desktop/src/app/guider/guider.component.ts index ac16de440..318fb1a39 100644 --- a/desktop/src/app/guider/guider.component.ts +++ b/desktop/src/app/guider/guider.component.ts @@ -70,7 +70,7 @@ export class GuiderComponent implements AfterViewInit, OnDestroy, Pingable { } readonly chartData: ChartData = { - labels: Array.from({ length: 100 }), + labels: Array.from({ length: 100 }, (_, i) => `${i}`), datasets: [ // RA. { @@ -129,9 +129,8 @@ export class GuiderComponent implements AfterViewInit, OnDestroy, Pingable { const scale = barType ? this.phdDurationScale : 1.0 const y = context.parsed.y * scale const prefix = raType ? 'RA: ' : 'DEC: ' - const barSuffix = ' ms' const lineSuffix = this.yAxisUnit === 'ARCSEC' ? '"' : 'px' - const formattedY = prefix + (barType ? y.toFixed(0) + barSuffix : y.toFixed(2) + lineSuffix) + const formattedY = prefix + (barType ? y.toFixed(0) + ' ms' : y.toFixed(2) + lineSuffix) return formattedY } } @@ -188,7 +187,8 @@ export class GuiderComponent implements AfterViewInit, OnDestroy, Pingable { } }, x: { - stacked: false, + type: 'linear', + stacked: true, min: 0, max: 100, border: { @@ -196,13 +196,20 @@ export class GuiderComponent implements AfterViewInit, OnDestroy, Pingable { dash: [2, 4], }, ticks: { - autoSkip: true, + autoSkip: false, count: 11, maxRotation: 0, minRotation: 0, - callback: (value) => { + callback: (value, i, ticks) => { const a = value as number - return (a - Math.trunc(a) > 0) ? undefined : a.toFixed(0) + + if (i === 0) { + return a.toFixed(0) + } else if (ticks[i - 1]) { + if (Math.abs(Math.trunc(ticks[i - 1].value) - Math.trunc(a)) >= 1) { + return a.toFixed(0) + } + } } }, grid: { @@ -285,11 +292,11 @@ export class GuiderComponent implements AfterViewInit, OnDestroy, Pingable { this.message = event.data }) }) - - pinger.register(this, 30000) } async ngAfterViewInit() { + this.pinger.register(this, 30000) + const settle = await this.api.getGuidingSettle() this.settleAmount = settle.amount ?? 1.5 diff --git a/desktop/src/app/image/image.component.html b/desktop/src/app/image/image.component.html index ef6ee2804..f24ba2d51 100644 --- a/desktop/src/app/image/image.component.html +++ b/desktop/src/app/image/image.component.html @@ -10,9 +10,9 @@ - - + {{ (a.star ?? a.dso ?? a.minorPlanet) | skyObject:'name' }} @@ -85,71 +85,76 @@
- + -
- +
- +
-
-
-
+
-
-
+
- +
-
+
- +
-
+
-
-
- Simbad +
+ Simbad
- - - - + + + +
@@ -159,34 +164,53 @@
- + - +
- +
- +
-
+
- +
+ @if (solver.type === 'SIRIL') { +
+ + + + +
+
+ + + + +
+ }
@@ -230,18 +254,19 @@
- - - -
- + @@ -295,7 +320,7 @@
+ [options]="'SCNR_PROTECTION_METHOD' | dropdownOptions" styleClass="p-inputtext-sm border-0" [autoDisplayFirst]="false">
{{ item | enum }} @@ -421,18 +446,25 @@
-
-
+
+
+ + + + +
COMPUTED
@@ -457,7 +489,7 @@
+ value="{{ starDetection.computed.minFlux.toFixed(0) }} | {{ starDetection.computed.maxFlux.toFixed(0) }}" />
@@ -478,7 +510,7 @@
- +
@@ -490,7 +522,7 @@
- +
@@ -498,7 +530,7 @@
- + @@ -673,13 +705,13 @@
-
diff --git a/desktop/src/app/image/image.component.ts b/desktop/src/app/image/image.component.ts index 4a8dbeaff..742f6bc7f 100644 --- a/desktop/src/app/image/image.component.ts +++ b/desktop/src/app/image/image.component.ts @@ -16,9 +16,9 @@ import { BrowserWindowService } from '../../shared/services/browser-window.servi import { ElectronService } from '../../shared/services/electron.service' import { PreferenceService } from '../../shared/services/preference.service' import { PrimeService } from '../../shared/services/prime.service' -import { Angle, AstronomicalObject, DeepSkyObject, EquatorialCoordinateJ2000, Star } from '../../shared/types/atlas.types' +import { Angle, EquatorialCoordinateJ2000 } from '../../shared/types/atlas.types' import { Camera } from '../../shared/types/camera.types' -import { DEFAULT_FOV, DetectedStar, EMPTY_IMAGE_SOLVED, FOV, IMAGE_STATISTICS_BIT_OPTIONS, ImageAnnotation, ImageAnnotationDialog, ImageChannel, ImageData, ImageFITSHeadersDialog, ImageFOVDialog, ImageInfo, ImageROI, ImageSCNRDialog, ImageSaveDialog, ImageSolved, ImageSolverDialog, ImageStatisticsBitOption, ImageStretchDialog, ImageTransformation, SCNR_PROTECTION_METHODS, StarDetectionDialog } from '../../shared/types/image.types' +import { AnnotationInfoDialog, DEFAULT_FOV, DetectedStar, EMPTY_IMAGE_SOLVED, FITSHeaderItem, FOV, IMAGE_STATISTICS_BIT_OPTIONS, ImageAnnotation, ImageAnnotationDialog, ImageChannel, ImageData, ImageFITSHeadersDialog, ImageFOVDialog, ImageInfo, ImageROI, ImageSCNRDialog, ImageSaveDialog, ImageSolved, ImageSolverDialog, ImageStatisticsBitOption, ImageStretchDialog, ImageTransformation, StarDetectionDialog } from '../../shared/types/image.types' import { Mount } from '../../shared/types/mount.types' import { CoordinateInterpolator, InterpolatedCoordinate } from '../../shared/utils/coordinate-interpolation' import { AppComponent } from '../app.component' @@ -51,6 +51,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy { imageInfo?: ImageInfo private imageURL!: string imageData: ImageData = {} + showLiveStackedImage?: boolean readonly scnrChannels: { name: string, value?: ImageChannel }[] = [ { name: 'None', value: undefined }, @@ -58,7 +59,6 @@ export class ImageComponent implements AfterViewInit, OnDestroy { { name: 'Green', value: 'GREEN' }, { name: 'Blue', value: 'BLUE' }, ] - readonly scnrMethods = Array.from(SCNR_PROTECTION_METHODS) readonly scnr: ImageSCNRDialog = { showDialog: false, amount: 0.5, @@ -92,16 +92,25 @@ export class ImageComponent implements AfterViewInit, OnDestroy { readonly annotation: ImageAnnotationDialog = { showDialog: false, + running: false, + visible: false, useStarsAndDSOs: true, useMinorPlanets: false, minorPlanetsMagLimit: 18.0, - useSimbad: false + useSimbad: false, + data: [] + } + + readonly annotationInfo: AnnotationInfoDialog = { + showDialog: false } readonly starDetection: StarDetectionDialog = { showDialog: false, + running: false, type: 'ASTAP', minSNR: 0, + maxStars: 0, visible: false, stars: [], computed: { @@ -121,22 +130,18 @@ export class ImageComponent implements AfterViewInit, OnDestroy { readonly solver: ImageSolverDialog = { showDialog: false, - solving: false, + running: false, + type: 'ASTAP', blind: true, centerRA: '', centerDEC: '', radius: 4, + focalLength: 0, + pixelSize: 0, solved: structuredClone(EMPTY_IMAGE_SOLVED), - types: ['ASTAP', 'ASTROMETRY_NET_ONLINE'], - type: 'ASTAP' } crossHair = false - annotations: ImageAnnotation[] = [] - annotating = false - showAnnotationInfoDialog = false - annotationInfo?: AstronomicalObject & Partial - annotationIsVisible = false readonly fitsHeaders: ImageFITSHeadersDialog = { showDialog: false, @@ -303,7 +308,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy { disabled: true, command: () => { this.executeMount(mount => { - this.api.pointMountHere(mount, this.imageData.path!, this.imageMouseX, this.imageMouseY) + this.api.pointMountHere(mount, this.imagePath!, this.imageMouseX, this.imageMouseY) }) }, } @@ -341,7 +346,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy { }, toggle: (event) => { event.originalEvent?.stopImmediatePropagation() - this.annotationIsVisible = event.checked + this.annotation.visible = event.checked }, } @@ -453,6 +458,14 @@ export class ImageComponent implements AfterViewInit, OnDestroy { && !this.transformation.mirrorVertical } + get imagePath() { + return (this.showLiveStackedImage && this.imageData.liveStackedPath) || this.imageData.path + } + + get canPlateSolve() { + return this.solver.type !== 'SIRIL' || (this.solver.focalLength > 0 && this.solver.pixelSize > 0) + } + constructor( private app: AppComponent, private route: ActivatedRoute, @@ -465,6 +478,23 @@ export class ImageComponent implements AfterViewInit, OnDestroy { ) { app.title = 'Image' + app.topMenu.push({ + label: 'Live Stacking', + toggleable: true, + visible: false, + toggle: (event) => { + if (event.originalEvent) { + this.showLiveStackedImage = !!event.checked + + if (this.showLiveStackedImage) { + this.disableCalibration(true) + } + + this.loadImage(true) + } + }, + }) + app.topMenu.push({ icon: 'mdi mdi-fullscreen', label: 'Fullscreen', @@ -509,19 +539,32 @@ export class ImageComponent implements AfterViewInit, OnDestroy { electron.on('CAMERA.CAPTURE_ELAPSED', async (event) => { if (event.state === 'EXPOSURE_FINISHED' && event.camera.id === this.imageData.camera?.id) { - await this.closeImage(true) - ngZone.run(() => { - this.imageData.path = event.savePath + if (this.showLiveStackedImage === undefined) { + if (event.liveStackedPath) { + this.showLiveStackedImage = true + this.app.topMenu[0].toggled = true + this.app.topMenu[0].visible = true + this.disableCalibration(true) + } + } else if (!event.liveStackedPath) { + this.showLiveStackedImage = undefined + this.app.topMenu[0].toggled = false + this.app.topMenu[0].visible = false + } + + this.imageData.path = event.savedPath + this.imageData.liveStackedPath = event.liveStackedPath + this.imageData.capture = event.capture + this.imageData.exposureCount = event.exposureCount + this.clearOverlay() - this.loadImage() + this.loadImage(true) }) } }) electron.on('DATA.CHANGED', async (event: ImageData) => { - await this.closeImage(event.path !== this.imageData.path) - ngZone.run(() => { this.loadImageFromData(event) }) @@ -563,12 +606,12 @@ export class ImageComponent implements AfterViewInit, OnDestroy { } private markCalibrationGroupItem(name?: string) { - this.calibrationMenuItem.items![1].checked = this.calibrationViaCamera + this.calibrationMenuItem.items![2].disabled = !this.imageInfo?.camera?.id + this.calibrationMenuItem.items![2].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 + item.checked = !this.calibrationViaCamera && item.data === name } } @@ -589,11 +632,12 @@ export class ImageComponent implements AfterViewInit, OnDestroy { return { label, icon, - checked: this.transformation.calibrationGroup === name, - disabled: this.calibrationViaCamera, + checked: !this.calibrationViaCamera && this.transformation.calibrationGroup === name, + data: name, command: async () => { + this.calibrationViaCamera = false this.transformation.calibrationGroup = name - this.markCalibrationGroupItem(label) + this.markCalibrationGroupItem(name) await this.loadImage() }, } @@ -607,17 +651,23 @@ export class ImageComponent implements AfterViewInit, OnDestroy { command: () => this.browserWindow.openCalibration() }) + menu.push(SEPARATOR_MENU_ITEM) + menu.push({ label: 'Camera', icon: 'mdi mdi-camera-iris', checked: this.calibrationViaCamera, - command: () => { - this.calibrationViaCamera = !this.calibrationViaCamera - this.markCalibrationGroupItem(this.transformation.calibrationGroup) + disabled: !this.imageInfo?.camera?.id, + data: 0, + command: async () => { + if (this.imageInfo?.camera?.id) { + this.calibrationViaCamera = !this.calibrationViaCamera + this.markCalibrationGroupItem(this.transformation.calibrationGroup) + await this.loadImage() + } } }) - menu.push(SEPARATOR_MENU_ITEM) menu.push(makeItem()) for (const group of groups) { @@ -634,10 +684,11 @@ export class ImageComponent implements AfterViewInit, OnDestroy { } private async closeImage(force: boolean = false) { - if (this.imageData.path) { - if (force) { - await this.api.closeImage(this.imageData.path) - } + if (this.imageData.path && force) { + await this.api.closeImage(this.imageData.path) + } + if (this.imageData.liveStackedPath && force) { + await this.api.closeImage(this.imageData.liveStackedPath) } } @@ -720,12 +771,12 @@ export class ImageComponent implements AfterViewInit, OnDestroy { } this.clearOverlay() - this.loadImage() + this.loadImage(true) } private clearOverlay() { - this.annotations = [] - this.annotationIsVisible = false + this.annotation.data = [] + this.annotation.visible = false this.annotationMenuItem.toggleable = false this.starDetection.stars = [] @@ -738,7 +789,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy { } private async computeHistogram() { - const data = await this.api.imageHistogram(this.imageData.path!, this.statisticsBitLength.bitLength) + const data = await this.api.imageHistogram(this.imagePath!, this.statisticsBitLength.bitLength) this.histogram.update(data) } @@ -747,9 +798,16 @@ export class ImageComponent implements AfterViewInit, OnDestroy { } async detectStars() { - const options = this.preference.starDetectionOptions(this.starDetection.type).get() + const options = this.preference.starDetectionRequest(this.starDetection.type).get() options.minSNR = this.starDetection.minSNR - this.starDetection.stars = await this.api.detectStars(this.imageData.path!, options) + options.maxStars = this.starDetection.maxStars + + try { + this.starDetection.running = true + this.starDetection.stars = await this.api.detectStars(this.imagePath!, options) + } finally { + this.starDetection.running = false + } let hfd = 0 let snr = 0 @@ -784,9 +842,19 @@ export class ImageComponent implements AfterViewInit, OnDestroy { ctx?.drawImage(this.image.nativeElement, star.x - 8, star.y - 8, 16, 16, 0, 0, canvas.width, canvas.height) } - private async loadImage() { - if (this.imageData.path) { - await this.loadImageFromPath(this.imageData.path) + private async loadImage(force: boolean = false) { + await this.closeImage(force) + + const path = this.imagePath + + if (path) { + await this.loadImageFromPath(path) + } + + let extraInfo = '' + + if (this.imageData.exposureCount) { + extraInfo += ` · ${this.imageData.exposureCount}` } if (this.imageData.title) { @@ -798,13 +866,15 @@ export class ImageComponent implements AfterViewInit, OnDestroy { } else { this.app.subTitle = '' } + + this.app.subTitle += extraInfo } private async loadImageFromPath(path: string) { const image = this.image.nativeElement const transformation = structuredClone(this.transformation) - if (this.calibrationViaCamera) transformation.calibrationGroup = this.imageData.capture?.calibrationGroup + if (this.calibrationViaCamera && !this.showLiveStackedImage) transformation.calibrationGroup = this.imageData.capture?.calibrationGroup const { info, blob } = await this.api.openImage(path, transformation, this.imageData.camera) this.imageInfo = info @@ -824,6 +894,8 @@ export class ImageComponent implements AfterViewInit, OnDestroy { this.fitsHeaders.headers = info.headers + this.retrieveInfoFromImageHeaders(info.headers) + if (this.imageURL) window.URL.revokeObjectURL(this.imageURL) this.imageURL = window.URL.createObjectURL(blob) image.src = this.imageURL @@ -831,11 +903,28 @@ export class ImageComponent implements AfterViewInit, OnDestroy { if (!info.camera?.id) { this.calibrationViaCamera = false this.markCalibrationGroupItem(this.transformation.calibrationGroup) + } else { + this.calibrationMenuItem.items![2].disabled = false } this.retrieveCoordinateInterpolation() } + private retrieveInfoFromImageHeaders(headers: FITSHeaderItem[]) { + const imagePreference = this.preference.imagePreference.get() + + for (const item of headers) { + if (item.name === 'FOCALLEN') { + this.solver.focalLength = parseFloat(item.value) + } else if (item.name === 'XPIXSZ') { + this.solver.pixelSize = parseFloat(item.value) + } + } + + this.solver.focalLength ||= imagePreference.solver?.focalLength || 0 + this.solver.pixelSize ||= imagePreference.solver?.pixelSize || 0 + } + imageClicked(event: MouseEvent, contextMenu: boolean) { this.imageMouseX = event.offsetX this.imageMouseY = event.offsetY @@ -861,27 +950,27 @@ export class ImageComponent implements AfterViewInit, OnDestroy { } async saveImageAs() { - await this.api.saveImageAs(this.imageData!.path!, this.saveAs, this.imageData.camera) + await this.api.saveImageAs(this.imagePath!, 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.annotation.useStarsAndDSOs, + this.annotation.running = true + this.annotation.data = await this.api.annotationsOfImage(this.imagePath!, 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.annotation.visible = this.annotation.data.length > 0 + this.annotationMenuItem.toggleable = this.annotation.visible + this.annotationMenuItem.toggled = this.annotation.visible this.annotation.showDialog = false } finally { - this.annotating = false + this.annotation.running = false } } showAnnotationInfo(annotation: ImageAnnotation) { - this.annotationInfo = annotation.star ?? annotation.dso ?? annotation.minorPlanet - this.showAnnotationInfoDialog = true + this.annotationInfo.info = annotation.star ?? annotation.dso ?? annotation.minorPlanet + this.annotationInfo.showDialog = true } private disableAutoStretch() { @@ -983,7 +1072,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy { } private async retrieveCoordinateInterpolation() { - const coordinate = await this.api.coordinateInterpolation(this.imageData.path!) + const coordinate = await this.api.coordinateInterpolation(this.imagePath!) if (coordinate) { const { ma, md, x0, y0, x1, y1, delta } = coordinate @@ -998,11 +1087,11 @@ export class ImageComponent implements AfterViewInit, OnDestroy { } async solveImage() { - this.solver.solving = true + this.solver.running = true try { - const solver = this.preference.plateSolverOptions(this.solver.type).get() - const solved = await this.api.solveImage(solver, this.imageData.path!, this.solver.blind, + const solver = this.preference.plateSolverRequest(this.solver.type).get() + const solved = await this.api.solveImage(solver, this.imagePath!, this.solver.blind, this.solver.centerRA, this.solver.centerDEC, this.solver.radius) this.savePreference() @@ -1010,7 +1099,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy { } catch { this.updateImageSolved(this.imageInfo?.solved) } finally { - this.solver.solving = false + this.solver.running = false if (this.solver.solved.solved) { this.retrieveCoordinateInterpolation() @@ -1186,10 +1275,13 @@ export class ImageComponent implements AfterViewInit, OnDestroy { private loadPreference() { const preference = this.preference.imagePreference.get() - this.solver.radius = preference.solverRadius ?? this.solver.radius - this.solver.type = preference.solverType ?? this.solver.types[0] - this.starDetection.type = preference.starDetectionType ?? this.starDetection.type - this.starDetection.minSNR = this.preference.starDetectionOptions(this.starDetection.type).get().minSNR ?? this.starDetection.type + this.solver.radius = preference.solver?.radius ?? this.solver.radius + this.solver.type = preference.solver?.type ?? 'ASTAP' + this.solver.focalLength = preference.solver?.focalLength ?? 0 + this.solver.pixelSize = preference.solver?.pixelSize ?? 0 + this.starDetection.type = preference.starDetection?.type ?? this.starDetection.type + this.starDetection.minSNR = preference.starDetection?.minSNR ?? this.preference.starDetectionRequest(this.starDetection.type).get().minSNR ?? this.starDetection.minSNR + this.starDetection.maxStars = preference.starDetection?.maxStars ?? this.preference.starDetectionRequest(this.starDetection.type).get().maxStars ?? this.starDetection.maxStars this.fov.fovs = this.preference.imageFOVs.get() this.fov.fovs.forEach(e => { e.enabled = false; e.computed = undefined }) @@ -1197,9 +1289,19 @@ export class ImageComponent implements AfterViewInit, OnDestroy { private savePreference() { const preference = this.preference.imagePreference.get() - preference.solverRadius = this.solver.radius - preference.solverType = this.solver.type - preference.starDetectionType = this.starDetection.type + + preference.solver = { + type: this.solver.type, + focalLength: this.solver.focalLength, + pixelSize: this.solver.pixelSize, + radius: this.solver.radius, + } + preference.starDetection = { + type: this.starDetection.type, + maxStars: this.starDetection.maxStars, + minSNR: this.starDetection.minSNR, + } + this.preference.imagePreference.set(preference) } diff --git a/desktop/src/app/indi/property/indi-property.component.html b/desktop/src/app/indi/property/indi-property.component.html index 7b5c9c3f6..84098b176 100644 --- a/desktop/src/app/indi/property/indi-property.component.html +++ b/desktop/src/app/indi/property/indi-property.component.html @@ -6,17 +6,17 @@
+ (onClick)="sendSwitch(item)" icon="pi" [severity]="item.value ? 'success' : 'danger'" size="small" [text]="true">
+ (onClick)="sendSwitch(item)" icon="mdi mdi-check" size="small" [text]="true" />
+ (onClick)="sendSwitch(item)" icon="pi" [severity]="item.value ? 'success' : 'danger'" size="small" [text]="true">
@@ -39,7 +39,7 @@
+ size="small" [text]="true" />
@@ -60,7 +60,8 @@
- +
diff --git a/desktop/src/app/mount/mount.component.html b/desktop/src/app/mount/mount.component.html index 471ac72fc..a21d943c1 100644 --- a/desktop/src/app/mount/mount.component.html +++ b/desktop/src/app/mount/mount.component.html @@ -226,7 +226,7 @@
- @@ -244,6 +244,12 @@
+
+ Used with the mobile app + Used with the desktop app +
diff --git a/desktop/src/app/mount/mount.component.ts b/desktop/src/app/mount/mount.component.ts index 604dd02de..fe4fbad8d 100644 --- a/desktop/src/app/mount/mount.component.ts +++ b/desktop/src/app/mount/mount.component.ts @@ -279,14 +279,13 @@ export class MountComponent implements AfterContentInit, OnDestroy, Pingable { hotkeys('e', { keyup: true }, event => { event.preventDefault(); this.moveTo('NE', event.type === 'keydown') }) hotkeys('z', { keyup: true }, event => { event.preventDefault(); this.moveTo('SW', event.type === 'keydown') }) hotkeys('c', { keyup: true }, event => { event.preventDefault(); this.moveTo('SE', event.type === 'keydown') }) - - this.pinger.register(this, 30000) } async ngAfterContentInit() { - this.route.queryParams.subscribe(e => { + this.route.queryParams.subscribe(async e => { const mount = JSON.parse(decodeURIComponent(e.data)) as Mount - this.mountChanged(mount) + await this.mountChanged(mount) + this.pinger.register(this, 30000) }) } diff --git a/desktop/src/app/rotator/rotator.component.ts b/desktop/src/app/rotator/rotator.component.ts index d9a8215dc..6886e7044 100644 --- a/desktop/src/app/rotator/rotator.component.ts +++ b/desktop/src/app/rotator/rotator.component.ts @@ -47,14 +47,13 @@ export class RotatorComponent implements AfterViewInit, OnDestroy, Pingable { }) } }) - - pinger.register(this, 30000) } async ngAfterViewInit() { - this.route.queryParams.subscribe(e => { + this.route.queryParams.subscribe(async e => { const rotator = JSON.parse(decodeURIComponent(e.data)) as Rotator - this.rotatorChanged(rotator) + await this.rotatorChanged(rotator) + this.pinger.register(this, 30000) }) } diff --git a/desktop/src/app/sequencer/sequencer.component.html b/desktop/src/app/sequencer/sequencer.component.html index 52c823755..998f0830e 100644 --- a/desktop/src/app/sequencer/sequencer.component.html +++ b/desktop/src/app/sequencer/sequencer.component.html @@ -27,13 +27,8 @@ - - - - - - +
@@ -144,6 +139,8 @@ (deviceChange)="wheelChanged()" /> +
@@ -226,9 +223,9 @@
+ severity="success" size="small" [text]="true" /> + severity="danger" size="small" [text]="true" />
diff --git a/desktop/src/app/sequencer/sequencer.component.ts b/desktop/src/app/sequencer/sequencer.component.ts index bde94f520..43b06746c 100644 --- a/desktop/src/app/sequencer/sequencer.component.ts +++ b/desktop/src/app/sequencer/sequencer.component.ts @@ -13,6 +13,7 @@ import { JsonFile } from '../../shared/types/app.types' import { Camera, CameraCaptureEvent, CameraStartCapture } from '../../shared/types/camera.types' import { Focuser } from '../../shared/types/focuser.types' import { Mount } from '../../shared/types/mount.types' +import { Rotator } from '../../shared/types/rotator.types' import { EMPTY_SEQUENCE_PLAN, SEQUENCE_ENTRY_PROPERTIES, SequenceCaptureMode, SequenceEntryProperty, SequencePlan, SequencerEvent } from '../../shared/types/sequencer.types' import { FilterWheel } from '../../shared/types/wheel.types' import { deviceComparator } from '../../shared/utils/comparators' @@ -34,11 +35,13 @@ export class SequencerComponent implements AfterContentInit, OnDestroy, Pingable mounts: Mount[] = [] wheels: FilterWheel[] = [] focusers: Focuser[] = [] + rotators: Rotator[] = [] camera?: Camera mount?: Mount wheel?: FilterWheel focuser?: Focuser + rotator?: Rotator readonly captureModes: SequenceCaptureMode[] = ['FULLY', 'INTERLEAVED'] readonly plan = structuredClone(EMPTY_SEQUENCE_PLAN) @@ -177,43 +180,53 @@ export class SequencerComponent implements AfterContentInit, OnDestroy, Pingable }) electron.on('CAMERA.UPDATED', event => { - ngZone.run(() => { - const camera = this.cameras.find(e => e.id === event.device.id) + const camera = this.cameras.find(e => e.id === event.device.id) - if (camera) { + if (camera) { + ngZone.run(() => { Object.assign(camera, event.device) - } - }) + }) + } }) electron.on('MOUNT.UPDATED', event => { - ngZone.run(() => { - const mount = this.mounts.find(e => e.id === event.device.id) + const mount = this.mounts.find(e => e.id === event.device.id) - if (mount) { + if (mount) { + ngZone.run(() => { Object.assign(mount, event.device) - } - }) + }) + } }) electron.on('WHEEL.UPDATED', event => { - ngZone.run(() => { - const wheel = this.wheels.find(e => e.id === event.device.id) + const wheel = this.wheels.find(e => e.id === event.device.id) - if (wheel) { + if (wheel) { + ngZone.run(() => { Object.assign(wheel, event.device) - } - }) + }) + } }) electron.on('FOCUSER.UPDATED', event => { - ngZone.run(() => { - const focuser = this.focusers.find(e => e.id === event.device.id) + const focuser = this.focusers.find(e => e.id === event.device.id) - if (focuser) { + if (focuser) { + ngZone.run(() => { Object.assign(focuser, event.device) - } - }) + }) + } + }) + + electron.on('ROTATOR.UPDATED', event => { + const rotator = this.rotators.find(e => e.id === event.device.id) + + if (rotator) { + ngZone.run(() => { + Object.assign(rotator, event.device) + }) + } }) electron.on('SEQUENCER.ELAPSED', event => { @@ -237,15 +250,16 @@ export class SequencerComponent implements AfterContentInit, OnDestroy, Pingable for (const p of SEQUENCE_ENTRY_PROPERTIES) { this.availableEntryPropertiesToApply.set(p, true) } - - pinger.register(this, 30000) } async ngAfterContentInit() { + this.pinger.register(this, 30000) + this.cameras = (await this.api.cameras()).sort(deviceComparator) this.mounts = (await this.api.mounts()).sort(deviceComparator) this.wheels = (await this.api.wheels()).sort(deviceComparator) this.focusers = (await this.api.focusers()).sort(deviceComparator) + this.rotators = (await this.api.rotators()).sort(deviceComparator) this.loadSavedJsonFileFromPathOrAddDefault() @@ -262,6 +276,7 @@ export class SequencerComponent implements AfterContentInit, OnDestroy, Pingable if (this.mount) this.api.mountListen(this.mount) if (this.focuser) this.api.focuserListen(this.focuser) if (this.wheel) this.api.wheelListen(this.wheel) + if (this.rotator) this.api.rotatorListen(this.rotator) } private enableOrDisableTopbarMenu(enable: boolean) { @@ -272,6 +287,7 @@ export class SequencerComponent implements AfterContentInit, OnDestroy, Pingable const camera = this.camera ?? this.cameras[0] // const wheel = this.wheel ?? this.wheels[0] // const focuser = this.focuser ?? this.focusers[0] + // const rotator = this.rotator ?? this.rotators[0] this.plan.entries.push({ enabled: true, @@ -290,6 +306,20 @@ export class SequencerComponent implements AfterContentInit, OnDestroy, Pingable frameFormat: camera?.frameFormats[0], autoSave: true, autoSubFolderMode: 'OFF', + dither: { + enabled: false, + amount: 0, + raOnly: false, + afterExposures: 0 + }, + liveStacking: { + enabled: false, + type: 'SIRIL', + executablePath: '', + rotate: 0, + use32Bits: false, + slot: 1, + }, }) this.savePlan() @@ -342,8 +372,9 @@ export class SequencerComponent implements AfterContentInit, OnDestroy, Pingable this.camera = this.cameras.find(e => e.name === this.plan.camera?.name) ?? this.cameras[0] this.mount = this.mounts.find(e => e.name === this.plan.mount?.name) ?? this.mounts[0] - this.focuser = this.focusers.find(e => e.name === this.plan.focuser?.name) ?? this.focusers[0] this.wheel = this.wheels.find(e => e.name === this.plan.wheel?.name) ?? this.wheels[0] + this.focuser = this.focusers.find(e => e.name === this.plan.focuser?.name) ?? this.focusers[0] + this.rotator = this.rotators.find(e => e.name === this.plan.rotator?.name) ?? this.rotators[0] return plan.entries.length } @@ -363,16 +394,6 @@ export class SequencerComponent implements AfterContentInit, OnDestroy, Pingable } } - async chooseSavePath() { - const defaultPath = this.plan.savePath - const path = await this.electron.openDirectory({ defaultPath }) - - if (path) { - this.plan.savePath = path - this.savePlan() - } - } - async showCameraDialog(entry: CameraStartCapture) { if (await CameraComponent.showAsDialog(this.browserWindow, 'SEQUENCER', this.camera!, entry)) { this.savePlan() @@ -401,11 +422,16 @@ export class SequencerComponent implements AfterContentInit, OnDestroy, Pingable this.ping() } + rotatorChanged() { + this.ping() + } + savePlan() { this.plan.camera = this.camera this.plan.mount = this.mount this.plan.wheel = this.wheel this.plan.focuser = this.focuser + this.plan.rotator = this.rotator this.storage.set(SEQUENCER_PLAN_KEY, this.plan) this.savedPathWasModified = !!this.savedPath } diff --git a/desktop/src/app/settings/settings.component.html b/desktop/src/app/settings/settings.component.html index e2cdc4107..2e45ca29f 100644 --- a/desktop/src/app/settings/settings.component.html +++ b/desktop/src/app/settings/settings.component.html @@ -1,90 +1,153 @@ -
- - -
- +
+
+ + + + +
+
+
+
+
- - - + + +
- - -
- - - +
+
+
+
+
+ + + - +
+
+ - - +
+ + - - - - - - - - - +
+
+ +
+
+ + - - +
+
+ +
- - -
- - +
+
+
+
+ + - + - +
+
+ +
+
+ - +
+
+ + + + +
+
+ - - - - - - +
+
+ + + + +
+
+
+
+
+
+ + + + +
+
+ +
+
+ + +
- - +
+
\ 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 2d8931004..5802796bb 100644 --- a/desktop/src/app/settings/settings.component.ts +++ b/desktop/src/app/settings/settings.component.ts @@ -1,12 +1,12 @@ import { AfterViewInit, Component, HostListener, OnDestroy } from '@angular/core' -import path from 'path' import { LocationDialog } from '../../shared/dialogs/location/location.dialog' -import { ApiService } from '../../shared/services/api.service' +import { DropdownOptionsPipe } from '../../shared/pipes/dropdown-options' 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 { PlateSolverOptions, PlateSolverType, StarDetectionOptions, StarDetectorType } from '../../shared/types/settings.types' +import { LiveStackerType, LiveStackingRequest } from '../../shared/types/camera.types' +import { PlateSolverRequest, PlateSolverType, StarDetectionRequest, StarDetectorType } from '../../shared/types/settings.types' import { AppComponent } from '../app.component' @Component({ @@ -16,31 +16,59 @@ import { AppComponent } from '../app.component' }) export class SettingsComponent implements AfterViewInit, OnDestroy { + tab = 0 + readonly tabs: { id: number, name: string }[] = [ + { + id: 0, + name: 'Location' + }, + { + id: 1, + name: 'Plate Solver' + }, + { + id: 2, + name: 'Star Detection' + }, + { + id: 3, + name: 'Live Stacking' + }, + ] + readonly locations: Location[] location: Location - solverType: PlateSolverType = 'ASTAP' - readonly solvers = new Map() + plateSolverType: PlateSolverType = 'ASTAP' + readonly plateSolvers = new Map() starDetectorType: StarDetectorType = 'ASTAP' - readonly starDetectors = new Map() + readonly starDetectors = new Map() + + liveStackerType: LiveStackerType = 'SIRIL' + readonly liveStackers = new Map() constructor( app: AppComponent, - private api: ApiService, private preference: PreferenceService, private electron: ElectronService, private prime: PrimeService, + private dropdownOptions: DropdownOptionsPipe, ) { app.title = 'Settings' this.locations = preference.locations.get() this.location = preference.selectedLocation.get(this.locations[0]) - this.solvers.set('ASTAP', preference.plateSolverOptions('ASTAP').get()) - this.solvers.set('ASTROMETRY_NET_ONLINE', preference.plateSolverOptions('ASTROMETRY_NET_ONLINE').get()) - - this.starDetectors.set('ASTAP', preference.starDetectionOptions('ASTAP').get()) + for (const type of dropdownOptions.transform('PLATE_SOLVER')) { + this.plateSolvers.set(type, preference.plateSolverRequest(type).get()) + } + for (const type of dropdownOptions.transform('STAR_DETECTOR')) { + this.starDetectors.set(type, preference.starDetectionRequest(type).get()) + } + for (const type of dropdownOptions.transform('LIVE_STACKER')) { + this.liveStackers.set(type, preference.liveStackingRequest(type).get()) + } } async ngAfterViewInit() { } @@ -102,31 +130,15 @@ export class SettingsComponent implements AfterViewInit, OnDestroy { this.electron.send('LOCATION.CHANGED', this.location) } - async chooseExecutablePathForPlateSolver() { - const options = this.solvers.get(this.solverType)! - this.chooseExecutablePath(options) - } - - async chooseExecutablePathForStarDetection() { - const options = this.solvers.get(this.starDetectorType)! - this.chooseExecutablePath(options) - } - - private async chooseExecutablePath(options: { executablePath: string }) { - const executablePath = await this.electron.openFile({ defaultPath: path.dirname(options.executablePath) }) - - if (executablePath) { - options.executablePath = executablePath - this.save() - } - - return executablePath - } - save() { - this.preference.plateSolverOptions('ASTAP').set(this.solvers.get('ASTAP')!) - this.preference.plateSolverOptions('ASTROMETRY_NET_ONLINE').set(this.solvers.get('ASTROMETRY_NET_ONLINE')!) - - this.preference.starDetectionOptions('ASTAP').set(this.starDetectors.get('ASTAP')!) + for (const type of this.dropdownOptions.transform('PLATE_SOLVER')) { + this.preference.plateSolverRequest(type).set(this.plateSolvers.get(type)) + } + for (const type of this.dropdownOptions.transform('STAR_DETECTOR')) { + this.preference.starDetectionRequest(type).set(this.starDetectors.get(type)) + } + for (const type of this.dropdownOptions.transform('LIVE_STACKER')) { + this.preference.liveStackingRequest(type).set(this.liveStackers.get(type)) + } } } \ No newline at end of file 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 c25094060..b48c1ac3d 100644 --- a/desktop/src/shared/components/camera-exposure/camera-exposure.component.ts +++ b/desktop/src/shared/components/camera-exposure/camera-exposure.component.ts @@ -47,6 +47,8 @@ export class CameraExposureComponent { this.state = 'EXPOSURING' } else if (event.state === 'IDLE' || event.state === 'CAPTURE_FINISHED') { this.reset() + } else if (event.state !== 'EXPOSURE_FINISHED') { + this.state = event.state } return this.state !== undefined diff --git a/desktop/src/shared/components/map/map.component.html b/desktop/src/shared/components/map/map.component.html index e4e6a7ec1..0c20a3260 100644 --- a/desktop/src/shared/components/map/map.component.html +++ b/desktop/src/shared/components/map/map.component.html @@ -1 +1 @@ -
+
diff --git a/desktop/src/shared/components/path-chooser/path-chooser.component.html b/desktop/src/shared/components/path-chooser/path-chooser.component.html new file mode 100644 index 000000000..f650816a8 --- /dev/null +++ b/desktop/src/shared/components/path-chooser/path-chooser.component.html @@ -0,0 +1,9 @@ +
+ + + + + +
\ No newline at end of file diff --git a/desktop/src/shared/components/path-chooser/path-chooser.component.scss b/desktop/src/shared/components/path-chooser/path-chooser.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/desktop/src/shared/components/path-chooser/path-chooser.component.ts b/desktop/src/shared/components/path-chooser/path-chooser.component.ts new file mode 100644 index 000000000..086c5453e --- /dev/null +++ b/desktop/src/shared/components/path-chooser/path-chooser.component.ts @@ -0,0 +1,59 @@ +import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core' +import { dirname } from 'path' +import { ElectronService } from '../../services/electron.service' + +@Component({ + selector: 'neb-path-chooser', + templateUrl: './path-chooser.component.html', + styleUrls: ['./path-chooser.component.scss'], +}) +export class PathChooserComponent implements OnChanges { + + @Input({ required: true }) + readonly key!: string + + @Input() + readonly label?: string + + @Input() + readonly placeholder?: string + + @Input() + readonly disabled: boolean = false + + @Input() + readonly readonly: boolean = false + + @Input({ required: true }) + readonly directory!: boolean + + @Input() + path?: string + + @Output() + readonly pathChange = new EventEmitter() + + constructor(private electron: ElectronService) { } + + ngOnChanges(changes: SimpleChanges) { + if (changes.path) { + this.path = changes.path.currentValue + } + } + + async choosePath() { + const storageKey = `pathChooser.${this.key}.defaultPath` + const defaultPath = localStorage.getItem(storageKey) + const dirName = defaultPath && !this.directory ? dirname(defaultPath) : defaultPath + + const path = await (this.directory + ? this.electron.openDirectory({ defaultPath: dirName || this.path }) + : this.electron.openFile({ defaultPath: dirName || this.path })) + + if (path) { + this.path = path + this.pathChange.emit(path) + localStorage.setItem(storageKey, path) + } + } +} \ No newline at end of file diff --git a/desktop/src/shared/dialogs/location/location.dialog.html b/desktop/src/shared/dialogs/location/location.dialog.html index 7fe83c726..21068ab49 100644 --- a/desktop/src/shared/dialogs/location/location.dialog.html +++ b/desktop/src/shared/dialogs/location/location.dialog.html @@ -1,42 +1,42 @@ -
-
+
+
-
+
-
+
+ + + + +
+
-
+
-
- - - - -
-
+
\ No newline at end of file diff --git a/desktop/src/shared/pipes/dropdown-options.ts b/desktop/src/shared/pipes/dropdown-options.ts new file mode 100644 index 000000000..36b62d3cc --- /dev/null +++ b/desktop/src/shared/pipes/dropdown-options.ts @@ -0,0 +1,40 @@ +import { Pipe, PipeTransform } from '@angular/core' +import { AutoFocusFittingMode, BacklashCompensationMode } from '../types/autofocus.type' +import { LiveStackerType } from '../types/camera.types' +import { Bitpix, ImageChannel, ImageFormat, SCNRProtectionMethod } from '../types/image.types' +import { MountRemoteControlType } from '../types/mount.types' +import { PlateSolverType, StarDetectorType } from '../types/settings.types' + +export type DropdownOptions = { + 'STAR_DETECTOR': StarDetectorType[] + 'PLATE_SOLVER': PlateSolverType[] + 'LIVE_STACKER': LiveStackerType[] + 'AUTO_FOCUS_FITTING_MODE': AutoFocusFittingMode[] + 'AUTO_FOCUS_BACKLASH_COMPENSATION_MODE': BacklashCompensationMode[] + 'SCNR_PROTECTION_METHOD': SCNRProtectionMethod[] + 'IMAGE_FORMAT': ImageFormat[] + 'IMAGE_BITPIX': Bitpix[] + 'IMAGE_CHANNEL': ImageChannel[] + 'MOUNT_REMOTE_CONTROL_TYPE': MountRemoteControlType[] +} + +@Pipe({ name: 'dropdownOptions' }) +export class DropdownOptionsPipe implements PipeTransform { + + transform(type: K): DropdownOptions[K] { + switch (type) { + case 'STAR_DETECTOR': return ['ASTAP', 'PIXINSIGHT', 'SIRIL'] as DropdownOptions[K] + case 'PLATE_SOLVER': return ['ASTAP', 'ASTROMETRY_NET_ONLINE', 'SIRIL'] as DropdownOptions[K] + case 'AUTO_FOCUS_FITTING_MODE': return ['TRENDLINES', 'PARABOLIC', 'TREND_PARABOLIC', 'HYPERBOLIC', 'TREND_HYPERBOLIC'] as DropdownOptions[K] + case 'AUTO_FOCUS_BACKLASH_COMPENSATION_MODE': return ['NONE', 'ABSOLUTE', 'OVERSHOOT'] as DropdownOptions[K] + case 'LIVE_STACKER': return ['SIRIL', 'PIXINSIGHT'] as DropdownOptions[K] + case 'SCNR_PROTECTION_METHOD': return ['MAXIMUM_MASK', 'ADDITIVE_MASK', 'AVERAGE_NEUTRAL', 'MAXIMUM_NEUTRAL', 'MINIMUM_NEUTRAL'] as DropdownOptions[K] + case 'IMAGE_FORMAT': return ['FITS', 'XISF', 'PNG', 'JPG'] as DropdownOptions[K] + case 'IMAGE_BITPIX': return ['BYTE', 'SHORT', 'INTEGER', 'FLOAT', 'DOUBLE'] as DropdownOptions[K] + case 'IMAGE_CHANNEL': return ['RED', 'GREEN', 'BLUE', 'GRAY'] as DropdownOptions[K] + case 'MOUNT_REMOTE_CONTROL_TYPE': return ['LX200', 'STELLARIUM'] as DropdownOptions[K] + } + + return [] + } +} diff --git a/desktop/src/shared/pipes/enum.pipe.ts b/desktop/src/shared/pipes/enum.pipe.ts index c5135e1fc..f82471869 100644 --- a/desktop/src/shared/pipes/enum.pipe.ts +++ b/desktop/src/shared/pipes/enum.pipe.ts @@ -339,7 +339,9 @@ export class EnumPipe implements PipeTransform { 'PAUSING': 'Pausing', // Camera Exposure. 'SETTLING': 'Settling', + 'DITHERING': 'Dithering', 'WAITING': 'Waiting', + 'STACKING': 'Stacking', 'EXPOSURING': 'Exposuring', 'CAPTURE_STARTED': undefined, 'EXPOSURE_STARTED': undefined, diff --git a/desktop/src/shared/services/api.service.ts b/desktop/src/shared/services/api.service.ts index 4c4705545..b0c3b308a 100644 --- a/desktop/src/shared/services/api.service.ts +++ b/desktop/src/shared/services/api.service.ts @@ -15,7 +15,7 @@ import { CoordinateInterpolation, DetectedStar, FOVCamera, FOVTelescope, ImageAn 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, StarDetectionOptions } from '../types/settings.types' +import { PlateSolverRequest, StarDetectionRequest } from '../types/settings.types' import { FilterWheel } from '../types/wheel.types' import { HttpService } from './http.service' @@ -87,6 +87,14 @@ export class ApiService { return this.http.put(`cameras/${camera.id}/capture/start`, data) } + cameraPauseCapture(camera: Camera) { + return this.http.put(`cameras/${camera.id}/capture/pause`) + } + + cameraUnpauseCapture(camera: Camera) { + return this.http.put(`cameras/${camera.id}/capture/unpause`) + } + cameraAbortCapture(camera: Camera) { return this.http.put(`cameras/${camera.id}/capture/abort`) } @@ -555,7 +563,7 @@ export class ApiService { return this.http.get(`image/coordinate-interpolation?${query}`) } - detectStars(path: string, starDetector: StarDetectionOptions) { + detectStars(path: string, starDetector: StarDetectionRequest) { const query = this.http.query({ path }) return this.http.put(`star-detection?${query}`, starDetector) } @@ -664,7 +672,7 @@ export class ApiService { // SOLVER solveImage( - solver: PlateSolverOptions, path: string, blind: boolean, + solver: PlateSolverRequest, path: string, blind: boolean, centerRA: Angle, centerDEC: Angle, radius: Angle, ) { const query = this.http.query({ path, blind, centerRA, centerDEC, radius }) diff --git a/desktop/src/shared/services/browser-window.service.ts b/desktop/src/shared/services/browser-window.service.ts index 3b71ad203..4a7e38b4e 100644 --- a/desktop/src/shared/services/browser-window.service.ts +++ b/desktop/src/shared/services/browser-window.service.ts @@ -95,7 +95,7 @@ export class BrowserWindowService { } openAlignment(options: OpenWindowOptions = {}) { - Object.assign(options, { icon: 'star', width: 415, height: 365 }) + Object.assign(options, { icon: 'star', width: 425, height: 365 }) this.openWindow({ ...options, id: 'alignment', path: 'alignment', data: undefined }) } @@ -115,8 +115,8 @@ export class BrowserWindowService { } openSettings(options: OpenWindowOptions = {}) { - Object.assign(options, { icon: 'settings', width: 490, height: 460 }) - this.openWindow({ ...options, id: 'settings', path: 'settings', data: undefined, resizable: true, minWidth: 490, minHeight: 460, autoResizable: false }) + Object.assign(options, { icon: 'settings', width: 400, height: 450 }) + this.openWindow({ ...options, id: 'settings', path: 'settings', data: undefined, autoResizable: false }) } openCalculator(options: OpenWindowOptions = {}) { diff --git a/desktop/src/shared/services/preference.service.ts b/desktop/src/shared/services/preference.service.ts index 92808fee0..872b021c5 100644 --- a/desktop/src/shared/services/preference.service.ts +++ b/desktop/src/shared/services/preference.service.ts @@ -4,13 +4,13 @@ import { AlignmentPreference, EMPTY_ALIGNMENT_PREFERENCE } from '../types/alignm import { EMPTY_LOCATION, Location } from '../types/atlas.types' import { AutoFocusPreference, EMPTY_AUTO_FOCUS_PREFERENCE } from '../types/autofocus.type' import { CalibrationPreference } from '../types/calibration.types' -import { Camera, CameraPreference, CameraStartCapture, EMPTY_CAMERA_PREFERENCE } from '../types/camera.types' +import { Camera, CameraPreference, CameraStartCapture, EMPTY_CAMERA_PREFERENCE, EMPTY_LIVE_STACKING_REQUEST, LiveStackerType, LiveStackingRequest } from '../types/camera.types' import { Device } from '../types/device.types' import { Focuser, FocuserPreference } from '../types/focuser.types' import { ConnectionDetails, Equipment, HomePreference } from '../types/home.types' import { EMPTY_IMAGE_PREFERENCE, FOV, ImagePreference } from '../types/image.types' import { Rotator, RotatorPreference } from '../types/rotator.types' -import { EMPTY_PLATE_SOLVER_OPTIONS, EMPTY_STAR_DETECTION_OPTIONS, PlateSolverOptions, PlateSolverType, StarDetectionOptions, StarDetectorType } from '../types/settings.types' +import { EMPTY_PLATE_SOLVER_REQUEST, EMPTY_STAR_DETECTION_REQUEST, PlateSolverRequest, PlateSolverType, StarDetectionRequest, StarDetectorType } from '../types/settings.types' import { FilterWheel, WheelPreference } from '../types/wheel.types' import { LocalStorageService } from './local-storage.service' @@ -68,12 +68,16 @@ export class PreferenceService { return new PreferenceData(this.storage, `camera.${camera.name}.autoFocus`, () => this.cameraPreference(camera).get()) } - plateSolverOptions(type: PlateSolverType) { - return new PreferenceData(this.storage, `plateSolver.${type}`, () => { ...EMPTY_PLATE_SOLVER_OPTIONS, type }) + plateSolverRequest(type: PlateSolverType) { + return new PreferenceData(this.storage, `plateSolver.${type}`, () => { ...EMPTY_PLATE_SOLVER_REQUEST, type }) } - starDetectionOptions(type: StarDetectorType) { - return new PreferenceData(this.storage, `starDetection.${type}`, () => { ...EMPTY_STAR_DETECTION_OPTIONS, type }) + starDetectionRequest(type: StarDetectorType) { + return new PreferenceData(this.storage, `starDetection.${type}`, () => { ...EMPTY_STAR_DETECTION_REQUEST, type }) + } + + liveStackingRequest(type: LiveStackerType) { + return new PreferenceData(this.storage, `liveStacking.${type}`, () => { ...EMPTY_LIVE_STACKING_REQUEST, type }) } equipmentForDevice(device: Device) { diff --git a/desktop/src/shared/services/prime.service.ts b/desktop/src/shared/services/prime.service.ts index 1899c0902..55ec65c00 100644 --- a/desktop/src/shared/services/prime.service.ts +++ b/desktop/src/shared/services/prime.service.ts @@ -41,8 +41,8 @@ export class PrimeService { message, header: 'Confirmation', icon: 'mdi mdi-lg mdi-help-circle', - acceptButtonStyleClass: 'p-button-success', - rejectButtonStyleClass: 'p-button-danger', + acceptButtonStyleClass: 'p-button-success p-button-text', + rejectButtonStyleClass: 'p-button-danger p-button-text', accept: () => { resolve(ConfirmEventType.ACCEPT) }, diff --git a/desktop/src/shared/types/alignment.types.ts b/desktop/src/shared/types/alignment.types.ts index 19b4ddfd0..afc3fef7a 100644 --- a/desktop/src/shared/types/alignment.types.ts +++ b/desktop/src/shared/types/alignment.types.ts @@ -1,7 +1,7 @@ import { Angle } from './atlas.types' import { Camera, CameraCaptureEvent, CameraStartCapture } from './camera.types' import { GuideDirection } from './guider.types' -import { PlateSolverOptions, PlateSolverType } from './settings.types' +import { PlateSolverRequest, PlateSolverType } from './settings.types' export type Hemisphere = 'NORTHERN' | 'SOUTHERN' @@ -52,7 +52,7 @@ export interface DARVEvent extends MessageEvent { export interface TPPAStart { capture: CameraStartCapture - plateSolver: PlateSolverOptions + plateSolver: PlateSolverRequest startFromCurrentPosition: boolean compensateRefraction: boolean stopTrackingWhenDone: boolean diff --git a/desktop/src/shared/types/autofocus.type.ts b/desktop/src/shared/types/autofocus.type.ts index 4b84c4c4a..b17c56a8e 100644 --- a/desktop/src/shared/types/autofocus.type.ts +++ b/desktop/src/shared/types/autofocus.type.ts @@ -1,6 +1,6 @@ import { Point } from 'electron' import { CameraCaptureEvent, CameraStartCapture } from './camera.types' -import { EMPTY_STAR_DETECTION_OPTIONS, StarDetectionOptions } from './settings.types' +import { EMPTY_STAR_DETECTION_REQUEST, StarDetectionRequest } from './settings.types' export type AutoFocusState = 'IDLE' | 'MOVING' | 'EXPOSURING' | 'EXPOSURED' | 'ANALYSING' | 'ANALYSED' | 'CURVE_FITTED' | 'FAILED' | 'FINISHED' @@ -22,7 +22,7 @@ export interface AutoFocusRequest { initialOffsetSteps: number stepSize: number totalNumberOfAttempts: number - starDetector: StarDetectionOptions + starDetector: StarDetectionRequest } export interface AutoFocusPreference extends Omit { } @@ -38,7 +38,7 @@ export const EMPTY_AUTO_FOCUS_PREFERENCE: AutoFocusPreference = { backlashIn: 0, backlashOut: 0 }, - starDetector: EMPTY_STAR_DETECTION_OPTIONS, + starDetector: EMPTY_STAR_DETECTION_REQUEST, } export interface Curve { diff --git a/desktop/src/shared/types/camera.types.ts b/desktop/src/shared/types/camera.types.ts index 5d48be72f..f48b5937e 100644 --- a/desktop/src/shared/types/camera.types.ts +++ b/desktop/src/shared/types/camera.types.ts @@ -13,6 +13,8 @@ export type AutoSubFolderMode = 'OFF' | 'NOON' | 'MIDNIGHT' export type ExposureMode = 'SINGLE' | 'FIXED' | 'LOOP' +export type LiveStackerType = 'SIRIL' | 'PIXINSIGHT' + export enum ExposureTimeUnit { MINUTE = 'm', SECOND = 's', @@ -20,6 +22,14 @@ export enum ExposureTimeUnit { MICROSECOND = 'µs', } +export function isCamera(device?: Device): device is Camera { + return !!device && 'exposuring' in device +} + +export function isGuideHead(device?: Device): device is GuideHead { + return isCamera(device) && isCompanionDevice(device) && !!device.main +} + export interface Camera extends GuideOutput, Thermometer { exposuring: boolean hasCoolerControl: boolean @@ -154,11 +164,12 @@ export interface CameraStartCapture { autoSave: boolean savePath?: string autoSubFolderMode: AutoSubFolderMode - dither?: Dither + dither: Dither filterPosition?: number shutterPosition?: number focusOffset?: number calibrationGroup?: string + liveStacking: LiveStackingRequest } export const EMPTY_CAMERA_START_CAPTURE: CameraStartCapture = { @@ -181,6 +192,14 @@ export const EMPTY_CAMERA_START_CAPTURE: CameraStartCapture = { afterExposures: 1, amount: 1.5, raOnly: false, + }, + liveStacking: { + enabled: false, + type: 'SIRIL', + executablePath: "", + rotate: 0, + use32Bits: false, + slot: 1, } } @@ -210,11 +229,13 @@ export interface CameraCaptureEvent extends MessageEvent { stepElapsedTime: number stepProgress: number stepRemainingTime: number - savePath?: string + savedPath?: string + liveStackedPath?: string state: CameraCaptureState + capture?: CameraStartCapture } -export type CameraCaptureState = 'IDLE' | 'CAPTURE_STARTED' | 'EXPOSURE_STARTED' | 'EXPOSURING' | 'WAITING' | 'SETTLING' | 'EXPOSURE_FINISHED' | 'CAPTURE_FINISHED' +export type CameraCaptureState = 'IDLE' | 'CAPTURE_STARTED' | 'EXPOSURE_STARTED' | 'EXPOSURING' | 'WAITING' | 'SETTLING' | 'DITHERING' | 'STACKING' | 'PAUSING' | 'PAUSED' | 'EXPOSURE_FINISHED' | 'CAPTURE_FINISHED' export interface CameraDialogInput { mode: CameraDialogMode @@ -267,10 +288,23 @@ export const EMPTY_CAMERA_CAPTURE_INFO: CameraCaptureInfo = { count: 0, } -export function isCamera(device?: Device): device is Camera { - return !!device && 'exposuring' in device +export interface LiveStackingRequest { + enabled: boolean + type: LiveStackerType + executablePath: string + dark?: string + flat?: string + bias?: string + rotate: number + use32Bits: boolean + slot: number } -export function isGuideHead(device?: Device): device is GuideHead { - return isCamera(device) && isCompanionDevice(device) && !!device.main +export const EMPTY_LIVE_STACKING_REQUEST: LiveStackingRequest = { + enabled: false, + type: 'SIRIL', + executablePath: '', + rotate: 0, + use32Bits: false, + slot: 1, } diff --git a/desktop/src/shared/types/image.types.ts b/desktop/src/shared/types/image.types.ts index 2dabd6ef4..f7bb8688d 100644 --- a/desktop/src/shared/types/image.types.ts +++ b/desktop/src/shared/types/image.types.ts @@ -1,12 +1,11 @@ import { Point, Size } from 'electron' import { Angle, AstronomicalObject, DeepSkyObject, EquatorialCoordinateJ2000, Star } from './atlas.types' import { Camera, CameraStartCapture } from './camera.types' -import { PlateSolverType, StarDetectorType } from './settings.types' +import { PlateSolverRequest, StarDetectionRequest } from './settings.types' export type ImageChannel = 'RED' | 'GREEN' | 'BLUE' | 'GRAY' -export const SCNR_PROTECTION_METHODS = ['MAXIMUM_MASK', 'ADDITIVE_MASK', 'AVERAGE_NEUTRAL', 'MAXIMUM_NEUTRAL', 'MINIMUM_NEUTRAL'] as const -export type SCNRProtectionMethod = (typeof SCNR_PROTECTION_METHODS)[number] +export type SCNRProtectionMethod = 'MAXIMUM_MASK' | 'ADDITIVE_MASK' | 'AVERAGE_NEUTRAL' | 'MAXIMUM_NEUTRAL' | 'MINIMUM_NEUTRAL' export type ImageSource = 'FRAMING' | 'PATH' | 'CAMERA' | 'FLAT_WIZARD' | 'SEQUENCER' | 'ALIGNMENT' | 'AUTO_FOCUS' @@ -112,25 +111,43 @@ export interface ImageStatistics { maximum: number } +export interface StarDetectionImagePreference extends Pick { +} + +export interface PlateSolverImagePreference extends Pick { + radius: number + focalLength: number + pixelSize: number +} + export interface ImagePreference { - solverRadius?: number - solverType?: PlateSolverType savePath?: string - starDetectionType?: StarDetectorType + solver?: PlateSolverImagePreference + starDetection?: StarDetectionImagePreference } export const EMPTY_IMAGE_PREFERENCE: ImagePreference = { - solverRadius: 4, - solverType: 'ASTAP', - starDetectionType: 'ASTAP' + solver: { + type: 'ASTAP', + radius: 4, + focalLength: 0, + pixelSize: 0, + }, + starDetection: { + type: 'ASTAP', + minSNR: 0, + maxStars: 0, + } } export interface ImageData { camera?: Camera path?: string + liveStackedPath?: string source?: ImageSource title?: string capture?: CameraStartCapture + exposureCount?: number } export interface FOV { @@ -206,16 +223,13 @@ export interface ImageStretchDialog { midtone: number } -export interface ImageSolverDialog { +export interface ImageSolverDialog extends PlateSolverImagePreference { showDialog: boolean - solving: boolean + running: boolean blind: boolean centerRA: Angle centerDEC: Angle - radius: number readonly solved: ImageSolved - readonly types: PlateSolverType[] - type: PlateSolverType } export interface ImageFOVDialog extends FOV { @@ -259,10 +273,13 @@ export interface ImageTransformation { export interface ImageAnnotationDialog { showDialog: boolean + running: boolean + visible: boolean useStarsAndDSOs: boolean useMinorPlanets: boolean minorPlanetsMagLimit: number useSimbad: boolean + data: ImageAnnotation[] } export interface ROISelected { @@ -273,12 +290,16 @@ export interface ROISelected { height: number } -export interface StarDetectionDialog { +export interface StarDetectionDialog extends StarDetectionImagePreference { showDialog: boolean - type: StarDetectorType - minSNR: number + running: boolean visible: boolean stars: DetectedStar[] computed: Omit & { minFlux: number, maxFlux: number } selected: DetectedStar } + +export interface AnnotationInfoDialog { + showDialog: boolean + info?: AstronomicalObject & Partial +} diff --git a/desktop/src/shared/types/sequencer.types.ts b/desktop/src/shared/types/sequencer.types.ts index 58996386d..844a540b6 100644 --- a/desktop/src/shared/types/sequencer.types.ts +++ b/desktop/src/shared/types/sequencer.types.ts @@ -1,6 +1,7 @@ import { AutoSubFolderMode, Camera, CameraCaptureEvent, CameraStartCapture, Dither } from './camera.types' import { Focuser } from './focuser.types' import { Mount } from './mount.types' +import { Rotator } from './rotator.types' import { FilterWheel } from './wheel.types' export type SequenceCaptureMode = 'FULLY' | 'INTERLEAVED' @@ -39,6 +40,7 @@ export interface SequencePlan { mount?: Mount wheel?: FilterWheel focuser?: Focuser + rotator?: Rotator } export const EMPTY_SEQUENCE_PLAN: SequencePlan = { diff --git a/desktop/src/shared/types/settings.types.ts b/desktop/src/shared/types/settings.types.ts index b9226023d..201c3193c 100644 --- a/desktop/src/shared/types/settings.types.ts +++ b/desktop/src/shared/types/settings.types.ts @@ -1,6 +1,6 @@ -export type PlateSolverType = 'ASTROMETRY_NET' | 'ASTROMETRY_NET_ONLINE' | 'ASTAP' +export type PlateSolverType = 'ASTROMETRY_NET' | 'ASTROMETRY_NET_ONLINE' | 'ASTAP' | 'SIRIL' -export interface PlateSolverOptions { +export interface PlateSolverRequest { type: PlateSolverType executablePath: string downsampleFactor: number @@ -9,27 +9,31 @@ export interface PlateSolverOptions { timeout: number } -export const EMPTY_PLATE_SOLVER_OPTIONS: PlateSolverOptions = { +export const EMPTY_PLATE_SOLVER_REQUEST: PlateSolverRequest = { type: 'ASTAP', executablePath: '', downsampleFactor: 0, apiUrl: 'https://nova.astrometry.net/', apiKey: '', - timeout: 600, + timeout: 300, } -export type StarDetectorType = 'ASTAP' +export type StarDetectorType = 'ASTAP' | 'PIXINSIGHT' | 'SIRIL' -export interface StarDetectionOptions { +export interface StarDetectionRequest { type: StarDetectorType executablePath: string timeout: number minSNR: number + maxStars: number + slot: number } -export const EMPTY_STAR_DETECTION_OPTIONS: StarDetectionOptions = { +export const EMPTY_STAR_DETECTION_REQUEST: StarDetectionRequest = { type: 'ASTAP', executablePath: '', - timeout: 600, + timeout: 300, minSNR: 0, + maxStars: 0, + slot: 1, } diff --git a/desktop/src/styles.scss b/desktop/src/styles.scss index e2df7238b..6e2ddcc68 100644 --- a/desktop/src/styles.scss +++ b/desktop/src/styles.scss @@ -238,9 +238,11 @@ p-dropdownitem *, } .p-dialog { - .p-dialog-content { + &:has(.p-dialog-footer) .p-dialog-content { padding-bottom: 0px; + } + .p-dialog-content { &:has(neb-slide-menu) { background: #1e1e1e; color: rgba(255, 255, 255, 0.87); diff --git a/nebulosa-adql/src/main/kotlin/nebulosa/adql/ConstellationBoundary.kt b/nebulosa-adql/src/main/kotlin/nebulosa/adql/ConstellationBoundary.kt index b04471769..1bd488f1c 100644 --- a/nebulosa-adql/src/main/kotlin/nebulosa/adql/ConstellationBoundary.kt +++ b/nebulosa-adql/src/main/kotlin/nebulosa/adql/ConstellationBoundary.kt @@ -6,7 +6,7 @@ import nebulosa.io.resource import nebulosa.math.hours import nebulosa.math.toDegrees -class ConstellationBoundary internal constructor(override val operand: PolygonFunction) : Region { +data class ConstellationBoundary(override val operand: PolygonFunction) : Region { constructor(constellationName: String) : this(PolygonFunction(Region.ICRS, BOUNDARY[constellationName.uppercase()])) @@ -15,17 +15,19 @@ class ConstellationBoundary internal constructor(override val operand: PolygonFu private val BOUNDARY = HashMap>(88) init { - for (line in resource("constellations_bound_in_20.txt")!!.bufferedReader().lines()) { - if (line.isEmpty() || line.startsWith('#')) continue - - val parts = line.split(" ") - val rightAscension = parts[0].hours.toDegrees - val declination = parts[1].toDouble() - val name = parts[2].trim() - - with(BOUNDARY.getOrPut(name) { ArrayList(150) }) { - add(NumericConstant(rightAscension)) - add(NumericConstant(declination)) + resource("constellations_bound_in_20.txt")!!.use { + for (line in it.bufferedReader().lines()) { + if (line.isEmpty() || line.startsWith('#')) continue + + val parts = line.split(" ") + val rightAscension = parts[0].hours.toDegrees + val declination = parts[1].toDouble() + val name = parts[2].trim() + + with(BOUNDARY.getOrPut(name) { ArrayList(150) }) { + add(NumericConstant(rightAscension)) + add(NumericConstant(declination)) + } } } } diff --git a/nebulosa-alignment/build.gradle.kts b/nebulosa-alignment/build.gradle.kts index 432cfa8f9..cb6b362b6 100644 --- a/nebulosa-alignment/build.gradle.kts +++ b/nebulosa-alignment/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { api(project(":nebulosa-erfa")) api(project(":nebulosa-time")) - api(project(":nebulosa-plate-solving")) + api(project(":nebulosa-platesolver")) implementation(project(":nebulosa-log")) testImplementation(project(":nebulosa-test")) } diff --git a/nebulosa-alignment/src/main/kotlin/nebulosa/alignment/polar/point/three/PolarErrorDetermination.kt b/nebulosa-alignment/src/main/kotlin/nebulosa/alignment/polar/point/three/PolarErrorDetermination.kt index 169071fde..8eef232d3 100644 --- a/nebulosa-alignment/src/main/kotlin/nebulosa/alignment/polar/point/three/PolarErrorDetermination.kt +++ b/nebulosa-alignment/src/main/kotlin/nebulosa/alignment/polar/point/three/PolarErrorDetermination.kt @@ -6,7 +6,7 @@ import nebulosa.math.Angle import nebulosa.math.Vector3D import nebulosa.math.cos import nebulosa.math.sin -import nebulosa.plate.solving.PlateSolution +import nebulosa.platesolver.PlateSolution import nebulosa.time.InstantOfTime import nebulosa.time.UTC import kotlin.math.abs diff --git a/nebulosa-alignment/src/main/kotlin/nebulosa/alignment/polar/point/three/ThreePointPolarAlignment.kt b/nebulosa-alignment/src/main/kotlin/nebulosa/alignment/polar/point/three/ThreePointPolarAlignment.kt index b85a3385b..d5c548811 100644 --- a/nebulosa-alignment/src/main/kotlin/nebulosa/alignment/polar/point/three/ThreePointPolarAlignment.kt +++ b/nebulosa-alignment/src/main/kotlin/nebulosa/alignment/polar/point/three/ThreePointPolarAlignment.kt @@ -5,9 +5,9 @@ import nebulosa.common.Resettable import nebulosa.common.concurrency.cancel.CancellationToken import nebulosa.constants.DEG2RAD import nebulosa.math.Angle -import nebulosa.plate.solving.PlateSolution -import nebulosa.plate.solving.PlateSolver -import nebulosa.plate.solving.PlateSolvingException +import nebulosa.platesolver.PlateSolution +import nebulosa.platesolver.PlateSolver +import nebulosa.platesolver.PlateSolverException import nebulosa.time.UTC import java.nio.file.Path @@ -62,7 +62,7 @@ data class ThreePointPolarAlignment( val solution = try { solver.solve(path, null, rightAscension, declination, radius, cancellationToken = cancellationToken) - } catch (e: PlateSolvingException) { + } catch (e: PlateSolverException) { return NoPlateSolution(e) } diff --git a/nebulosa-alignment/src/main/kotlin/nebulosa/alignment/polar/point/three/ThreePointPolarAlignmentResult.kt b/nebulosa-alignment/src/main/kotlin/nebulosa/alignment/polar/point/three/ThreePointPolarAlignmentResult.kt index ad76ecf00..bfa8cfc28 100644 --- a/nebulosa-alignment/src/main/kotlin/nebulosa/alignment/polar/point/three/ThreePointPolarAlignmentResult.kt +++ b/nebulosa-alignment/src/main/kotlin/nebulosa/alignment/polar/point/three/ThreePointPolarAlignmentResult.kt @@ -1,7 +1,7 @@ package nebulosa.alignment.polar.point.three import nebulosa.math.Angle -import nebulosa.plate.solving.PlateSolvingException +import nebulosa.platesolver.PlateSolverException sealed interface ThreePointPolarAlignmentResult { @@ -12,7 +12,7 @@ sealed interface ThreePointPolarAlignmentResult { @JvmField val azimuth: Angle, @JvmField val altitude: Angle, ) : ThreePointPolarAlignmentResult - data class NoPlateSolution(@JvmField val exception: PlateSolvingException?) : ThreePointPolarAlignmentResult + data class NoPlateSolution(@JvmField val exception: PlateSolverException?) : ThreePointPolarAlignmentResult data object Cancelled : ThreePointPolarAlignmentResult } diff --git a/nebulosa-alignment/src/test/kotlin/ThreePointPolarAlignmentTest.kt b/nebulosa-alignment/src/test/kotlin/ThreePointPolarAlignmentTest.kt index 9b9281d47..5808474b9 100644 --- a/nebulosa-alignment/src/test/kotlin/ThreePointPolarAlignmentTest.kt +++ b/nebulosa-alignment/src/test/kotlin/ThreePointPolarAlignmentTest.kt @@ -9,7 +9,7 @@ import nebulosa.math.arcsec import nebulosa.math.deg import nebulosa.math.hours import nebulosa.math.toArcsec -import nebulosa.plate.solving.PlateSolution +import nebulosa.platesolver.PlateSolution import nebulosa.time.TimeYMDHMS import nebulosa.time.UTC diff --git a/nebulosa-astap/build.gradle.kts b/nebulosa-astap/build.gradle.kts index de3c37974..c3b85905d 100644 --- a/nebulosa-astap/build.gradle.kts +++ b/nebulosa-astap/build.gradle.kts @@ -5,8 +5,8 @@ plugins { dependencies { api(project(":nebulosa-common")) - api(project(":nebulosa-plate-solving")) - api(project(":nebulosa-star-detection")) + api(project(":nebulosa-platesolver")) + api(project(":nebulosa-stardetector")) api(libs.csv) api(libs.oshi) implementation(project(":nebulosa-log")) diff --git a/nebulosa-astap/src/main/kotlin/nebulosa/astap/plate/solving/AstapPlateSolver.kt b/nebulosa-astap/src/main/kotlin/nebulosa/astap/platesolver/AstapPlateSolver.kt similarity index 75% rename from nebulosa-astap/src/main/kotlin/nebulosa/astap/plate/solving/AstapPlateSolver.kt rename to nebulosa-astap/src/main/kotlin/nebulosa/astap/platesolver/AstapPlateSolver.kt index 3dab4195e..65781b721 100644 --- a/nebulosa-astap/src/main/kotlin/nebulosa/astap/plate/solving/AstapPlateSolver.kt +++ b/nebulosa-astap/src/main/kotlin/nebulosa/astap/platesolver/AstapPlateSolver.kt @@ -1,7 +1,7 @@ -package nebulosa.astap.plate.solving +package nebulosa.astap.platesolver import nebulosa.common.concurrency.cancel.CancellationToken -import nebulosa.common.process.ProcessExecutor +import nebulosa.common.exec.commandLine import nebulosa.fits.FitsHeader import nebulosa.fits.FitsKeyword import nebulosa.image.Image @@ -10,9 +10,9 @@ import nebulosa.math.Angle import nebulosa.math.deg import nebulosa.math.toDegrees import nebulosa.math.toHours -import nebulosa.plate.solving.PlateSolution -import nebulosa.plate.solving.PlateSolver -import nebulosa.plate.solving.PlateSolvingException +import nebulosa.platesolver.PlateSolution +import nebulosa.platesolver.PlateSolver +import nebulosa.platesolver.PlateSolverException import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths @@ -25,46 +25,47 @@ import kotlin.math.ceil /** * @see README */ -class AstapPlateSolver(path: Path) : PlateSolver { - - private val executor = ProcessExecutor(path) +data class AstapPlateSolver(private val executablePath: Path) : PlateSolver { override fun solve( path: Path?, image: Image?, centerRA: Angle, centerDEC: Angle, radius: Angle, - downsampleFactor: Int, timeout: Duration?, + downsampleFactor: Int, timeout: Duration, cancellationToken: CancellationToken, ): PlateSolution { requireNotNull(path) { "path is required" } - val arguments = mutableMapOf() - val basePath = Files.createTempDirectory("astap") val baseName = UUID.randomUUID().toString() val outFile = Paths.get("$basePath", baseName) - arguments["-o"] = outFile - arguments["-z"] = downsampleFactor - arguments["-fov"] = 0 // auto + val cmd = commandLine { + executablePath(executablePath) + workingDirectory(path.parent) - if (radius.toDegrees >= 0.1 && centerRA.isFinite() && centerDEC.isFinite()) { - arguments["-ra"] = centerRA.toHours - arguments["-spd"] = centerDEC.toDegrees + 90.0 - arguments["-r"] = ceil(radius.toDegrees) - } else { - arguments["-r"] = "180.0" - } + putArg("-o", outFile) + putArg("-z", downsampleFactor) + putArg("-fov", "0") // auto - arguments["-f"] = path + if (radius.toDegrees >= 0.1 && centerRA.isFinite() && centerDEC.isFinite()) { + putArg("-ra", centerRA.toHours) + putArg("-spd", centerDEC.toDegrees + 90.0) + putArg("-r", ceil(radius.toDegrees)) + } else { + putArg("-r", "180.0") + } + + putArg("-f", path) + } - LOG.info("ASTAP solving. command={}", arguments) + LOG.info("ASTAP solving. command={}", cmd.command) try { - val timeoutOrDefault = timeout?.takeIf { it.toSeconds() > 0 } ?: Duration.ofMinutes(5) - val process = executor.execute(arguments, timeoutOrDefault, path.parent, cancellationToken) + val timeoutOrDefault = timeout.takeIf { it.toSeconds() > 0 } ?: Duration.ofMinutes(5) + cancellationToken.listen(cmd) + cmd.start(timeoutOrDefault) - if (process.isAlive) process.destroyForcibly() - LOG.info("astap exited. code={}", process.exitValue()) + LOG.info("astap exited. code={}", cmd.get()) if (cancellationToken.isCancelled) return PlateSolution.NO_SOLUTION @@ -123,9 +124,10 @@ class AstapPlateSolver(path: Path) : PlateSolver { val message = ini.getProperty("ERROR") ?: ini.getProperty("WARNING") ?: "plate solving failed" - throw PlateSolvingException(message) + throw PlateSolverException(message) } } finally { + cancellationToken.unlisten(cmd) basePath.deleteRecursively() } } diff --git a/nebulosa-astap/src/main/kotlin/nebulosa/astap/star/detection/AstapStarDetector.kt b/nebulosa-astap/src/main/kotlin/nebulosa/astap/star/detection/AstapStarDetector.kt deleted file mode 100644 index d95dda050..000000000 --- a/nebulosa-astap/src/main/kotlin/nebulosa/astap/star/detection/AstapStarDetector.kt +++ /dev/null @@ -1,68 +0,0 @@ -package nebulosa.astap.star.detection - -import de.siegmar.fastcsv.reader.CommentStrategy -import de.siegmar.fastcsv.reader.CsvReader -import nebulosa.common.process.ProcessExecutor -import nebulosa.log.loggerFor -import nebulosa.star.detection.ImageStar -import nebulosa.star.detection.StarDetector -import java.io.InputStreamReader -import java.nio.file.Path -import kotlin.io.path.deleteIfExists -import kotlin.io.path.exists -import kotlin.io.path.inputStream -import kotlin.io.path.nameWithoutExtension - -class AstapStarDetector(path: Path, private val minSNR: Double = 0.0) : StarDetector { - - private val executor = ProcessExecutor(path) - - override fun detect(input: Path): List { - val arguments = mutableMapOf() - - arguments["-f"] = input - arguments["-z"] = 0 - arguments["-extract"] = minSNR - - val process = executor.execute(arguments, workingDir = input.parent) - - LOG.info("astap exited. code={}", process.exitValue()) - - val csvFile = Path.of("${input.parent}", input.nameWithoutExtension + ".csv") - - if (!csvFile.exists()) return emptyList() - - val detectedStars = ArrayList(512) - - try { - csvFile.inputStream().use { - for (record in CSV_READER.ofNamedCsvRecord(InputStreamReader(it, Charsets.UTF_8))) { - detectedStars.add( - Star( - record.getField("x").toDouble(), - record.getField("y").toDouble(), - record.getField("hfd").toDouble(), - record.getField("snr").toDouble(), - record.getField("flux").toDouble(), - ) - ) - } - } - } finally { - csvFile.deleteIfExists() - } - - return detectedStars - } - - companion object { - - @JvmStatic private val LOG = loggerFor() - - @JvmStatic private val CSV_READER = CsvReader.builder() - .fieldSeparator(',') - .quoteCharacter('"') - .commentCharacter('#') - .commentStrategy(CommentStrategy.SKIP) - } -} diff --git a/nebulosa-astap/src/main/kotlin/nebulosa/astap/star/detection/Star.kt b/nebulosa-astap/src/main/kotlin/nebulosa/astap/star/detection/Star.kt deleted file mode 100644 index 6bf71953b..000000000 --- a/nebulosa-astap/src/main/kotlin/nebulosa/astap/star/detection/Star.kt +++ /dev/null @@ -1,11 +0,0 @@ -package nebulosa.astap.star.detection - -import nebulosa.star.detection.ImageStar - -data class Star( - override val x: Double = 0.0, - override val y: Double = 0.0, - override val hfd: Double = 0.0, - override val snr: Double = 0.0, - override val flux: Double = 0.0, -) : ImageStar diff --git a/nebulosa-astap/src/main/kotlin/nebulosa/astap/stardetector/AstapStarDetector.kt b/nebulosa-astap/src/main/kotlin/nebulosa/astap/stardetector/AstapStarDetector.kt new file mode 100644 index 000000000..aab444e58 --- /dev/null +++ b/nebulosa-astap/src/main/kotlin/nebulosa/astap/stardetector/AstapStarDetector.kt @@ -0,0 +1,82 @@ +package nebulosa.astap.stardetector + +import de.siegmar.fastcsv.reader.CommentStrategy +import de.siegmar.fastcsv.reader.CsvReader +import nebulosa.common.exec.commandLine +import nebulosa.log.loggerFor +import nebulosa.stardetector.StarDetector +import nebulosa.stardetector.StarPoint +import java.io.InputStreamReader +import java.nio.file.Path +import kotlin.io.path.deleteIfExists +import kotlin.io.path.exists +import kotlin.io.path.inputStream +import kotlin.io.path.nameWithoutExtension + +data class AstapStarDetector( + private val executablePath: Path, + private val minSNR: Double = 0.0, +) : StarDetector { + + data class Star( + override val x: Double = 0.0, + override val y: Double = 0.0, + override val hfd: Double = 0.0, + override val snr: Double = 0.0, + override val flux: Double = 0.0, + ) : StarPoint + + override fun detect(input: Path): List { + val cmd = commandLine { + executablePath(executablePath) + workingDirectory(input.parent) + + putArg("-f", input) + putArg("-z", "0") + putArg("-extract", "$minSNR") + } + + try { + cmd.start() + LOG.info("astap exited. code={}", cmd.get()) + } catch (e: Throwable) { + LOG.error("astap failed", e) + return emptyList() + } + + val csvPath = Path.of("${input.parent}", "${input.nameWithoutExtension}.csv") + + if (!csvPath.exists()) return emptyList() + + val detectedStars = ArrayList(1024) + + try { + csvPath.inputStream().use { + for (record in CSV_READER.ofNamedCsvRecord(InputStreamReader(it, Charsets.UTF_8))) { + val star = Star( + record.getField("x").toDouble(), record.getField("y").toDouble(), + record.getField("hfd").toDouble(), record.getField("snr").toDouble(), + record.getField("flux").toDouble(), + ) + + detectedStars.add(star) + } + } + } finally { + csvPath.deleteIfExists() + } + + return detectedStars + } + + companion object { + + @JvmStatic private val LOG = loggerFor() + + @JvmStatic private val CSV_READER = CsvReader.builder() + .fieldSeparator(',') + .quoteCharacter('"') + .commentCharacter('#') + .commentStrategy(CommentStrategy.SKIP) + } +} diff --git a/nebulosa-astrometrynet-jna/build.gradle.kts b/nebulosa-astrometrynet-jna/build.gradle.kts index ef90bdf96..6a6885be8 100644 --- a/nebulosa-astrometrynet-jna/build.gradle.kts +++ b/nebulosa-astrometrynet-jna/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { api(libs.jna) - api(project(":nebulosa-plate-solving")) + api(project(":nebulosa-platesolver")) implementation(project(":nebulosa-log")) testImplementation(project(":nebulosa-test")) } diff --git a/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/Index.kt b/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/Index.kt similarity index 97% rename from nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/Index.kt rename to nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/Index.kt index 10622425c..d21e75484 100644 --- a/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/Index.kt +++ b/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/Index.kt @@ -1,4 +1,4 @@ -package nebulosa.astrometrynet.plate.solving +package nebulosa.astrometrynet.platesolver import com.sun.jna.Pointer import com.sun.jna.Structure diff --git a/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/LibAstrometryNet.kt b/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/LibAstrometryNet.kt similarity index 98% rename from nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/LibAstrometryNet.kt rename to nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/LibAstrometryNet.kt index 001582f6b..661ef9c1b 100644 --- a/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/LibAstrometryNet.kt +++ b/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/LibAstrometryNet.kt @@ -1,10 +1,10 @@ -package nebulosa.astrometrynet.plate.solving +package nebulosa.astrometrynet.platesolver import com.sun.jna.Library import com.sun.jna.Native import com.sun.jna.Pointer import com.sun.jna.ptr.DoubleByReference -import nebulosa.plate.solving.Parity +import nebulosa.platesolver.Parity @Suppress("FunctionName") interface LibAstrometryNet : Library { diff --git a/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/LibAstrometryNetPlateSolver.kt b/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/LibAstrometryNetPlateSolver.kt similarity index 73% rename from nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/LibAstrometryNetPlateSolver.kt rename to nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/LibAstrometryNetPlateSolver.kt index 9bca41290..37919f1cc 100644 --- a/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/LibAstrometryNetPlateSolver.kt +++ b/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/LibAstrometryNetPlateSolver.kt @@ -1,10 +1,10 @@ -package nebulosa.astrometrynet.plate.solving +package nebulosa.astrometrynet.platesolver import nebulosa.common.concurrency.cancel.CancellationToken import nebulosa.image.Image import nebulosa.math.Angle -import nebulosa.plate.solving.PlateSolution -import nebulosa.plate.solving.PlateSolver +import nebulosa.platesolver.PlateSolution +import nebulosa.platesolver.PlateSolver import java.nio.file.Path import java.time.Duration @@ -13,7 +13,7 @@ data class LibAstrometryNetPlateSolver(private val solver: LibAstrometryNet) : P override fun solve( path: Path?, image: Image?, centerRA: Angle, centerDEC: Angle, radius: Angle, - downsampleFactor: Int, timeout: Duration?, + downsampleFactor: Int, timeout: Duration, cancellationToken: CancellationToken, ): PlateSolution { return PlateSolution.NO_SOLUTION diff --git a/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/Matched.kt b/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/Matched.kt similarity index 97% rename from nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/Matched.kt rename to nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/Matched.kt index 6b9798402..bbd65718f 100644 --- a/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/Matched.kt +++ b/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/Matched.kt @@ -1,11 +1,11 @@ -package nebulosa.astrometrynet.plate.solving +package nebulosa.astrometrynet.platesolver import com.sun.jna.Pointer import com.sun.jna.Structure import com.sun.jna.Structure.FieldOrder import com.sun.jna.ptr.DoubleByReference import com.sun.jna.ptr.IntByReference -import nebulosa.astrometrynet.plate.solving.LibAstrometryNet.Companion.DQMAX +import nebulosa.astrometrynet.platesolver.LibAstrometryNet.Companion.DQMAX @FieldOrder( "quadno", "star", "field", "ids", "codeError", "quadpix", "quadpixOrig", "quadxyz", diff --git a/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/Sip.kt b/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/Sip.kt similarity index 94% rename from nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/Sip.kt rename to nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/Sip.kt index ca77c955c..d011dd71c 100644 --- a/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/Sip.kt +++ b/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/Sip.kt @@ -1,4 +1,4 @@ -package nebulosa.astrometrynet.plate.solving +package nebulosa.astrometrynet.platesolver import com.sun.jna.Structure import com.sun.jna.Structure.FieldOrder diff --git a/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/Solver.kt b/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/Solver.kt similarity index 99% rename from nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/Solver.kt rename to nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/Solver.kt index 274aebdcf..7c3c66cd8 100644 --- a/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/Solver.kt +++ b/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/Solver.kt @@ -1,4 +1,4 @@ -package nebulosa.astrometrynet.plate.solving +package nebulosa.astrometrynet.platesolver import com.sun.jna.Callback import com.sun.jna.Pointer diff --git a/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/StarXY.kt b/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/StarXY.kt similarity index 94% rename from nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/StarXY.kt rename to nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/StarXY.kt index 9d64004fa..b527eeb01 100644 --- a/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/StarXY.kt +++ b/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/StarXY.kt @@ -1,4 +1,4 @@ -package nebulosa.astrometrynet.plate.solving +package nebulosa.astrometrynet.platesolver import com.sun.jna.Pointer import com.sun.jna.Structure diff --git a/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/Tan.kt b/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/Tan.kt similarity index 94% rename from nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/Tan.kt rename to nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/Tan.kt index 70a6f2e00..3be2c5ced 100644 --- a/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/Tan.kt +++ b/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/Tan.kt @@ -1,4 +1,4 @@ -package nebulosa.astrometrynet.plate.solving +package nebulosa.astrometrynet.platesolver import com.sun.jna.Structure import com.sun.jna.Structure.FieldOrder diff --git a/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/XYList.kt b/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/XYList.kt similarity index 96% rename from nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/XYList.kt rename to nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/XYList.kt index 6e75d06c0..a6e55a0e8 100644 --- a/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/plate/solving/XYList.kt +++ b/nebulosa-astrometrynet-jna/src/main/kotlin/nebulosa/astrometrynet/platesolver/XYList.kt @@ -1,4 +1,4 @@ -package nebulosa.astrometrynet.plate.solving +package nebulosa.astrometrynet.platesolver import com.sun.jna.Pointer import com.sun.jna.Structure diff --git a/nebulosa-astrometrynet-jna/src/test/kotlin/LibAstrometryNetTest.kt b/nebulosa-astrometrynet-jna/src/test/kotlin/LibAstrometryNetTest.kt index c3048c203..c382f5ae8 100644 --- a/nebulosa-astrometrynet-jna/src/test/kotlin/LibAstrometryNetTest.kt +++ b/nebulosa-astrometrynet-jna/src/test/kotlin/LibAstrometryNetTest.kt @@ -5,7 +5,7 @@ import io.kotest.matchers.booleans.shouldBeTrue import io.kotest.matchers.ints.shouldBeExactly import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldNotBe -import nebulosa.astrometrynet.plate.solving.* +import nebulosa.astrometrynet.platesolver.* import nebulosa.test.NonGitHubOnlyCondition import java.nio.file.Path import kotlin.io.path.listDirectoryEntries diff --git a/nebulosa-astrometrynet/build.gradle.kts b/nebulosa-astrometrynet/build.gradle.kts index 646e16e67..ea387d9c4 100644 --- a/nebulosa-astrometrynet/build.gradle.kts +++ b/nebulosa-astrometrynet/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { api(project(":nebulosa-math")) api(project(":nebulosa-common")) - api(project(":nebulosa-plate-solving")) + api(project(":nebulosa-platesolver")) api(project(":nebulosa-retrofit")) implementation(project(":nebulosa-log")) testImplementation(project(":nebulosa-test")) diff --git a/nebulosa-astrometrynet/src/main/kotlin/nebulosa/astrometrynet/plate/solving/LocalAstrometryNetPlateSolver.kt b/nebulosa-astrometrynet/src/main/kotlin/nebulosa/astrometrynet/plate/solving/LocalAstrometryNetPlateSolver.kt deleted file mode 100644 index 690922646..000000000 --- a/nebulosa-astrometrynet/src/main/kotlin/nebulosa/astrometrynet/plate/solving/LocalAstrometryNetPlateSolver.kt +++ /dev/null @@ -1,133 +0,0 @@ -package nebulosa.astrometrynet.plate.solving - -import nebulosa.common.concurrency.cancel.CancellationToken -import nebulosa.common.process.ProcessExecutor -import nebulosa.image.Image -import nebulosa.log.loggerFor -import nebulosa.math.* -import nebulosa.plate.solving.PlateSolution -import nebulosa.plate.solving.PlateSolver -import java.nio.file.Files -import java.nio.file.Path -import java.time.Duration -import java.util.* -import kotlin.concurrent.thread -import kotlin.io.path.deleteRecursively - -/** - * @see README - */ -class LocalAstrometryNetPlateSolver(path: Path) : PlateSolver { - - private val executor = ProcessExecutor(path) - - override fun solve( - path: Path?, image: Image?, - centerRA: Angle, centerDEC: Angle, radius: Angle, - downsampleFactor: Int, timeout: Duration?, - cancellationToken: CancellationToken, - ): PlateSolution { - requireNotNull(path) { "path is required" } - - val arguments = mutableMapOf() - - arguments["--out"] = UUID.randomUUID().toString() - arguments["--overwrite"] = null - - val outFolder = Files.createTempDirectory("localplatesolver") - arguments["--dir"] = outFolder - - arguments["--cpulimit"] = timeout?.takeIf { it.toSeconds() > 0 }?.toSeconds() ?: 300 - arguments["--scale-units"] = "degwidth" - arguments["--guess-scale"] = null - arguments["--crpix-center"] = null - arguments["--downsample"] = downsampleFactor - arguments["--no-verify"] = null - arguments["--no-plots"] = null - // args["--resort"] = null - - if (radius.toDegrees >= 0.1 && centerRA.isFinite() && centerDEC.isFinite()) { - arguments["--ra"] = centerRA.toDegrees - arguments["--dec"] = centerDEC.toDegrees - arguments["--radius"] = radius.toDegrees - } - - arguments["$path"] = null - - val process = executor.execute(arguments, Duration.ZERO, path.parent, cancellationToken) - - val buffer = process.inputReader() - - var solution = PlateSolution(false, 0.0, 0.0, 0.0, 0.0) - - val parseThread = thread { - for (line in buffer.lines()) { - solution = solution - .parseFieldCenter(line) - .parseFieldRotation(line) - .parsePixelScale(line) - .parseFieldSize(line) - } - - // Populate WCS headers from calibration info. - // TODO: calibration = calibration.copy() - // TODO: Mark calibration as solved. - - LOG.info("astrometry.net solved. calibration={}", solution) - } - - try { - process.waitFor() - LOG.info("astrometry.net exited. code={}", process.exitValue()) - } catch (e: InterruptedException) { - parseThread.interrupt() - process.destroyForcibly() - } finally { - outFolder.deleteRecursively() - } - - return solution - } - - companion object { - - private const val NUMBER_REGEX = "([\\d.+-]+)" - - @JvmStatic private val LOG = loggerFor() - @JvmStatic private val FIELD_CENTER_REGEX = Regex(".*Field center: \\(RA,Dec\\) = \\($NUMBER_REGEX, $NUMBER_REGEX\\).*") - @JvmStatic private val FIELD_SIZE_REGEX = Regex(".*Field size: $NUMBER_REGEX x $NUMBER_REGEX arcminutes.*") - @JvmStatic private val FIELD_ROTATION_REGEX = Regex(".*Field rotation angle: up is $NUMBER_REGEX degrees.*") - @JvmStatic private val PIXEL_SCALE_REGEX = Regex(".*pixel scale $NUMBER_REGEX arcsec/pix.*") - - @JvmStatic - private fun PlateSolution.parseFieldCenter(line: String): PlateSolution { - return FIELD_CENTER_REGEX.matchEntire(line) - ?.let { copy(rightAscension = it.groupValues[1].toDouble().deg, declination = it.groupValues[2].toDouble().deg) } - ?: this - } - - @JvmStatic - private fun PlateSolution.parseFieldSize(line: String): PlateSolution { - return FIELD_SIZE_REGEX.matchEntire(line) - ?.let { - val width = it.groupValues[1].toDouble().arcmin - val height = it.groupValues[2].toDouble().arcmin - copy(width = width, height = height) - } ?: this - } - - @JvmStatic - private fun PlateSolution.parseFieldRotation(line: String): PlateSolution { - return FIELD_ROTATION_REGEX.matchEntire(line) - ?.let { copy(orientation = it.groupValues[1].toDouble().deg) } - ?: this - } - - @JvmStatic - private fun PlateSolution.parsePixelScale(line: String): PlateSolution { - return PIXEL_SCALE_REGEX.matchEntire(line) - ?.let { copy(scale = it.groupValues[1].toDouble().arcsec) } - ?: this - } - } -} diff --git a/nebulosa-astrometrynet/src/main/kotlin/nebulosa/astrometrynet/platesolver/LocalAstrometryNetPlateSolver.kt b/nebulosa-astrometrynet/src/main/kotlin/nebulosa/astrometrynet/platesolver/LocalAstrometryNetPlateSolver.kt new file mode 100644 index 000000000..2cdda406a --- /dev/null +++ b/nebulosa-astrometrynet/src/main/kotlin/nebulosa/astrometrynet/platesolver/LocalAstrometryNetPlateSolver.kt @@ -0,0 +1,137 @@ +package nebulosa.astrometrynet.platesolver + +import nebulosa.common.concurrency.cancel.CancellationToken +import nebulosa.common.exec.CommandLineListener +import nebulosa.common.exec.commandLine +import nebulosa.image.Image +import nebulosa.log.loggerFor +import nebulosa.math.* +import nebulosa.platesolver.PlateSolution +import nebulosa.platesolver.PlateSolver +import java.nio.file.Files +import java.nio.file.Path +import java.time.Duration +import java.util.* +import java.util.function.Supplier +import kotlin.io.path.deleteRecursively + +/** + * @see README + */ +data class LocalAstrometryNetPlateSolver(private val executablePath: Path) : PlateSolver { + + override fun solve( + path: Path?, image: Image?, + centerRA: Angle, centerDEC: Angle, radius: Angle, + downsampleFactor: Int, timeout: Duration, + cancellationToken: CancellationToken, + ): PlateSolution { + requireNotNull(path) { "path is required" } + + val outFolder = Files.createTempDirectory("localplatesolver") + + val cmd = commandLine { + executablePath(executablePath) + workingDirectory(path.parent) + + putArg("--out", UUID.randomUUID().toString()) + putArg("--overwrite") + + putArg("--dir", outFolder) + + putArg("--cpulimit", timeout.takeIf { it.toSeconds() > 0 }?.toSeconds() ?: 300) + putArg("--scale-units", "degwidth") + putArg("--guess-scale") + putArg("--crpix-center") + putArg("--downsample", downsampleFactor) + putArg("--no-verify") + putArg("--no-plots") + // putArg("--resort") + + if (radius.toDegrees >= 0.1 && centerRA.isFinite() && centerDEC.isFinite()) { + putArg("--ra", centerRA.toDegrees) + putArg("--dec", centerDEC.toDegrees) + putArg("--radius", radius.toDegrees) + } + + putArg("$path") + } + + val solution = PlateSolutionLineReader() + + try { + cancellationToken.listen(cmd) + cmd.registerCommandLineListener(solution) + cmd.start() + LOG.info("astrometry.net exited. code={}", cmd.get()) + return solution.get() + } catch (e: Throwable) { + LOG.error("astronomy.net failed.", e) + return PlateSolution.NO_SOLUTION + } finally { + cancellationToken.unlisten(cmd) + outFolder.deleteRecursively() + } + } + + private class PlateSolutionLineReader : CommandLineListener.OnLineRead, Supplier { + + @Volatile private var fieldCenter: DoubleArray? = null + @Volatile private var fieldRotation: Angle = 0.0 + @Volatile private var pixelScale: Angle = 0.0 + @Volatile private var fieldSize: DoubleArray? = null + + override fun onLineRead(line: String) { + fieldCenter(line)?.also { fieldCenter = it } + ?: fieldRotation(line)?.also { fieldRotation = it } + ?: pixelScale(line)?.also { pixelScale = it } + ?: fieldSize(line)?.also { fieldSize = it } + } + + override fun get(): PlateSolution { + val (rightAscension, declination) = fieldCenter!! + val (width, height) = fieldSize!! + + return PlateSolution(true, fieldRotation, pixelScale, rightAscension, declination, width, height) + } + + companion object { + + private const val NUMBER_REGEX = "([\\d.+-]+)" + + @JvmStatic private val FIELD_CENTER_REGEX = Regex(".*Field center: \\(RA,Dec\\) = \\($NUMBER_REGEX, $NUMBER_REGEX\\).*") + @JvmStatic private val FIELD_SIZE_REGEX = Regex(".*Field size: $NUMBER_REGEX x $NUMBER_REGEX arcminutes.*") + @JvmStatic private val FIELD_ROTATION_REGEX = Regex(".*Field rotation angle: up is $NUMBER_REGEX degrees.*") + @JvmStatic private val PIXEL_SCALE_REGEX = Regex(".*pixel scale $NUMBER_REGEX arcsec/pix.*") + + @JvmStatic + private fun fieldCenter(line: String): DoubleArray? { + return FIELD_CENTER_REGEX.matchEntire(line) + ?.let { doubleArrayOf(it.groupValues[1].toDouble().deg, it.groupValues[2].toDouble().deg) } + } + + @JvmStatic + private fun fieldSize(line: String): DoubleArray? { + return FIELD_SIZE_REGEX.matchEntire(line) + ?.let { doubleArrayOf(it.groupValues[1].toDouble().arcmin, it.groupValues[2].toDouble().arcmin) } + } + + @JvmStatic + private fun fieldRotation(line: String): Angle? { + return FIELD_ROTATION_REGEX.matchEntire(line) + ?.let { it.groupValues[1].toDouble().deg } + } + + @JvmStatic + private fun pixelScale(line: String): Angle? { + return PIXEL_SCALE_REGEX.matchEntire(line) + ?.let { it.groupValues[1].toDouble().arcsec } + } + } + } + + companion object { + + @JvmStatic private val LOG = loggerFor() + } +} diff --git a/nebulosa-astrometrynet/src/main/kotlin/nebulosa/astrometrynet/plate/solving/NovaAstrometryNetPlateSolver.kt b/nebulosa-astrometrynet/src/main/kotlin/nebulosa/astrometrynet/platesolver/NovaAstrometryNetPlateSolver.kt similarity index 77% rename from nebulosa-astrometrynet/src/main/kotlin/nebulosa/astrometrynet/plate/solving/NovaAstrometryNetPlateSolver.kt rename to nebulosa-astrometrynet/src/main/kotlin/nebulosa/astrometrynet/platesolver/NovaAstrometryNetPlateSolver.kt index ec6fd1671..0719e5d0b 100644 --- a/nebulosa-astrometrynet/src/main/kotlin/nebulosa/astrometrynet/plate/solving/NovaAstrometryNetPlateSolver.kt +++ b/nebulosa-astrometrynet/src/main/kotlin/nebulosa/astrometrynet/platesolver/NovaAstrometryNetPlateSolver.kt @@ -1,4 +1,4 @@ -package nebulosa.astrometrynet.plate.solving +package nebulosa.astrometrynet.platesolver import nebulosa.astrometrynet.nova.NovaAstrometryNetService import nebulosa.astrometrynet.nova.Session @@ -9,9 +9,9 @@ import nebulosa.image.Image import nebulosa.log.loggerFor import nebulosa.math.Angle import nebulosa.math.toDegrees -import nebulosa.plate.solving.PlateSolution -import nebulosa.plate.solving.PlateSolver -import nebulosa.plate.solving.PlateSolvingException +import nebulosa.platesolver.PlateSolution +import nebulosa.platesolver.PlateSolver +import nebulosa.platesolver.PlateSolverException import java.nio.file.Path import java.time.Duration @@ -29,10 +29,10 @@ data class NovaAstrometryNetPlateSolver( if (session == null || lastSessionTime == 0L || currentTime - lastSessionTime >= SESSION_EXPIRATION_TIME) { val session = service.login(apiKey.ifBlank { ANONYMOUS_API_KEY }).execute().body() - ?: throw PlateSolvingException("failed to renew session key") + ?: throw PlateSolverException("failed to renew session key") if (session.status != "success") { - throw PlateSolvingException("failed to renew session key: ${session.errorMessage}") + throw PlateSolverException("failed to renew session key: ${session.errorMessage}") } this.session = session @@ -43,7 +43,7 @@ data class NovaAstrometryNetPlateSolver( override fun solve( path: Path?, image: Image?, centerRA: Angle, centerDEC: Angle, radius: Angle, - downsampleFactor: Int, timeout: Duration?, + downsampleFactor: Int, timeout: Duration, cancellationToken: CancellationToken, ): PlateSolution { renewSession() @@ -61,27 +61,27 @@ data class NovaAstrometryNetPlateSolver( val call = path?.let { service.uploadFromFile(it, upload) } ?: image?.let { service.uploadFromImage(it, upload) } - ?: throw PlateSolvingException("failed to submit the file") + ?: throw PlateSolverException("failed to submit the file") val submission = call.execute().body()!! if (submission.status != "success") { - throw PlateSolvingException(submission.errorMessage) + throw PlateSolverException(submission.errorMessage) } - var timeLeft = timeout?.takeIf { it.toSeconds() > 0 }?.toMillis() ?: 300000L + var timeLeft = timeout.takeIf { it.toSeconds() > 0 }?.toMillis() ?: 300000L while (timeLeft >= 0L && !cancellationToken.isCancelled) { val startTime = System.currentTimeMillis() val status = service.submissionStatus(submission.subId).execute().body() - ?: throw PlateSolvingException("failed to retrieve submission status") + ?: throw PlateSolverException("failed to retrieve submission status") if (status.solved && !cancellationToken.isCancelled) { LOG.info("retrieving WCS from job. id={}", status.jobs[0]) val body = service.wcs(status.jobs[0]).execute().body() - ?: throw PlateSolvingException("failed to retrieve WCS file") + ?: throw PlateSolverException("failed to retrieve WCS file") val header = FitsHeader.from(body) val calibration = PlateSolution.from(header) @@ -98,7 +98,7 @@ data class NovaAstrometryNetPlateSolver( } } - throw PlateSolvingException("the plate solving took a long time and finished") + throw PlateSolverException("the plate solving took a long time and finished") } companion object { diff --git a/nebulosa-astrometrynet/src/test/kotlin/NovaAstrometryNetPlateSolverTest.kt b/nebulosa-astrometrynet/src/test/kotlin/NovaAstrometryNetPlateSolverTest.kt index f35615b7f..115d16d36 100644 --- a/nebulosa-astrometrynet/src/test/kotlin/NovaAstrometryNetPlateSolverTest.kt +++ b/nebulosa-astrometrynet/src/test/kotlin/NovaAstrometryNetPlateSolverTest.kt @@ -2,7 +2,7 @@ import io.kotest.core.annotation.Ignored import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.doubles.shouldBeExactly import nebulosa.astrometrynet.nova.NovaAstrometryNetService -import nebulosa.astrometrynet.plate.solving.NovaAstrometryNetPlateSolver +import nebulosa.astrometrynet.platesolver.NovaAstrometryNetPlateSolver import nebulosa.math.deg import nebulosa.math.toArcsec import nebulosa.math.toDegrees diff --git a/nebulosa-common/src/main/kotlin/nebulosa/common/concurrency/latch/CountUpDownLatch.kt b/nebulosa-common/src/main/kotlin/nebulosa/common/concurrency/latch/CountUpDownLatch.kt index ffdc616fa..508135ae0 100644 --- a/nebulosa-common/src/main/kotlin/nebulosa/common/concurrency/latch/CountUpDownLatch.kt +++ b/nebulosa-common/src/main/kotlin/nebulosa/common/concurrency/latch/CountUpDownLatch.kt @@ -48,15 +48,18 @@ class CountUpDownLatch(initialCount: Int = 0) : Supplier, CancellationL } fun await(n: Int = 0) { - if (n >= 0) sync.acquireSharedInterruptibly(n) + require(n >= 0) { "n must be greater or equal to 0" } + sync.acquireSharedInterruptibly(n) } fun await(timeout: Long, unit: TimeUnit, n: Int = 0): Boolean { - return n >= 0 && sync.tryAcquireSharedNanos(n, unit.toNanos(timeout)) + require(n >= 0) { "n must be greater or equal to 0" } + return sync.tryAcquireSharedNanos(n, unit.toNanos(timeout)) } fun await(timeout: Duration, n: Int = 0): Boolean { - return n >= 0 && sync.tryAcquireSharedNanos(n, timeout.toNanos()) + require(n >= 0) { "n must be greater or equal to 0" } + return sync.tryAcquireSharedNanos(n, timeout.toNanos()) } override fun onCancel(source: CancellationSource) { diff --git a/nebulosa-common/src/main/kotlin/nebulosa/common/exec/CommandLine.kt b/nebulosa-common/src/main/kotlin/nebulosa/common/exec/CommandLine.kt new file mode 100644 index 000000000..73a923280 --- /dev/null +++ b/nebulosa-common/src/main/kotlin/nebulosa/common/exec/CommandLine.kt @@ -0,0 +1,253 @@ +package nebulosa.common.exec + +import nebulosa.common.concurrency.cancel.CancellationListener +import nebulosa.common.concurrency.cancel.CancellationSource +import nebulosa.log.loggerFor +import java.io.InputStream +import java.io.OutputStream +import java.io.PrintStream +import java.nio.file.Path +import java.time.Duration +import java.util.concurrent.CompletableFuture +import java.util.concurrent.TimeUnit +import java.util.function.Supplier + +inline fun commandLine(action: CommandLine.Builder.() -> Unit): CommandLine { + return CommandLine.Builder().also(action).get() +} + +data class CommandLine internal constructor( + private val builder: ProcessBuilder, + private val listeners: LinkedHashSet, +) : CompletableFuture(), CancellationListener { + + @Volatile private lateinit var process: Process + @Volatile private var waiter: ProcessWaiter? = null + @Volatile private var inputReader: StreamLineReader? = null + @Volatile private var errorReader: StreamLineReader? = null + + val command: List + get() = builder.command() + + val pid + get() = process.pid() + + val exitCode + get() = process.takeIf { !it.isAlive }?.exitValue() ?: -1 + + val isRunning + get() = ::process.isInitialized && process.isAlive + + val writer = PrintStream(object : OutputStream() { + + override fun write(b: Int) { + process.outputStream?.write(b) + } + + override fun write(b: ByteArray) { + process.outputStream?.write(b) + } + + override fun write(b: ByteArray, off: Int, len: Int) { + process.outputStream?.write(b, off, len) + } + + override fun flush() { + process.outputStream?.flush() + } + + override fun close() { + process.outputStream?.close() + } + }, true) + + fun registerCommandLineListener(listener: CommandLineListener) { + synchronized(listeners) { listeners.add(listener) } + } + + fun unregisterCommandLineListener(listener: CommandLineListener) { + synchronized(listeners) { listeners.remove(listener) } + } + + @Synchronized + fun start(timeout: Duration = Duration.ZERO): CommandLine { + require(!::process.isInitialized) { "process has already executed" } + + process = try { + builder.start() + } catch (e: Throwable) { + completeExceptionally(e) + listeners.forEach { it.onExit(-1, e) } + return this + } + + inputReader = StreamLineReader(process.inputStream, false) + inputReader!!.start() + + errorReader = StreamLineReader(process.errorStream, true) + errorReader!!.start() + + waiter = ProcessWaiter(process, timeout.toMillis()) + waiter!!.start() + + return this + } + + @Synchronized + fun stop() { + waiter?.interrupt() + waiter = null + + inputReader?.interrupt() + inputReader = null + + errorReader?.interrupt() + errorReader = null + + process.destroyForcibly() + process.waitFor() + + listeners.clear() + } + + fun get(timeout: Duration): Int { + return get(timeout.toNanos(), TimeUnit.NANOSECONDS) + } + + override fun onCancel(source: CancellationSource) { + stop() + } + + private inner class ProcessWaiter( + private val process: Process, + private val timeout: Long, + ) : Thread("Command Line Process Waiter") { + + init { + isDaemon = true + } + + override fun run() { + try { + if (timeout > 0L) { + process.waitFor(timeout, TimeUnit.MILLISECONDS) + } else { + process.waitFor() + } + + inputReader?.waitFor() + errorReader?.waitFor() + } catch (ignored: InterruptedException) { + } finally { + if (process.isAlive) { + process.destroyForcibly() + process.waitFor() + } + + with(process.exitValue()) { + complete(this) + synchronized(listeners) { listeners.forEach { it.onExit(this, null) } } + } + + waiter = null + inputReader = null + errorReader = null + } + } + } + + private inner class StreamLineReader( + stream: InputStream, + private val isError: Boolean, + ) : Thread("Command Line ${if (isError) "Error" else "Input"} Stream Line Reader") { + + private val reader = stream.bufferedReader() + private val completable = CompletableFuture() + + init { + isDaemon = true + } + + override fun run() { + try { + while (true) { + val line = reader.readLine() ?: break + + synchronized(listeners) { + listeners.forEach { it.onLineRead(line) } + } + } + } catch (e: InterruptedException) { + LOG.warn("command line interrupted") + } catch (e: Throwable) { + LOG.warn("command line exited: {}", e.message) + } finally { + completable.complete(Unit) + reader.close() + } + } + + fun waitFor() { + return completable.join() + } + } + + class Builder : Supplier { + + private val builder = ProcessBuilder() + private val environment by lazy { builder.environment() } + private val arguments = mutableMapOf() + private var executable = "" + private val listeners = LinkedHashSet(1) + + fun executablePath(path: Path) = executable("$path") + + fun executable(executable: String) = run { this.executable = executable } + + fun env(key: String) = environment[key] + + fun putEnv(key: String, value: String) = environment.put(key, value) + + fun removeEnv(key: String) = environment.remove(key) + + fun hasEnv(key: String) = key in environment + + fun arg(name: String) = arguments[name] + + fun putArg(name: String, value: Any) = arguments.put(name, value) + + fun putArg(name: String) = arguments.put(name, null) + + fun removeArg(name: String) = arguments.remove(name) + + fun hasArg(name: String) = name in arguments + + fun workingDirectory(path: Path): Unit = run { builder.directory(path.toFile()) } + + fun registerCommandLineListener(listener: CommandLineListener) = listeners.add(listener) + + fun unregisterCommandLineListener(listener: CommandLineListener) = listeners.remove(listener) + + override fun get(): CommandLine { + val args = ArrayList(1 + arguments.size * 2) + + require(executable.isNotBlank()) { "executable must not be blank" } + + args.add(executable) + + for ((key, value) in arguments) { + args.add(key) + value?.toString()?.also(args::add) + } + + builder.command(args) + + return CommandLine(builder, listeners) + } + } + + companion object { + + @JvmStatic private val LOG = loggerFor() + } +} diff --git a/nebulosa-common/src/main/kotlin/nebulosa/common/exec/CommandLineListener.kt b/nebulosa-common/src/main/kotlin/nebulosa/common/exec/CommandLineListener.kt new file mode 100644 index 000000000..9b32a8827 --- /dev/null +++ b/nebulosa-common/src/main/kotlin/nebulosa/common/exec/CommandLineListener.kt @@ -0,0 +1,18 @@ +package nebulosa.common.exec + +interface CommandLineListener { + + fun onLineRead(line: String) = Unit + + fun onExit(exitCode: Int, exception: Throwable?) = Unit + + fun interface OnLineRead : CommandLineListener { + + override fun onLineRead(line: String) + } + + fun interface OnExit : CommandLineListener { + + override fun onExit(exitCode: Int, exception: Throwable?) + } +} diff --git a/nebulosa-common/src/main/kotlin/nebulosa/common/process/ProcessExecutor.kt b/nebulosa-common/src/main/kotlin/nebulosa/common/process/ProcessExecutor.kt deleted file mode 100644 index ec0e8d71c..000000000 --- a/nebulosa-common/src/main/kotlin/nebulosa/common/process/ProcessExecutor.kt +++ /dev/null @@ -1,46 +0,0 @@ -package nebulosa.common.process - -import nebulosa.common.concurrency.cancel.CancellationToken -import nebulosa.log.loggerFor -import java.nio.file.Path -import java.time.Duration -import java.util.concurrent.TimeUnit - -open class ProcessExecutor(private val path: Path) { - - fun execute( - arguments: Map, - timeout: Duration? = null, - workingDir: Path? = null, - cancellationToken: CancellationToken = CancellationToken.NONE, - ): Process { - val args = ArrayList(arguments.size * 2) - - for ((key, value) in arguments) { - args.add(key) - if (value != null) args.add("$value") - } - - args.add(0, "$path") - - val process = ProcessBuilder(args) - .also { if (workingDir != null) it.directory(workingDir.toFile()) } - .start()!! - - LOG.info("executing process. pid={}, args={}", process.pid(), args) - - // TODO: READ OUTPUT STREAM LINE TO CALLBACK - - cancellationToken.listen { process.destroyForcibly() } - - if (timeout == null || timeout.isNegative) process.waitFor() - else process.waitFor(timeout.seconds, TimeUnit.SECONDS) - - return process - } - - companion object { - - @JvmStatic private val LOG = loggerFor() - } -} diff --git a/nebulosa-common/src/test/kotlin/CommandLineTest.kt b/nebulosa-common/src/test/kotlin/CommandLineTest.kt new file mode 100644 index 000000000..89cea34bf --- /dev/null +++ b/nebulosa-common/src/test/kotlin/CommandLineTest.kt @@ -0,0 +1,72 @@ +import io.kotest.core.annotation.EnabledIf +import io.kotest.core.spec.style.StringSpec +import io.kotest.matchers.collections.shouldContain +import io.kotest.matchers.collections.shouldNotBeEmpty +import io.kotest.matchers.ints.shouldBeExactly +import io.kotest.matchers.ints.shouldNotBeExactly +import io.kotest.matchers.longs.shouldBeGreaterThanOrEqual +import io.kotest.matchers.longs.shouldBeLessThan +import nebulosa.common.exec.CommandLineListener +import nebulosa.common.exec.commandLine +import nebulosa.test.NonGitHubOnlyCondition +import java.nio.file.Path +import java.time.Duration +import kotlin.concurrent.thread +import kotlin.system.measureTimeMillis + +@EnabledIf(NonGitHubOnlyCondition::class) +class CommandLineTest : StringSpec() { + + init { + "sleep" { + val cmd = commandLine { + executable("sleep") + putArg("2") + } + + measureTimeMillis { + cmd.start().get() shouldBeExactly 0 + } shouldBeGreaterThanOrEqual 2000 + } + "sleep with timeout" { + val cmd = commandLine { + executable("sleep") + putArg("10") + } + + measureTimeMillis { + cmd.start(Duration.ofSeconds(2)).get() shouldNotBeExactly 0 + } shouldBeGreaterThanOrEqual 2000 + } + "kill sleep" { + val cmd = commandLine { + executable("sleep") + putArg("10") + } + + thread { Thread.sleep(2000); cmd.stop() } + + measureTimeMillis { + cmd.start().get() shouldNotBeExactly 0 + } shouldBeGreaterThanOrEqual 2000 shouldBeLessThan 10000 + } + "ls" { + val lineReadListener = object : CommandLineListener.OnLineRead, ArrayList(64) { + + override fun onLineRead(line: String) { + add(line) + } + } + + val cmd = commandLine { + executable("ls") + workingDirectory(Path.of("../")) + registerCommandLineListener(lineReadListener) + } + + cmd.start().get() shouldBeExactly 0 + lineReadListener.shouldNotBeEmpty() + lineReadListener.shouldContain("nebulosa-image") + } + } +} diff --git a/nebulosa-fits/src/main/kotlin/nebulosa/fits/FitsHeader.kt b/nebulosa-fits/src/main/kotlin/nebulosa/fits/FitsHeader.kt index 9e0b83afd..6be7004d0 100644 --- a/nebulosa-fits/src/main/kotlin/nebulosa/fits/FitsHeader.kt +++ b/nebulosa-fits/src/main/kotlin/nebulosa/fits/FitsHeader.kt @@ -7,6 +7,7 @@ import nebulosa.io.SeekableSource import nebulosa.io.source import nebulosa.log.loggerFor import java.util.* +import java.util.function.Predicate open class FitsHeader : AbstractHeader { @@ -54,15 +55,6 @@ open class FitsHeader : AbstractHeader { FitsHeaderCard.create(key, value, comment).also(::add) } - override fun add(card: HeaderCard) { - if (!card.isKeyValuePair) cards.add(card) - else { - val index = cards.indexOfFirst { it.key == card.key } - if (index >= 0) cards[index] = card - else cards.add(card) - } - } - open class ReadOnly : FitsHeader { constructor() : super(LinkedList()) @@ -87,10 +79,20 @@ open class FitsHeader : AbstractHeader { final override fun add(key: String, value: String, comment: String) = Unit - final override fun add(card: HeaderCard) = Unit + final override fun add(element: HeaderCard) = false final override fun addAll(cards: Iterable) = Unit + final override fun addAll(elements: Collection) = false + + final override fun removeIf(filter: Predicate) = false + + final override fun remove(element: HeaderCard) = false + + final override fun removeAll(elements: Collection) = false + + final override fun retainAll(elements: Collection) = false + final override fun delete(key: HeaderKey) = false final override fun delete(key: String) = false diff --git a/nebulosa-guiding-phd2/src/main/kotlin/nebulosa/guiding/phd2/PHD2Guider.kt b/nebulosa-guiding-phd2/src/main/kotlin/nebulosa/guiding/phd2/PHD2Guider.kt index 81c33ab44..566bffd75 100644 --- a/nebulosa-guiding-phd2/src/main/kotlin/nebulosa/guiding/phd2/PHD2Guider.kt +++ b/nebulosa-guiding-phd2/src/main/kotlin/nebulosa/guiding/phd2/PHD2Guider.kt @@ -3,6 +3,7 @@ package nebulosa.guiding.phd2 import nebulosa.common.concurrency.cancel.CancellationToken import nebulosa.common.concurrency.latch.CountUpDownLatch import nebulosa.guiding.* +import nebulosa.log.debug import nebulosa.log.loggerFor import nebulosa.math.arcsec import nebulosa.math.toArcsec @@ -280,7 +281,7 @@ class PHD2Guider(private val client: PHD2Client) : Guider, PHD2EventListener { } override fun onEventReceived(event: PHD2Event) { - LOG.info("event received: {}", event) + LOG.debug { "event received: $event" } when (event) { is AlertEvent -> Unit @@ -312,6 +313,7 @@ class PHD2Guider(private val client: PHD2Client) : Guider, PHD2EventListener { dither[0] = event.dx dither[1] = event.dy fireMessage { "dithered. dx=${event.dx} dy=${event.dy}" } + listeners.forEach { it.onDithered(event.dx, event.dy) } } GuidingStoppedEvent -> fireMessage { "guiding stopped" } LockPositionLostEvent -> { @@ -330,11 +332,15 @@ class PHD2Guider(private val client: PHD2Client) : Guider, PHD2EventListener { LoopingExposuresStoppedEvent -> state = GuideState.STOPPED PausedEvent -> state = GuideState.PAUSED ResumedEvent -> Unit - SettleBeginEvent -> fireMessage { "settling started" } + SettleBeginEvent -> { + fireMessage { "settling started" } + listeners.forEach { it.onSettleStarted() } + } is SettleDoneEvent -> { settling.reset() if (event.error.isEmpty()) fireMessage { "settling done" } else fireMessage { event.error } + listeners.forEach { it.onSettleDone(event.error.ifBlank { null }) } } is SettlingEvent -> { settling.countUp() @@ -361,7 +367,7 @@ class PHD2Guider(private val client: PHD2Client) : Guider, PHD2EventListener { if (result != null) { if (command is GetPixelScale) { pixelScale = result as Double - LOG.info("pixel scale = {}", pixelScale) + LOG.debug { "pixel scale = $pixelScale" } listeners.forEach { it.onStateChanged(state, pixelScale) } } } else if (error != null) { diff --git a/nebulosa-guiding/src/main/kotlin/nebulosa/guiding/GuiderListener.kt b/nebulosa-guiding/src/main/kotlin/nebulosa/guiding/GuiderListener.kt index f58744e9d..2354c6efe 100644 --- a/nebulosa-guiding/src/main/kotlin/nebulosa/guiding/GuiderListener.kt +++ b/nebulosa-guiding/src/main/kotlin/nebulosa/guiding/GuiderListener.kt @@ -8,5 +8,9 @@ interface GuiderListener { fun onDithered(dx: Double, dy: Double) = Unit + fun onSettleStarted() = Unit + + fun onSettleDone(error: String?) = Unit + fun onMessageReceived(message: String) = Unit } diff --git a/nebulosa-image-format/src/main/kotlin/nebulosa/image/format/AbstractHeader.kt b/nebulosa-image-format/src/main/kotlin/nebulosa/image/format/AbstractHeader.kt index 3bf66aa24..2181ae75a 100644 --- a/nebulosa-image-format/src/main/kotlin/nebulosa/image/format/AbstractHeader.kt +++ b/nebulosa-image-format/src/main/kotlin/nebulosa/image/format/AbstractHeader.kt @@ -3,8 +3,7 @@ package nebulosa.image.format import java.io.Serializable import java.util.* -abstract class AbstractHeader protected constructor(@JvmField protected val cards: LinkedList) : - Header, Collection by cards, Serializable { +abstract class AbstractHeader protected constructor(@JvmField protected val cards: LinkedList) : Header, Serializable { constructor() : this(LinkedList()) @@ -12,10 +11,56 @@ abstract class AbstractHeader protected constructor(@JvmField protected val card abstract fun readOnly(): Header + override fun add(element: HeaderCard): Boolean { + return if (!element.isKeyValuePair) { + cards.add(element) + } else { + val index = cards.indexOfFirst { it.key == element.key } + + if (index >= 0) { + cards[index] = element + true + } else { + cards.add(element) + } + } + } + + override val size + get() = cards.size + + override fun contains(element: HeaderCard): Boolean { + return element in cards + } + + override fun containsAll(elements: Collection): Boolean { + return cards.containsAll(elements) + } + + override fun isEmpty(): Boolean { + return cards.isEmpty() + } + + override fun iterator(): MutableIterator { + return cards.iterator() + } + override fun clear() { cards.clear() } + override fun remove(element: HeaderCard): Boolean { + return cards.remove(element) + } + + override fun removeAll(elements: Collection): Boolean { + return cards.removeAll(elements.toSet()) + } + + override fun retainAll(elements: Collection): Boolean { + return cards.retainAll(elements.toSet()) + } + override fun delete(key: String): Boolean { return cards.removeIf { it.key == key } } diff --git a/nebulosa-image-format/src/main/kotlin/nebulosa/image/format/Header.kt b/nebulosa-image-format/src/main/kotlin/nebulosa/image/format/Header.kt index e8fd2a4f0..f396737e4 100644 --- a/nebulosa-image-format/src/main/kotlin/nebulosa/image/format/Header.kt +++ b/nebulosa-image-format/src/main/kotlin/nebulosa/image/format/Header.kt @@ -1,10 +1,12 @@ package nebulosa.image.format +import java.util.function.Predicate + interface Header : ReadableHeader, WritableHeader, Cloneable { public override fun clone(): Header - data object Empty : Header, Iterator { + data object Empty : Header, MutableIterator { override fun clone() = this @@ -20,6 +22,12 @@ interface Header : ReadableHeader, WritableHeader, Cloneable { override fun clear() = Unit + override fun remove(element: HeaderCard) = false + + override fun removeAll(elements: Collection) = false + + override fun retainAll(elements: Collection) = false + override fun add(key: String, value: Boolean, comment: String) = Unit override fun add(key: String, value: Int, comment: String) = Unit @@ -28,12 +36,18 @@ interface Header : ReadableHeader, WritableHeader, Cloneable { override fun add(key: String, value: String, comment: String) = Unit - override fun add(card: HeaderCard) = Unit + override fun add(element: HeaderCard) = false + + override fun addAll(elements: Collection) = false override fun delete(key: String) = false override fun hasNext() = false override fun next() = TODO("Unsupported operation") + + override fun remove() = Unit + + override fun removeIf(filter: Predicate) = false } } diff --git a/nebulosa-image-format/src/main/kotlin/nebulosa/image/format/WritableHeader.kt b/nebulosa-image-format/src/main/kotlin/nebulosa/image/format/WritableHeader.kt index aaf1a1078..abcc50f2b 100644 --- a/nebulosa-image-format/src/main/kotlin/nebulosa/image/format/WritableHeader.kt +++ b/nebulosa-image-format/src/main/kotlin/nebulosa/image/format/WritableHeader.kt @@ -1,8 +1,6 @@ package nebulosa.image.format -interface WritableHeader { - - fun clear() +interface WritableHeader : MutableCollection { fun add(key: HeaderKey, value: Boolean) = add(key.key, value, key.comment) @@ -20,10 +18,10 @@ interface WritableHeader { fun add(key: String, value: String, comment: String = "") - fun add(card: HeaderCard) - fun addAll(cards: Iterable) = cards.forEach(::add) + override fun addAll(elements: Collection) = elements.fold(false) { a, b -> add(b) || a } + fun delete(key: HeaderKey) = delete(key.key) fun delete(key: String): Boolean diff --git a/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/wheels/INDIFilterWheel.kt b/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/wheels/INDIFilterWheel.kt index 530bea68f..ce0c347cd 100644 --- a/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/wheels/INDIFilterWheel.kt +++ b/nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/wheels/INDIFilterWheel.kt @@ -16,7 +16,7 @@ internal open class INDIFilterWheel( @Volatile final override var position = 0 @Volatile final override var moving = false - final override val names = ArrayList(12) + final override val names = ArrayList(8) override fun handleMessage(message: INDIProtocol) { when (message) { diff --git a/nebulosa-livestacker/build.gradle.kts b/nebulosa-livestacker/build.gradle.kts new file mode 100644 index 000000000..4d1b2976b --- /dev/null +++ b/nebulosa-livestacker/build.gradle.kts @@ -0,0 +1,16 @@ +plugins { + kotlin("jvm") + id("maven-publish") +} + +dependencies { + api(libs.logback) +} + +publishing { + publications { + create("pluginMaven") { + from(components["java"]) + } + } +} diff --git a/nebulosa-livestacker/src/main/kotlin/nebulosa/livestacker/LiveStacker.kt b/nebulosa-livestacker/src/main/kotlin/nebulosa/livestacker/LiveStacker.kt new file mode 100644 index 000000000..78dbe6454 --- /dev/null +++ b/nebulosa-livestacker/src/main/kotlin/nebulosa/livestacker/LiveStacker.kt @@ -0,0 +1,18 @@ +package nebulosa.livestacker + +import java.io.Closeable +import java.nio.file.Path + +interface LiveStacker : Closeable { + + val isRunning: Boolean + + val isStacking: Boolean + + fun start() + + // TODO: add CancellationToken parameter? + fun add(path: Path): Path? + + fun stop() +} diff --git a/nebulosa-pixinsight/build.gradle.kts b/nebulosa-pixinsight/build.gradle.kts new file mode 100644 index 000000000..a82b0f0a5 --- /dev/null +++ b/nebulosa-pixinsight/build.gradle.kts @@ -0,0 +1,23 @@ +plugins { + kotlin("jvm") + id("maven-publish") +} + +dependencies { + api(project(":nebulosa-common")) + api(project(":nebulosa-math")) + api(project(":nebulosa-stardetector")) + api(project(":nebulosa-livestacker")) + api(libs.bundles.jackson) + api(libs.apache.codec) + implementation(project(":nebulosa-log")) + testImplementation(project(":nebulosa-test")) +} + +publishing { + publications { + create("pluginMaven") { + from(components["java"]) + } + } +} diff --git a/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/livestacker/PixInsightLiveStacker.kt b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/livestacker/PixInsightLiveStacker.kt new file mode 100644 index 000000000..b617684b6 --- /dev/null +++ b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/livestacker/PixInsightLiveStacker.kt @@ -0,0 +1,131 @@ +package nebulosa.pixinsight.livestacker + +import nebulosa.livestacker.LiveStacker +import nebulosa.log.loggerFor +import nebulosa.pixinsight.script.* +import java.nio.file.Path +import java.util.concurrent.atomic.AtomicBoolean +import kotlin.io.path.copyTo +import kotlin.io.path.deleteIfExists +import kotlin.io.path.moveTo + +data class PixInsightLiveStacker( + private val runner: PixInsightScriptRunner, + private val workingDirectory: Path, + private val dark: Path? = null, + private val flat: Path? = null, + private val bias: Path? = null, + private val use32Bits: Boolean = false, + private val slot: Int = PixInsightScript.DEFAULT_SLOT, +) : LiveStacker { + + private val running = AtomicBoolean() + private val stacking = AtomicBoolean() + + override val isRunning + get() = running.get() + + override val isStacking + get() = stacking.get() + + @Volatile private var stackCount = 0 + + private val referencePath = Path.of("$workingDirectory", "reference.fits") + private val calibratedPath = Path.of("$workingDirectory", "calibrated.fits") + private val alignedPath = Path.of("$workingDirectory", "aligned.fits") + private val stackedPath = Path.of("$workingDirectory", "stacked.fits") + + @Synchronized + override fun start() { + if (!running.get()) { + val isPixInsightRunning = PixInsightIsRunning(slot).use { it.runSync(runner) } + + if (!isPixInsightRunning) { + try { + check(PixInsightStartup(slot).use { it.runSync(runner) }) + } catch (e: Throwable) { + throw IllegalStateException("unable to start PixInsight") + } + } + + stackCount = 0 + running.set(true) + } + } + + @Synchronized + override fun add(path: Path): Path? { + var targetPath = path + + return if (running.get()) { + stacking.set(true) + + // Calibrate. + val calibrated = if (dark == null && flat == null && bias == null) false else { + PixInsightCalibrate(slot, workingDirectory, targetPath, dark, flat, if (dark == null) bias else null).use { s -> + val outputPath = s.runSync(runner).outputImage ?: return@use false + LOG.info("live stacking calibrated. count={}, output={}", stackCount, outputPath) + outputPath.moveTo(calibratedPath, true) + true + } + } + + if (calibrated) { + targetPath = calibratedPath + } + + // TODO: Debayer, Resample? + + if (stackCount > 0) { + // Align. + val aligned = PixInsightAlign(slot, workingDirectory, referencePath, targetPath).use { s -> + val outputPath = s.runSync(runner).outputImage ?: return@use false + LOG.info("live stacking aligned. count={}, output={}", stackCount, outputPath) + outputPath.moveTo(alignedPath, true) + true + } + + if (aligned) { + targetPath = alignedPath + + // Stack. + val expressionRK = "({{0}} * $stackCount + {{1}}) / ${stackCount + 1}" + PixInsightPixelMath(slot, listOf(stackedPath, targetPath), stackedPath, expressionRK).use { s -> + s.runSync(runner).stackedImage?.also { + LOG.info("live stacking finished. count={}, output={}", stackCount++, it) + } + } + } + } else { + targetPath.copyTo(referencePath, true) + targetPath.copyTo(stackedPath, true) + LOG.info("live stacking started. target={}, reference={}, stacked={}", targetPath, referencePath, stackedPath) + stackCount = 1 + } + + stacking.set(false) + + stackedPath + } else { + path + } + } + + @Synchronized + override fun stop() { + running.set(false) + stackCount = 0 + } + + override fun close() { + referencePath.deleteIfExists() + calibratedPath.deleteIfExists() + alignedPath.deleteIfExists() + // stackedPath.deleteIfExists() + } + + companion object { + + @JvmStatic val LOG = loggerFor() + } +} diff --git a/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/AbstractPixInsightScript.kt b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/AbstractPixInsightScript.kt new file mode 100644 index 000000000..ad5554d39 --- /dev/null +++ b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/AbstractPixInsightScript.kt @@ -0,0 +1,83 @@ +package nebulosa.pixinsight.script + +import com.fasterxml.jackson.module.kotlin.jsonMapper +import com.fasterxml.jackson.module.kotlin.kotlinModule +import nebulosa.common.exec.CommandLine +import nebulosa.common.exec.CommandLineListener +import nebulosa.common.json.PathDeserializer +import nebulosa.common.json.PathSerializer +import nebulosa.log.loggerFor +import org.apache.commons.codec.binary.Hex +import java.nio.file.Path +import java.util.concurrent.CompletableFuture + +abstract class AbstractPixInsightScript : PixInsightScript, CommandLineListener, CompletableFuture() { + + override fun onLineRead(line: String) = Unit + + override fun onExit(exitCode: Int, exception: Throwable?) = Unit + + protected open fun beforeRun() = Unit + + protected abstract fun processOnComplete(exitCode: Int): T? + + protected open fun waitOnComplete() = Unit + + final override fun run(runner: PixInsightScriptRunner) = runner.run(this) + + final override fun startCommandLine(commandLine: CommandLine) { + commandLine.whenComplete { exitCode, exception -> + try { + LOG.info("{} script finished. done={}, exitCode={}", this::class.simpleName, isDone, exitCode, exception) + + waitOnComplete() + + if (isDone) return@whenComplete + else if (exception != null) completeExceptionally(exception) + else complete(processOnComplete(exitCode).also { LOG.info("script processed. output={}", it) }) + } finally { + commandLine.unregisterCommandLineListener(this) + } + } + + commandLine.registerCommandLineListener(this) + beforeRun() + commandLine.start() + } + + companion object { + + internal const val START_FILE = "@" + internal const val END_FILE = "#" + + @JvmStatic private val LOG = loggerFor>() + + @JvmStatic private val KOTLIN_MODULE = kotlinModule() + .addDeserializer(Path::class.java, PathDeserializer) + .addSerializer(PathSerializer) + + @JvmStatic internal val OBJECT_MAPPER = jsonMapper { + addModule(KOTLIN_MODULE) + } + + @JvmStatic + internal fun execute(slot: Int, scriptPath: Path, data: Any?): String { + return buildString { + if (slot > 0) append("$slot:") + append("\"$scriptPath") + + if (data != null) { + append(',') + + when (data) { + is Path, is CharSequence -> append("'$data'") + is Number -> append("$data") + else -> append(Hex.encodeHexString(OBJECT_MAPPER.writeValueAsString(data).toByteArray(Charsets.UTF_16BE))) + } + } + + append('"') + } + } + } +} diff --git a/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightAlign.kt b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightAlign.kt new file mode 100644 index 000000000..2958d15b0 --- /dev/null +++ b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightAlign.kt @@ -0,0 +1,85 @@ +package nebulosa.pixinsight.script + +import nebulosa.io.resource +import nebulosa.io.transferAndClose +import java.nio.file.Files +import java.nio.file.Path +import kotlin.io.path.deleteIfExists +import kotlin.io.path.outputStream +import kotlin.io.path.readText + +data class PixInsightAlign( + private val slot: Int, + private val workingDirectory: Path, + private val referencePath: Path, + private val targetPath: Path, +) : AbstractPixInsightScript() { + + private data class Input( + @JvmField val referencePath: Path, + @JvmField val targetPath: Path, + @JvmField val outputDirectory: Path, + @JvmField val statusPath: Path, + ) + + data class Output( + @JvmField val success: Boolean = false, + @JvmField val errorMessage: String? = null, + @JvmField val outputImage: Path? = null, + @JvmField val outputMaskImage: Path? = null, + @JvmField val totalPairMatches: Int = 0, + @JvmField val inliers: Int = 0, + @JvmField val overlapping: Int = 0, + @JvmField val regularity: Double = 0.0, + @JvmField val quality: Double = 0.0, + @JvmField val rmsError: Double = 0.0, + @JvmField val rmsErrorDev: Double = 0.0, + @JvmField val peakErrorX: Double = 0.0, + @JvmField val peakErrorY: Double = 0.0, + @JvmField val h11: Double = 0.0, + @JvmField val h12: Double = 0.0, + @JvmField val h13: Double = 0.0, + @JvmField val h21: Double = 0.0, + @JvmField val h22: Double = 0.0, + @JvmField val h23: Double = 0.0, + @JvmField val h31: Double = 0.0, + @JvmField val h32: Double = 0.0, + @JvmField val h33: Double = 0.0, + ) { + + companion object { + + @JvmStatic val FAILED = Output() + } + } + + private val scriptPath = Files.createTempFile("pi-", ".js") + private val statusPath = Files.createTempFile("pi-", ".txt") + + init { + resource("pixinsight/Align.js")!!.transferAndClose(scriptPath.outputStream()) + } + + override val arguments = listOf("-x=${execute(slot, scriptPath, Input(referencePath, targetPath, workingDirectory, statusPath))}") + + override fun processOnComplete(exitCode: Int): Output { + if (exitCode == 0) { + repeat(30) { + val text = statusPath.readText() + + if (text.startsWith(START_FILE) && text.endsWith(END_FILE)) { + return OBJECT_MAPPER.readValue(text.substring(1, text.length - 1), Output::class.java) + } + + Thread.sleep(1000) + } + } + + return Output.FAILED + } + + override fun close() { + scriptPath.deleteIfExists() + statusPath.deleteIfExists() + } +} diff --git a/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightAutomaticBackgroundExtractor.kt b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightAutomaticBackgroundExtractor.kt new file mode 100644 index 000000000..a68dd5049 --- /dev/null +++ b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightAutomaticBackgroundExtractor.kt @@ -0,0 +1,64 @@ +package nebulosa.pixinsight.script + +import nebulosa.io.resource +import nebulosa.io.transferAndClose +import java.nio.file.Files +import java.nio.file.Path +import kotlin.io.path.deleteIfExists +import kotlin.io.path.outputStream +import kotlin.io.path.readText + +data class PixInsightAutomaticBackgroundExtractor( + private val slot: Int, + private val targetPath: Path, + private val outputPath: Path, +) : AbstractPixInsightScript() { + + private data class Input( + @JvmField val targetPath: Path, + @JvmField val outputPath: Path, + @JvmField val statusPath: Path, + ) + + data class Output( + @JvmField val success: Boolean = false, + @JvmField val errorMessage: String? = null, + @JvmField val outputImage: Path? = null, + ) { + + companion object { + + @JvmField val FAILED = Output() + } + } + + private val scriptPath = Files.createTempFile("pi-", ".js") + private val statusPath = Files.createTempFile("pi-", ".txt") + + init { + resource("pixinsight/ABE.js")!!.transferAndClose(scriptPath.outputStream()) + } + + override val arguments = listOf("-x=${execute(slot, scriptPath, Input(targetPath, outputPath, statusPath))}") + + override fun processOnComplete(exitCode: Int): Output { + if (exitCode == 0) { + repeat(30) { + val text = statusPath.readText() + + if (text.startsWith(START_FILE) && text.endsWith(END_FILE)) { + return OBJECT_MAPPER.readValue(text.substring(1, text.length - 1), Output::class.java) + } + + Thread.sleep(1000) + } + } + + return Output.FAILED + } + + override fun close() { + scriptPath.deleteIfExists() + statusPath.deleteIfExists() + } +} diff --git a/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightCalibrate.kt b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightCalibrate.kt new file mode 100644 index 000000000..53cd83351 --- /dev/null +++ b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightCalibrate.kt @@ -0,0 +1,75 @@ +package nebulosa.pixinsight.script + +import nebulosa.io.resource +import nebulosa.io.transferAndClose +import java.nio.file.Files +import java.nio.file.Path +import kotlin.io.path.deleteIfExists +import kotlin.io.path.outputStream +import kotlin.io.path.readText + +data class PixInsightCalibrate( + private val slot: Int, + private val workingDirectory: Path, + private val targetPath: Path, + private val dark: Path? = null, + private val flat: Path? = null, + private val bias: Path? = null, + private val compress: Boolean = false, + private val use32Bit: Boolean = false, +) : AbstractPixInsightScript() { + + private data class Input( + @JvmField val targetPath: Path, + @JvmField val outputDirectory: Path, + @JvmField val statusPath: Path, + @JvmField val masterDark: Path? = null, + @JvmField val masterFlat: Path? = null, + @JvmField val masterBias: Path? = null, + @JvmField val compress: Boolean = false, + @JvmField val use32Bit: Boolean = false, + ) + + data class Output( + @JvmField val success: Boolean = false, + @JvmField val errorMessage: String? = null, + @JvmField val outputImage: Path? = null, + ) { + + companion object { + + @JvmStatic val FAILED = Output() + } + } + + private val scriptPath = Files.createTempFile("pi-", ".js") + private val statusPath = Files.createTempFile("pi-", ".txt") + + init { + resource("pixinsight/Calibrate.js")!!.transferAndClose(scriptPath.outputStream()) + } + + override val arguments = + listOf("-x=${execute(slot, scriptPath, Input(targetPath, workingDirectory, statusPath, dark, flat, bias, compress, use32Bit))}") + + override fun processOnComplete(exitCode: Int): Output { + if (exitCode == 0) { + repeat(30) { + val text = statusPath.readText() + + if (text.startsWith(START_FILE) && text.endsWith(END_FILE)) { + return OBJECT_MAPPER.readValue(text.substring(1, text.length - 1), Output::class.java) + } + + Thread.sleep(1000) + } + } + + return Output.FAILED + } + + override fun close() { + scriptPath.deleteIfExists() + statusPath.deleteIfExists() + } +} diff --git a/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightDetectStars.kt b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightDetectStars.kt new file mode 100644 index 000000000..bfb4952f1 --- /dev/null +++ b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightDetectStars.kt @@ -0,0 +1,95 @@ +package nebulosa.pixinsight.script + +import nebulosa.io.resource +import nebulosa.io.transferAndClose +import nebulosa.stardetector.StarPoint +import java.nio.file.Files +import java.nio.file.Path +import java.time.Duration +import kotlin.io.path.deleteIfExists +import kotlin.io.path.outputStream +import kotlin.io.path.readText + +data class PixInsightDetectStars( + private val slot: Int, + private val targetPath: Path, + private val minSNR: Double = 0.0, + private val invert: Boolean = false, + private val timeout: Duration = Duration.ZERO, +) : AbstractPixInsightScript() { + + private data class Input( + @JvmField val targetPath: Path, + @JvmField val statusPath: Path, + @JvmField val minSNR: Double = 0.0, + @JvmField val invert: Boolean = false, + ) + + data class Output( + @JvmField val success: Boolean = false, + @JvmField val errorMessage: String? = null, + @JvmField val stars: List = emptyList(), + ) { + + override fun toString() = "Output(success=$success, errorMessage=$errorMessage, stars=${stars.size})" + + companion object { + + @JvmStatic val FAILED = Output() + } + } + + data class Star( + override val x: Double = 0.0, + override val y: Double = 0.0, + override val flux: Double = 0.0, + @JvmField val size: Double = 0.0, + @JvmField val bkg: Double = 0.0, + @JvmField val x0: Int = 0, + @JvmField val y0: Int = 0, + @JvmField val x1: Int = 0, + @JvmField val y1: Int = 0, + @JvmField val nmax: Int = 0, + override val snr: Double = 0.0, + @JvmField val peak: Double = 0.0, + override val hfd: Double = 0.0, + ) : StarPoint + + private val scriptPath = Files.createTempFile("pi-", ".js") + private val statusPath = Files.createTempFile("pi-", ".txt") + + init { + resource("pixinsight/DetectStars.js")!!.transferAndClose(scriptPath.outputStream()) + } + + override val arguments = listOf("-x=${execute(slot, scriptPath, Input(targetPath, statusPath, minSNR, invert))}") + + override fun processOnComplete(exitCode: Int): Output { + val timeoutInMillis = timeout.toMillis() + + if (exitCode == 0) { + val startTime = System.currentTimeMillis() + + repeat(600) { + val text = statusPath.readText() + + if (text.startsWith(START_FILE) && text.endsWith(END_FILE)) { + return OBJECT_MAPPER.readValue(text.substring(1, text.length - 1), Output::class.java) + } + + if (timeoutInMillis == 0L || System.currentTimeMillis() - startTime < timeoutInMillis) { + Thread.sleep(500) + } else { + return@repeat + } + } + } + + return Output.FAILED + } + + override fun close() { + scriptPath.deleteIfExists() + statusPath.deleteIfExists() + } +} diff --git a/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightIsRunning.kt b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightIsRunning.kt new file mode 100644 index 000000000..4ec4b78ad --- /dev/null +++ b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightIsRunning.kt @@ -0,0 +1,51 @@ +package nebulosa.pixinsight.script + +import nebulosa.log.debug +import nebulosa.log.loggerFor + +data class PixInsightIsRunning(private val slot: Int) : AbstractPixInsightScript() { + + override val arguments = listOf(if (slot > 0) "-y=$slot" else "-y") + + private val slotIsNotRunning = "The requested application instance #$slot is not running" + private val slotCrashed = "The requested application instance #$slot has crashed" + private val yieldedExecutionInstance = "$YIELDED_EXECUTION_INSTANCE$slot" + + override fun onLineRead(line: String) { + processLine(line) + } + + private fun processLine(line: String) { + if (isDone) return + + if (slot > 0) { + if (line.contains(slotIsNotRunning, true) || line.contains(slotCrashed, true)) { + complete(false) + } else if (line.contains(yieldedExecutionInstance, true)) { + complete(true) + } else { + return + } + } else if (line.contains(YIELDED_EXECUTION_INSTANCE, true)) { + complete(true) + } else if (line.contains(NO_RUNNING_PROCESS, true)) { + complete(false) + } else { + return + } + + LOG.debug { line } + } + + override fun processOnComplete(exitCode: Int) = false + + override fun close() = Unit + + companion object { + + private const val NO_RUNNING_PROCESS = "There is no running (and alive) instance of the PixInsight" + private const val YIELDED_EXECUTION_INSTANCE = "Yielded execution to running application instance #" + + @JvmStatic private val LOG = loggerFor() + } +} diff --git a/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightPixelMath.kt b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightPixelMath.kt new file mode 100644 index 000000000..a4cd13ad8 --- /dev/null +++ b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightPixelMath.kt @@ -0,0 +1,71 @@ +package nebulosa.pixinsight.script + +import nebulosa.io.resource +import nebulosa.io.transferAndClose +import java.nio.file.Files +import java.nio.file.Path +import kotlin.io.path.deleteIfExists +import kotlin.io.path.outputStream +import kotlin.io.path.readText + +data class PixInsightPixelMath( + private val slot: Int, + private val inputPaths: List, + private val outputPath: Path, + private val expressionRK: String? = null, + private val expressionG: String? = null, + private val expressionB: String? = null, +) : AbstractPixInsightScript() { + + private data class Input( + @JvmField val statusPath: Path, + @JvmField val inputPaths: List, + @JvmField val outputPath: Path, + @JvmField val expressionRK: String? = null, + @JvmField val expressionG: String? = null, + @JvmField val expressionB: String? = null, + ) + + data class Output( + @JvmField val success: Boolean = false, + @JvmField val errorMessage: String? = null, + @JvmField val stackedImage: Path? = null, + ) { + + companion object { + + @JvmStatic val FAILED = Output() + } + } + + private val scriptPath = Files.createTempFile("pi-", ".js") + private val statusPath = Files.createTempFile("pi-", ".txt") + + init { + resource("pixinsight/PixelMath.js")!!.transferAndClose(scriptPath.outputStream()) + } + + override val arguments = + listOf("-x=${execute(slot, scriptPath, Input(statusPath, inputPaths, outputPath, expressionRK, expressionG, expressionB))}") + + override fun processOnComplete(exitCode: Int): Output? { + if (exitCode == 0) { + repeat(30) { + val text = statusPath.readText() + + if (text.startsWith(START_FILE) && text.endsWith(END_FILE)) { + return OBJECT_MAPPER.readValue(text.substring(1, text.length - 1), Output::class.java) + } + + Thread.sleep(1000) + } + } + + return Output.FAILED + } + + override fun close() { + scriptPath.deleteIfExists() + statusPath.deleteIfExists() + } +} diff --git a/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightScript.kt b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightScript.kt new file mode 100644 index 000000000..58a39d50e --- /dev/null +++ b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightScript.kt @@ -0,0 +1,25 @@ +package nebulosa.pixinsight.script + +import nebulosa.common.exec.CommandLine +import java.io.Closeable +import java.util.concurrent.Future + +interface PixInsightScript : Future, Closeable { + + val arguments: Iterable + + fun startCommandLine(commandLine: CommandLine) + + fun run(runner: PixInsightScriptRunner) + + fun runSync(runner: PixInsightScriptRunner): T { + run(runner) + return get() + } + + companion object { + + const val DEFAULT_SLOT = 256 + const val UNSPECIFIED_SLOT = 0 + } +} diff --git a/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightScriptRunner.kt b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightScriptRunner.kt new file mode 100644 index 000000000..6becf6d2b --- /dev/null +++ b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightScriptRunner.kt @@ -0,0 +1,26 @@ +package nebulosa.pixinsight.script + +import nebulosa.common.exec.commandLine +import nebulosa.log.loggerFor +import java.nio.file.Path + +data class PixInsightScriptRunner(private val executablePath: Path) { + + fun run(script: PixInsightScript<*>) { + val commandLine = commandLine { + executablePath(executablePath) + script.arguments.forEach(::putArg) + DEFAULT_ARGS.forEach(::putArg) + } + + LOG.info("running {} script: {}", script::class.simpleName, commandLine.command) + + script.startCommandLine(commandLine) + } + + companion object { + + @JvmStatic private val DEFAULT_ARGS = arrayOf("--automation-mode", "--no-startup-scripts") + @JvmStatic private val LOG = loggerFor() + } +} diff --git a/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightStartup.kt b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightStartup.kt new file mode 100644 index 000000000..e410a4ea9 --- /dev/null +++ b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/script/PixInsightStartup.kt @@ -0,0 +1,44 @@ +package nebulosa.pixinsight.script + +import nebulosa.io.resource +import nebulosa.io.transferAndClose +import java.nio.file.Files +import kotlin.concurrent.timer +import kotlin.io.path.deleteIfExists +import kotlin.io.path.outputStream +import kotlin.io.path.readText + +data class PixInsightStartup(private val slot: Int) : AbstractPixInsightScript() { + + private val scriptPath = Files.createTempFile("pi-", ".js") + private val outputPath = Files.createTempFile("pi-", ".txt") + + init { + resource("pixinsight/Startup.js")!!.transferAndClose(scriptPath.outputStream()) + } + + override val arguments = listOf("-r=${execute(0, scriptPath, outputPath)}", if (slot > 0) "-n=$slot" else "-n") + + override fun beforeRun() { + var count = 0 + + timer("PixInsight Startup Timer", true, 1000L, 500L) { + if (outputPath.readText() == "STARTED") { + complete(true) + cancel() + } else if (count >= 60) { + complete(false) + cancel() + } + + count++ + } + } + + override fun processOnComplete(exitCode: Int) = false + + override fun close() { + scriptPath.deleteIfExists() + outputPath.deleteIfExists() + } +} diff --git a/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/stardetector/PixInsightStarDetector.kt b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/stardetector/PixInsightStarDetector.kt new file mode 100644 index 000000000..0459a5537 --- /dev/null +++ b/nebulosa-pixinsight/src/main/kotlin/nebulosa/pixinsight/stardetector/PixInsightStarDetector.kt @@ -0,0 +1,21 @@ +package nebulosa.pixinsight.stardetector + +import nebulosa.pixinsight.script.PixInsightDetectStars +import nebulosa.pixinsight.script.PixInsightScriptRunner +import nebulosa.stardetector.StarDetector +import nebulosa.stardetector.StarPoint +import java.nio.file.Path +import java.time.Duration + +data class PixInsightStarDetector( + private val runner: PixInsightScriptRunner, + private val slot: Int, + private val minSNR: Double = 0.0, + private val timeout: Duration = Duration.ZERO, +) : StarDetector { + + override fun detect(input: Path): List { + return PixInsightDetectStars(slot, input, minSNR, false, timeout) + .use { it.runSync(runner).stars.toList() } + } +} diff --git a/nebulosa-pixinsight/src/main/resources/pixinsight/ABE.js b/nebulosa-pixinsight/src/main/resources/pixinsight/ABE.js new file mode 100644 index 000000000..9ffb6e97c --- /dev/null +++ b/nebulosa-pixinsight/src/main/resources/pixinsight/ABE.js @@ -0,0 +1,74 @@ +function decodeParams(hex) { + const buffer = new Uint8Array(hex.length / 4) + + for (let i = 0; i < hex.length; i += 4) { + buffer[i / 4] = parseInt(hex.substr(i, 4), 16) + } + + return JSON.parse(String.fromCharCode.apply(null, buffer)) +} + +function abe() { + const data = { + success: true, + errorMessage: null, + outputImage: null, + } + + try { + const input = decodeParams(jsArguments[0]) + + const targetPath = input.targetPath + const outputPath = input.outputPath + const statusPath = input.statusPath + + console.writeln("targetPath=" + targetPath) + console.writeln("outputPath=" + outputPath) + console.writeln("statusPath=" + statusPath) + + const window = ImageWindow.open(targetPath)[0] + + const P = new AutomaticBackgroundExtractor + P.tolerance = 1.000 + P.deviation = 0.800 + P.unbalance = 1.800 + P.minBoxFraction = 0.050 + P.maxBackground = 1.0000 + P.minBackground = 0.0000 + P.useBrightnessLimits = false + P.polyDegree = 4 + P.boxSize = 5 + P.boxSeparation = 5 + P.modelImageSampleFormat = AutomaticBackgroundExtractor.prototype.f32 + P.abeDownsample = 2.00 + P.writeSampleBoxes = false + P.justTrySamples = false + P.targetCorrection = AutomaticBackgroundExtractor.prototype.Subtract + P.normalize = true + P.discardModel = true + P.replaceTarget = true + P.correctedImageId = "" + P.correctedImageSampleFormat = AutomaticBackgroundExtractor.prototype.SameAsTarget + P.verboseCoefficients = false + P.compareModel = false + P.compareFactor = 10.00 + + P.executeOn(window.mainView) + + window.saveAs(outputPath, false, false, false, false) + + window.forceClose() + + data.outputImage = outputPath + + console.writeln("abe finished") + } catch (e) { + data.success = false + data.errorMessage = e.message + console.writeln(data.errorMessage) + } finally { + File.writeTextFile(statusPath, "@" + JSON.stringify(data) + "#") + } +} + +abe() diff --git a/nebulosa-pixinsight/src/main/resources/pixinsight/Align.js b/nebulosa-pixinsight/src/main/resources/pixinsight/Align.js new file mode 100644 index 000000000..f8f93f38c --- /dev/null +++ b/nebulosa-pixinsight/src/main/resources/pixinsight/Align.js @@ -0,0 +1,155 @@ +function decodeParams(hex) { + const buffer = new Uint8Array(hex.length / 4) + + for (let i = 0; i < hex.length; i += 4) { + buffer[i / 4] = parseInt(hex.substr(i, 4), 16) + } + + return JSON.parse(String.fromCharCode.apply(null, buffer)) +} + +function alignment() { + const data = { + success: true, + errorMessage: null, + outputImage: null, + outputMaskImage: null, + totalPairMatches: 0, + inliers: 0, + overlapping: 0, + regularity: 0, + quality: 0, + rmsError: 0, + rmsErrorDev: 0, + peakErrorX: 0, + peakErrorY: 0, + h11: 0, + h12: 0, + h13: 0, + h21: 0, + h22: 0, + h23: 0, + h31: 0, + h32: 0, + h33: 0, + } + + try { + const input = decodeParams(jsArguments[0]) + + const referencePath = input.referencePath + const targetPath = input.targetPath + const outputDirectory = input.outputDirectory + const statusPath = input.statusPath + + console.writeln("referencePath=" + referencePath) + console.writeln("targetPath=" + targetPath) + console.writeln("outputDirectory=" + outputDirectory) + console.writeln("statusPath=" + statusPath) + + var P = new StarAlignment + P.structureLayers = 5 + P.noiseLayers = 0 + P.hotPixelFilterRadius = 1 + P.noiseReductionFilterRadius = 0 + P.minStructureSize = 0 + P.sensitivity = 0.50 + P.peakResponse = 0.50 + P.brightThreshold = 3.00 + P.maxStarDistortion = 0.60 + P.allowClusteredSources = false + P.localMaximaDetectionLimit = 0.75 + P.upperLimit = 1.000 + P.invert = false + P.distortionModel = "" + P.undistortedReference = false + P.distortionCorrection = false + P.distortionMaxIterations = 20 + P.distortionMatcherExpansion = 1.00 + P.splineOrder = 2 + P.splineSmoothness = 0.005 + P.matcherTolerance = 0.0500 + P.ransacMaxIterations = 2000 + P.ransacMaximizeInliers = 1.00 + P.ransacMaximizeOverlapping = 1.00 + P.ransacMaximizeRegularity = 1.00 + P.ransacMinimizeError = 1.00 + P.maxStars = 0 + P.fitPSF = StarAlignment.prototype.FitPSF_DistortionOnly + P.psfTolerance = 0.50 + P.useTriangles = false + P.polygonSides = 5 + P.descriptorsPerStar = 20 + P.restrictToPreviews = true + P.intersection = StarAlignment.prototype.MosaicOnly + P.useBrightnessRelations = false + P.useScaleDifferences = false + P.scaleTolerance = 0.100 + P.referenceImage = referencePath + P.referenceIsFile = true + P.targets = [ // enabled, isFile, image + [true, true, targetPath] + ] + P.inputHints = "" + P.outputHints = "" + P.mode = StarAlignment.prototype.RegisterMatch + P.writeKeywords = true + P.generateMasks = false + P.generateDrizzleData = false + P.generateDistortionMaps = false + P.inheritAstrometricSolution = false + P.frameAdaptation = false + P.randomizeMosaic = false + P.pixelInterpolation = StarAlignment.prototype.Auto + P.clampingThreshold = 0.30 + P.outputDirectory = outputDirectory + P.outputExtension = ".fits" + P.outputPrefix = "" + P.outputPostfix = "_a" + P.maskPostfix = "_m" + P.distortionMapPostfix = "_dm" + P.outputSampleFormat = StarAlignment.prototype.SameAsTarget + P.overwriteExistingFiles = true + P.onError = StarAlignment.prototype.Continue + P.useFileThreads = true + P.noGUIMessages = true + P.fileThreadOverload = 1.00 + P.maxFileReadThreads = 0 + P.maxFileWriteThreads = 0 + P.memoryLoadControl = true + P.memoryLoadLimit = 0.85 + + P.executeGlobal() + + data.outputImage = P.outputData[0][0] || null + data.outputMaskImage = P.outputData[0][1] || null + data.totalPairMatches = P.outputData[0][2] + data.inliers = P.outputData[0][3] + data.overlapping = P.outputData[0][4] + data.regularity = P.outputData[0][5] + data.quality = P.outputData[0][6] + data.rmsError = P.outputData[0][7] + data.rmsErrorDev = P.outputData[0][8] + data.peakErrorX = P.outputData[0][9] + data.peakErrorY = P.outputData[0][10] + data.h11 = P.outputData[0][11] + data.h12 = P.outputData[0][12] + data.h13 = P.outputData[0][13] + data.h21 = P.outputData[0][14] + data.h22 = P.outputData[0][15] + data.h23 = P.outputData[0][16] + data.h31 = P.outputData[0][17] + data.h32 = P.outputData[0][18] + data.h33 = P.outputData[0][19] + + console.writeln("alignment finished") + } catch (e) { + data.success = false + data.errorMessage = e.message + console.writeln(data.errorMessage) + } finally { + File.writeTextFile(statusPath, "@" + JSON.stringify(data) + "#") + } +} + +alignment() diff --git a/nebulosa-pixinsight/src/main/resources/pixinsight/Calibrate.js b/nebulosa-pixinsight/src/main/resources/pixinsight/Calibrate.js new file mode 100644 index 000000000..814586b86 --- /dev/null +++ b/nebulosa-pixinsight/src/main/resources/pixinsight/Calibrate.js @@ -0,0 +1,121 @@ +function decodeParams(hex) { + const buffer = new Uint8Array(hex.length / 4) + + for (let i = 0; i < hex.length; i += 4) { + buffer[i / 4] = parseInt(hex.substr(i, 4), 16) + } + + return JSON.parse(String.fromCharCode.apply(null, buffer)) +} + +function calibrate() { + const data = { + success: true, + errorMessage: null, + outputImage: null, + } + + try { + const input = decodeParams(jsArguments[0]) + + const targetPath = input.targetPath + const outputDirectory = input.outputDirectory + const statusPath = input.statusPath + const masterDark = input.masterDark || "" + const masterFlat = input.masterFlat || "" + const masterBias = input.masterBias || "" + const compress = input.compress + const use32Bit = input.use32Bit + + console.writeln("targetPath=" + targetPath) + console.writeln("outputDirectory=" + outputDirectory) + console.writeln("statusPath=" + statusPath) + console.writeln("masterDark=" + masterDark) + console.writeln("masterFlat=" + masterFlat) + console.writeln("masterBias=" + masterBias) + console.writeln("compress=" + compress) + console.writeln("use32Bit=" + use32Bit) + + const P = new ImageCalibration + + P.targetFrames = [ // enabled, path + [true, targetPath] + ] + P.enableCFA = true + P.cfaPattern = ImageCalibration.prototype.Auto + P.inputHints = "fits-keywords normalize raw cfa signed-is-physical" + P.outputHints = "properties fits-keywords no-compress-data no-embedded-data no-resolution" + P.pedestal = 0 + P.pedestalMode = ImageCalibration.prototype.Keyword + P.pedestalKeyword = "" + P.overscanEnabled = false + P.overscanImageX0 = 0 + P.overscanImageY0 = 0 + P.overscanImageX1 = 0 + P.overscanImageY1 = 0 + P.overscanRegions = [ // enabled, sourceX0, sourceY0, sourceX1, sourceY1, targetX0, targetY0, targetX1, targetY1 + [false, 0, 0, 0, 0, 0, 0, 0, 0], + [false, 0, 0, 0, 0, 0, 0, 0, 0], + [false, 0, 0, 0, 0, 0, 0, 0, 0], + [false, 0, 0, 0, 0, 0, 0, 0, 0] + ] + P.masterBiasEnabled = !!masterBias + P.masterBiasPath = masterBias + P.masterDarkEnabled = !!masterDark + P.masterDarkPath = masterDark + P.masterFlatEnabled = !!masterFlat + P.masterFlatPath = masterFlat + P.calibrateBias = false + P.calibrateDark = false + P.calibrateFlat = false + P.optimizeDarks = false + P.darkOptimizationThreshold = 0.00000 + P.darkOptimizationLow = 3.0000 + P.darkOptimizationWindow = 0 + P.darkCFADetectionMode = ImageCalibration.prototype.DetectCFA + P.separateCFAFlatScalingFactors = true + P.flatScaleClippingFactor = 0.05 + P.evaluateNoise = false + P.noiseEvaluationAlgorithm = ImageCalibration.prototype.NoiseEvaluation_MRS + P.evaluateSignal = false + P.structureLayers = 5 + P.saturationThreshold = 1.00 + P.saturationRelative = false + P.noiseLayers = 1 + P.hotPixelFilterRadius = 1 + P.noiseReductionFilterRadius = 0 + P.minStructureSize = 0 + P.psfType = ImageCalibration.prototype.PSFType_Moffat4 + P.psfGrowth = 1.00 + P.maxStars = 24576 + P.outputDirectory = outputDirectory + P.outputExtension = ".fits" + P.outputPrefix = "" + P.outputPostfix = "_c" + P.outputSampleFormat = use32Bit ? ImageCalibration.prototype.f32 : ImageCalibration.prototype.i16 + P.outputPedestal = 0 + P.outputPedestalMode = ImageCalibration.prototype.OutputPedestal_Literal + P.autoPedestalLimit = 0.00010 + P.overwriteExistingFiles = true + P.onError = ImageCalibration.prototype.Continue + P.noGUIMessages = true + P.useFileThreads = true + P.fileThreadOverload = 1.00 + P.maxFileReadThreads = 0 + P.maxFileWriteThreads = 0 + + P.executeGlobal() + + data.outputImage = P.outputData[0][0] || null + + console.writeln("calibration finished") + } catch (e) { + data.success = false + data.errorMessage = e.message + console.writeln(data.errorMessage) + } finally { + File.writeTextFile(statusPath, "@" + JSON.stringify(data) + "#") + } +} + +calibrate() diff --git a/nebulosa-pixinsight/src/main/resources/pixinsight/DetectStars.js b/nebulosa-pixinsight/src/main/resources/pixinsight/DetectStars.js new file mode 100644 index 000000000..45b04f3e6 --- /dev/null +++ b/nebulosa-pixinsight/src/main/resources/pixinsight/DetectStars.js @@ -0,0 +1,841 @@ +// ____ __ _____ ____ +// / __ \ / // ___/ / __ \ +// / /_/ /__ / / \__ \ / /_/ / +// / ____// /_/ / ___/ // _, _/ PixInsight JavaScript Runtime +// /_/ \____/ /____//_/ |_| PJSR Version 1.0 +// ---------------------------------------------------------------------------- +// pjsr/StarDetector.jsh - Released 2024-02-28T16:25:35Z +// ---------------------------------------------------------------------------- +// This file is part of the PixInsight JavaScript Runtime (PJSR). +// PJSR is an ECMA-262-5 compliant framework for development of scripts on the +// PixInsight platform. +// +// Copyright (c) 2003-2024 Pleiades Astrophoto S.L. All Rights Reserved. +// +// Redistribution and use in both source and binary forms, with or without +// modification, is permitted provided that the following conditions are met: +// +// 1. All redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. All redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. Neither the names "PixInsight" and "Pleiades Astrophoto", nor the names +// of their contributors, may be used to endorse or promote products derived +// from this software without specific prior written permission. For written +// permission, please contact info@pixinsight.com. +// +// 4. All products derived from this software, in any form whatsoever, must +// reproduce the following acknowledgment in the end-user documentation +// and/or other materials provided with the product: +// +// "This product is based on software from the PixInsight project, developed +// by Pleiades Astrophoto and its contributors (https://pixinsight.com/)." +// +// Alternatively, if that is where third-party acknowledgments normally +// appear, this acknowledgment must be reproduced in the product itself. +// +// THIS SOFTWARE IS PROVIDED BY PLEIADES ASTROPHOTO AND ITS CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +// TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL PLEIADES ASTROPHOTO OR ITS +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +// EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, BUSINESS +// INTERRUPTION; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; AND LOSS OF USE, +// DATA OR PROFITS) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. +// ---------------------------------------------------------------------------- + +#include +#include + +function Star(pos, flux, bkg, rect, size, nmax, snr, peak) { + // Centroid position in pixels, image coordinates. This property is an + // object with x and y Number properties. + this.pos = pos + // Total flux, normalized intensity units. + this.flux = flux + // Mean local background, normalized intensity units. + this.bkg = bkg + // Detection region, image coordinates. + this.rect = rect + // Area of detected star structure in square pixels. + this.size = size + // Number of local maxima in the detection structure. A value greater than + // one denotes a double/multiple star or a crowded source. A value of zero + // signals that detection of local maxima has been disabled, either globally + // or for this particular structure. + this.nmax = nmax + + this.snr = snr + this.peak = peak +} + +function StarDetector() { + this.__base__ = Object + this.__base__() + + /* + * Number of wavelet layers for structure detection. (default=5) + */ + this.structureLayers = 5 + + /* + * Half size in pixels of a morphological median filter, for hot pixel + * removal. (default=1) + */ + this.hotPixelFilterRadius = 1 + + /* + * Whether the hot pixel filter removal should be applied to the image used + * for star detection, or only to the working image used to build the + * structure map. (default=false) + * + * By setting this parameter to true, the detection algorithm is completely + * robust to hot pixels (of sizes not larger than hotPixelFilterRadius), but + * it is also less sensitive, so less stars will in general be detected. + * With the default value of false, some hot pixels may be wrongly detected + * as stars but the number of true stars detected will generally be larger. + */ + this.applyHotPixelFilterToDetectionImage = false + + /* + * Half size in pixels of a Gaussian convolution filter applied for noise + * reduction. Useful for star detection in low-SNR images. (default=0) + * + * N.B. Setting the value of this parameter > 0 implies + * applyHotPixelFilterToDetectionImage=true. + */ + this.noiseReductionFilterRadius = 0 + + /* + * Sensitivity of the star detection device. + * + * Internally, the sensitivity of the star detection algorithm is expressed + * in signal-to-noise ratio units with respect to the evaluated dispersion + * of local background pixels for each detected structure. Given a source + * with estimated brightness s, local background b and local background + * dispersion n, sensitivity is the minimum value of (s - b)/n necessary to + * trigger star detection. + * + * To isolate the public interface of this class from its internal + * implementation, this parameter is normalized to the [0,1] range, where 0 + * and 1 represent minimum and maximum sensitivity, respectively. This + * abstraction allows us to change the star detection engine without + * breaking dependent tools and processes. + * + * Increase this value to favor detection of fainter stars. Decrease it to + * restrict detection to brighter stars. (default=0.5). + */ + this.sensitivity = 0.5 + + /*! + * Peak sensitivity of the star detection device. + * + * Internally, the peak response property of the star detection algorithm is + * expressed in kurtosis units. For each detected structure, kurtosis is + * evaluated from all significant pixels with values greater than the + * estimated mean local background. Peak response is the minimum value of + * kurtosis necessary to trigger star detection. + * + * To isolate the public interface of this class from its internal + * implementation, this parameter is normalized to the [0,1] range, where 0 + * and 1 represent minimum and maximum peak response, respectively. This + * abstraction allows us to change the star detection engine without + * breaking dependent tools and processes. + * + * If you decrease this parameter, stars will need to have stronger (or more + * prominent) peaks to be detected. This is useful to prevent detection of + * saturated stars, as well as small nonstellar features. By increasing this + * parameter, the star detection algorithm will be more sensitive to + * 'peakedness', and hence more tolerant with relatively flat image + * features. (default=0.5). + */ + this.peakResponse = 0.5 + + /*! + * If this parameter is false, a local maxima map will be generated to + * identify and prevent detection of multiple sources that are too close to + * be separated as individual structures, such as double and multiple stars. + * In general, barycenter positions cannot be accurately determined for + * sources with several local maxima. If this parameter is true, + * non-separable multiple sources will be detectable as single objects. + * (default=false) + */ + this.allowClusteredSources = false + + /* + * Half size in pixels of the local maxima detection filter. (default=2) + */ + this.localDetectionFilterRadius = 2 + + /*! + * This parameter is a normalized pixel value in the [0,1] range. Structures + * with pixels above this value will be excluded for local maxima detection. + * (default=0.75) + */ + this.localMaximaDetectionLimit = 0.75 + + /* + * Set this flag true to avoid detection of local maxima. (default=false) + * Setting this parameter to true implies allowClusteredSources = true. + */ + this.noLocalMaximaDetection = false + + /*! + * Maximum star distortion. + * + * Internally, star distortion is evaluated in units of coverage of a square + * region circumscribed to each detected structure. The coverage of a + * perfectly circular star is pi/4 (about 0.8). Lower values denote + * elongated or irregular sources. + * + * To isolate the public interface of this class from its internal + * implementation, this parameter is normalized to the [0,1] range, where 0 + * and 1 represent minimum and maximum distortion, respectively. This + * abstraction allows us to change the star detection engine without + * breaking dependent tools and processes. + * + * Use this parameter, if necessary, to control inclusion of elongated + * stars, complex clusters of stars, and nonstellar image features. + * (default=0.6) + */ + this.maxDistortion = 0.6 + + /*! + * Stars with measured SNR above this parameter in units of the minimum + * detection level (as defined by the sensitivity parameter) will always be + * detected, even if their profiles are too flat for the current peak + * response. This allows us to force inclusion of bright stars. (default=3) + */ + this.brightThreshold = 3 + + /* + * Minimum signal-to-noise ratio of a detectable star. + * + * Given a source with estimated brightness s, local background b and local + * background dispersion n, SNR is evaluated as (s - b)/n. Stars with + * measured SNR below this parameter won't be detected. (default=0) + * + * The value of this parameter can be increased to limit star detection to a + * subset of the brightest sources in the image adaptively, instead of + * imposing an arbitrary limit on the number of detected stars. + */ + this.minSNR = 0 + + /*! + * Minimum size of a detectable star structure in square pixels. + * + * This parameter can be used to prevent detection of small and bright image + * artifacts as stars. This can be useful to work with uncalibrated or + * wrongly calibrated data, especially demosaiced CFA frames where hot + * pixels have generated large bright artifacts that cannot be removed with + * a median filter, poorly focused images, and images with poor tracking. + * (default=1) + */ + this.minStructureSize = 1 + + /* + * Stars with peak values greater than this value won't be detected. + * (default=1) + */ + this.upperLimit = 1.0 + + /* + * Detect dark structures over a bright background, instead of bright + * structures over a dark background. (default=false) + */ + this.invert = false + + /* + * Optional callback progress function with the following signature: + * + * Boolean progressCallback( int count, int total ) + * + * If defined, this function will be called by the stars() method for each + * row of its target image. The count argument is the current number of + * processed pixel rows, and total is the height of the target image. If the + * function returns false, the star detection task will be aborted. If the + * function returns true, the task will continue. (default=undefined) + */ + this.progressCallback = undefined + + /* + * Optional mask image. If defined, star detection will be restricted to + * nonzero mask pixels. (default=undefined) + */ + this.mask = undefined + + /* + * Stretch factor for the barycenter search algorithm, in sigma units. + * Increase it to make the algorithm more robust to nearby structures, such + * as multiple/crowded stars and small nebular features. However, too large + * of a stretch factor will make the algorithm less accurate. (default=1.5) + */ + this.xyStretch = 1.5 + + /* + * Square structuring element + */ + function BoxStructure(size) { + let B = new Array(size * size) + for (let i = 0; i < B.length; ++i) + B[i] = 1 + let S = new Array + S.push(B) + return S + } + + /* + * Circular structuring element + */ + function CircularStructure(size) { + size |= 1 + let C = new Array(size * size) + let s2 = size >> 1 + let n2 = size / 2 + let n22 = n2 * n2 + for (let i = 0; i < s2; ++i) { + let di = i + 0.5 - n2 + let di2 = di * di + let i2 = i * size + let i1 = i2 + size - 1 + let i3 = (size - i - 1) * size + let i4 = i3 + size - 1 + for (let j = 0; j < s2; ++j) { + let dj = j + 0.5 - n2 + C[i1 - j] = C[i2 + j] = C[i3 + j] = C[i4 - j] = (di2 + dj * dj <= n22) ? 1 : 0 + } + } + for (let i = 0; i < size; ++i) + C[i * size + s2] = C[s2 * size + i] = 1 + let S = new Array + S.push(C) + return S + } + + /* + * Hot pixel removal with a median filter + */ + this.hotPixelFilter = function (image) { + if (this.hotPixelFilterRadius > 0) + if (this.hotPixelFilterRadius > 1) + image.morphologicalTransformation(MorphOp_Median, CircularStructure(2 * this.hotPixelFilterRadius + 1)) + else + image.morphologicalTransformation(MorphOp_Median, BoxStructure(3)) + } + + /* + * Isolate star detection structures in an image. Replaces the specified map + * image with its binary star detection map. + */ + this.getStructureMap = function (map) { + // Flatten the image with a high-pass filter + let s = new Image(map) + let G = Matrix.gaussianFilterBySize(1 + (1 << this.structureLayers)) + s.convolveSeparable(G.rowVector(G.rows >> 1), G.rowVector(G.rows >> 1)) + map.apply(s, ImageOp_Sub) + s.free() + map.truncate() + map.rescale() + + // Strength the smallest structures with a dilation filter + map.morphologicalTransformation(MorphOp_Dilation, BoxStructure(3)) + + // Adaptive binarization + let m = map.median() + if (1 + m == 1) { + // Black background - probably a noiseless synthetic star field + let wasRangeClippingEnabled = map.rangeClippingEnabled + let wasRangeClipLow = map.rangeClipLow + let wasRangeClipHigh = map.rangeClipHigh + map.rangeClippingEnabled = true + map.rangeClipLow = 0 + map.rangeClipHigh = 1 + if (!wasRangeClippingEnabled || wasRangeClipLow != 0 || wasRangeClipHigh != 1) + m = map.median() + map.binarize(m + map.MAD(m)) + map.rangeClippingEnabled = wasRangeClippingEnabled + map.rangeClipLow = wasRangeClipLow + map.rangeClipHigh = wasRangeClipHigh + } + else { + // A "natural" image - binarize at 3*noise_stdDev + let n = map.noiseKSigma(1)[0] + map.binarize(m + 3 * n) + } + + // Remove noise residuals with an erosion filter + map.morphologicalTransformation(MorphOp_Erosion, BoxStructure(3)) + + // Optional star detection mask + if (this.mask != undefined) + map.apply(this.mask, ImageOp_Mul) + } + + /* + * Local maxima detection. + */ + this.getLocalMaximaMap = function (map) { + // We apply a dilation filter with a flat structuring element without its + // central element. Local maxima are those pixels in the input image with + // values greater than the dilated image. + // The localMaximaDetectionLimit parameter allows us to prevent detection of + // false multiple maxima on saturated or close to saturated structures. + let Bh = BoxStructure((this.localDetectionFilterRadius << 1) | 1) + Bh[0][Bh[0].length >> 1] = 0 + let l = new Image(map) + l.binarize(this.localMaximaDetectionLimit) + l.invert() + let t = new Image(map) + t.morphologicalTransformation(MorphOp_Dilation, Bh) + map.apply(t, ImageOp_Sub) + t.free() + map.binarize(0) + map.apply(l, ImageOp_Mul) + l.free() + } + + /* + * Compute star parameters + */ + this.starParameters = function (image, rect, starPoints, lmMap) { + let params = { + pos: { x: 0, y: 0 }, // barycenter image coordinates + rect: { x0: 0, y0: 0, x1: 0, y1: 0 }, // detection rectangle + bkg: 0, // local background + sigma: 0, // local background dispersion + flux: 0, // total flux + max: 0, // maximum pixel value + nmax: 0, // number of local maxima in structure + peak: 0, // robust peak value + kurt: 0, // kurtosis + count: 0, // sample length + size: 0 + } // structure size in square pixels + + // Mean local background and local background dispersion + for (let delta = 4, it = 0, m0 = 1; ; ++delta, ++it) { + let r = rect.inflatedBy(delta) + let a = [], b = [], c = [], d = [] + image.getSamples(a, new Rect(r.x0, r.y0, r.x1, rect.y0)) + image.getSamples(b, new Rect(r.x0, rect.y0, rect.x0, rect.y1)) + image.getSamples(c, new Rect(r.x0, rect.y1, r.x1, r.y1)) + image.getSamples(d, new Rect(rect.x1, rect.y0, r.x1, rect.y1)) + let B = a.concat(b, c, d) + let m = Math.median(B) + if (m > m0 || (m0 - m) / m0 < 0.01) { + params.bkg = m + params.sigma = Math.max(1.4826 * Math.MAD(B), Math.EPSILON32) + break + } + // Guard us against rare ill-posed conditions + if (it == 200) + return null + m0 = m + } + + // Detection region + params.rect = rect.inflatedBy(2).intersection(image.bounds) + + // Structure size + params.size = starPoints.length + + // Significant subset + let v = [] + for (let i = 0; i < starPoints.length; ++i) { + let p = starPoints[i] + let f = image.sample(p.x, p.y) + if (f > params.bkg) { + // Local maxima + if (!this.noLocalMaximaDetection) + if (lmMap.sample(p.x, p.y) != 0) + ++params.nmax + v.push(f) + // Total flux above local background + params.flux += f + } + } + + // Fail if no significant data + if (v.length == 0) + return null + + // Fail if we have multiple maxima and those are not allowed + if (params.nmax > 1) + if (!this.allowClusteredSources) + return null + + // Barycenter coordinates + let M = Matrix.fromImage(image, rect) + M.truncate(Math.range(M.median() + this.xyStretch * M.stdDev(), 0.0, 1.0), 1.0) + M.rescale() + let sx = 0, sy = 0, sz = 0 + for (let y = rect.y0, i = 0; i < M.rows; ++y, ++i) + for (let x = rect.x0, j = 0; j < M.cols; ++x, ++j) { + let z = M.at(i, j) + if (z > 0) { + sx += z * x + sy += z * y + sz += z + } + } + params.pos.x = sx / sz + 0.5 + params.pos.y = sy / sz + 0.5 + + // Sort significant pixels in decreasing flux order + v.sort((a, b) => (a < b) ? +1 : ((b < a) ? -1 : 0)) + // Maximum pixel value + params.max = v[0] + + // Find subset of significant high pixel values + let mn = 0 + for (let i = 0; i < v.length && (mn < 5 || v[i] == v[i - 1]); ++i, ++mn) { } + for (let i = 0; i < mn; ++i) + params.peak += v[i] + // Significant peak value + params.peak /= mn + // Significant sample length + params.count = v.length + + // Kurtosis + let s = Math.stdDev(v) + if (1 + s != 1) { + let m = params.flux / v.length + let k = 0 + for (let i = 0; i < v.length; ++i) { + let d = (v[i] - m) / s + d *= d + k += d * d + } + params.kurt = k / params.count + } + + return params + } + + /* + * Finds all the stars in an image. Returns an array of Star objects. + */ + this.stars = function (image) { + // We work on a duplicate of the source grayscale image, or on its HSI + // intensity component if it is a color image. + let wrk = Image.newFloatImage() + image.getIntensity(wrk) + + // Hot pixel removal, if applied to the image where we are going to find + // stars, not just to the image used to build the structure map. + // When noise reduction is enabled, always remove hot pixels first, or + // hot pixels would be promoted to "stars". + let alreadyFixedHotPixels = false + if (this.applyHotPixelFilterToDetectionImage || this.noiseReductionFilterRadius > 0) { + this.hotPixelFilter(wrk) + alreadyFixedHotPixels = true + } + + // If the invert flag is set, then we are looking for dark structures on + // a bright background. + if (this.invert) + wrk.invert() + + // Optional noise reduction + if (this.noiseReductionFilterRadius > 0) { + let G = Matrix.gaussianFilterBySize((this.noiseReductionFilterRadius << 1) | 1) + wrk.convolveSeparable(G.rowVector(G.rows >> 1), G.rowVector(G.rows >> 1)) + } + + // Structure map + let map = Image.newFloatImage() + map.assign(wrk) + // Hot pixel removal, if applied just to the image used to build the + // structure map. + if (!alreadyFixedHotPixels) + this.hotPixelFilter(map) + this.getStructureMap(map) + + // Use matrices instead of images for faster access + let M = map.toMatrix() + map.free() + + // Local maxima map + let lmMap + if (!this.noLocalMaximaDetection) { + lmMap = Image.newFloatImage() + lmMap.assign(wrk) + this.getLocalMaximaMap(lmMap) + } + + /* + * Internal detection parameters + */ + // Signal detection threshold in local sigma units. + let snrThreshold = 0.1 + 4.8 * (1 - Math.range(this.sensitivity, 0, 1)) + // Peak detection threshold in kurtosis units. + let peakThreshold = 0.1 + 9.8 * (1 - Math.range(this.peakResponse, 0, 1)) + // Maximum distortion in coverage units. + let minCoverage = Math.PI4 * (1 - Math.range(this.maxDistortion, 0, 1)) + + // The detected stars + let S = new Array + + // Structure scanner + for (let y0 = 0, x1 = M.cols - 1, y1 = M.rows - 1; y0 < y1; ++y0) { + if (this.progressCallback != undefined) + if (!this.progressCallback(y0, M.rows)) + return null + + for (let x0 = 0; x0 < x1; ++x0) { + // Exclude background pixels and already visited pixels + if (M.at(y0, x0) == 0) + continue + + // Star pixel coordinates + let starPoints = new Array + + // Star bounding rectangle + let r = new Rect(x0, y0, x0 + 1, y0 + 1) + + // Grow star region downward + for (let y = y0, x = x0, xa, xb; ;) { + // Add this pixel to the current star + starPoints.push({ x: x, y: y }) + + // Explore the left segment of this row + for (xa = x; xa > 0;) { + if (M.at(y, xa - 1) == 0) + break + --xa + starPoints.push({ x: xa, y: y }) + } + + // Explore the right segment of this row + for (xb = x; xb < x1;) { + if (M.at(y, xb + 1) == 0) + break + ++xb + starPoints.push({ x: xb, y: y }) + } + + // xa and xb are now the left and right boundary limits, + // respectively, of this row in the current star. + + if (xa < r.x0) // update left boundary + r.x0 = xa + + if (xb >= r.x1) // update right boundary + r.x1 = xb + 1 // bottom-right corner excluded (PCL-specific) + + // Prepare for next row + ++y + + // Decide whether we are done with this star now, or if + // there is at least one more row that must be explored. + + let nextRow = false + + // Explore the next row from left to right. We'll continue + // gathering pixels if we find at least one nonzero map pixel. + for (x = xa; x <= xb; ++x) + if (M.at(y, x) != 0) { + nextRow = true + break + } + + if (!nextRow) + break + + // Update bottom boundary + r.y1 = y + 1 // Rect *excludes* the bottom-right corner + + // Terminate if we reach the last row of the image + if (y == y1) + break + } + + /* + * If this is a reliable star, compute its barycenter coordinates + * and add it to the star list. + * + * Rejection criteria: + * + * * Stars whose peak values are greater than the upperLimit + * parameter are rejected. + * + * * If this structure is touching a border of the image, reject + * it. We cannot compute an accurate position for a clipped star. + * + * * Too small structures are rejected. This mainly prevents + * inclusion of hot (or cold) pixels. This condition is enforced + * by the hot pixel removal and noise reduction steps performed + * during the structure detection phase, and optionally by + * increasing the minStructureSize parameter. + * + * * Too large structures are rejected. This prevents inclusion of + * extended nonstellar objects and saturated bright stars. This + * is also part of the structure detection algorithm. + * + * * Too elongated stars are rejected. The minCoverage parameter + * determines the maximum distortion allowed. A perfect square + * has coverage = 1. The coverage of a perfect circle is pi/4. + * + * * Too sparse sources are rejected. This prevents detection of + * multiple stars where centroids cannot be well determined. + * + * * Too dim structures are rejected. The sensitivity parameter + * defines the sensitivity of the star detection algorithm in + * local sigma units. The minSNR parameter can be used to limit + * star detection to a subset of the brightest stars adaptively. + * + * * Too flat structures are rejected. The peakThreshold parameter + * defines the peak sensitivity of the star detection algorithm + * in kurtosis units. + */ + if (r.width > 1 && r.height > 1) + if (r.y0 > 0 && r.y1 <= y1 && r.x0 > 0 && r.x1 <= x1) + if (starPoints.length >= this.minStructureSize) { + let p = this.starParameters(wrk, r, starPoints, lmMap) + if (p != null) + if (p.max <= this.upperLimit) { + let d = Math.max(r.width, r.height) + if (p.count / d / d >= minCoverage) { + let ix = Math.trunc(p.pos.x) | 0 + let iy = Math.trunc(p.pos.y) | 0 + if (this.mask == undefined || this.mask.sample(ix, iy) != 0) { + let snr = (p.peak - p.bkg) / p.sigma + if (snr >= this.minSNR) { + let s1 = snr / snrThreshold + if (s1 >= 1) + if (s1 >= this.brightThreshold || p.kurt == 0 || p.kurt / peakThreshold >= 1) + S.push(new Star(p.pos, p.flux, p.bkg, p.rect, p.size, p.nmax, snr, p.peak)) + } + } + } + } + } + + // Erase this structure. + for (let i = 0; i < starPoints.length; ++i) { + let p = starPoints[i] + M.at(p.y, p.x, 0) + } + } + } + + // Sort the list of detected sources in descending brightness order. + S.sort((a, b) => (a.flux < b.flux) ? +1 : ((b.flux < a.flux) ? -1 : 0)) + + // Perform a soft garbage collection. This eases integration with very + // long batch tasks and has no measurable performance penalty. + gc(false/*hard*/) + + if (this.progressCallback != undefined) + if (!this.progressCallback(M.rows, M.rows)) + return null + + return S + } +} + +StarDetector.prototype = new Object + +function computeHfr(image, s) { + let a = 0 + let b = 0 + + const r = Math.min(s.rect.y1 - s.rect.y0, s.rect.x1 - s.rect.x0) / 2 + + for (let y = s.rect.y0; y <= s.rect.y1; y++) { + for (let x = s.rect.x0; x <= s.rect.x1; x++) { + if (x >= 0 && x < image.width && y >= 0 && y < image.height) { + const d = Math.sqrt((x - s.pos.x) * (x - s.pos.x) + (y - s.pos.y) * (y - s.pos.y)) + + if (d <= r) { + const p = image.sample(x, y) + const v = p - s.bkg + a += v * d + b += v + } + } + } + } + + s.hfr = b > 0.0 ? a / b : 0.0 +} + +function decodeParams(hex) { + const buffer = new Uint8Array(hex.length / 4) + + for (let i = 0; i < hex.length; i += 4) { + buffer[i / 4] = parseInt(hex.substr(i, 4), 16) + } + + return JSON.parse(String.fromCharCode.apply(null, buffer)) +} + +function detectStars() { + const data = { + success: true, + errorMessage: null, + stars: [], + } + + try { + const input = decodeParams(jsArguments[0]) + + const targetPath = input.targetPath + const statusPath = input.statusPath + const minSNR = input.minSNR + const invert = input.invert + + console.writeln("targetPath=" + targetPath) + console.writeln("statusPath=" + statusPath) + console.writeln("minSNR=" + minSNR) + console.writeln("invert=" + invert) + + const P = new StarDetector + P.structureLayers = 5 + P.hotPixelFilterRadius = 1 + P.applyHotPixelFilterToDetectionImage = false + P.noiseReductionFilterRadius = 0 + P.sensitivity = 0.5 + P.peakResponse = 0.5 + P.allowClusteredSources = false + P.localDetectionFilterRadius = 2 + P.localMaximaDetectionLimit = 0.75 + P.noLocalMaximaDetection = false + P.maxDistortion = 0.6 + P.brightThreshold = 3 + P.minSNR = minSNR + P.minStructureSize = 1 + P.upperLimit = 1.0 + P.invert = invert + P.xyStretch = 1.5 + + const window = ImageWindow.open(targetPath) + const image = window[0].mainView.image + + const sl = P.stars(image) + + for (let i = 0; i < sl.length; i++) { + const s = sl[i] + computeHfr(image, s) + data.stars.push({ x: s.pos.x, y: s.pos.y, flux: s.flux * 65536, size: s.size, nmax: s.nmax, bkg: s.bkg, x0: s.rect.x0, y0: s.rect.y0, x1: s.rect.x1, y1: s.rect.y1, snr: s.snr, peak: s.peak, hfd: 2 * s.hfr }) + } + + window[0].forceClose() + + console.writeln("star detection finished. stars=", sl.length) + } catch (e) { + data.success = false + data.errorMessage = e.message + console.writeln(data.errorMessage) + } finally { + File.writeTextFile(statusPath, "@" + JSON.stringify(data) + "#") + } +} + +detectStars() diff --git a/nebulosa-pixinsight/src/main/resources/pixinsight/PixelMath.js b/nebulosa-pixinsight/src/main/resources/pixinsight/PixelMath.js new file mode 100644 index 000000000..7c335ff77 --- /dev/null +++ b/nebulosa-pixinsight/src/main/resources/pixinsight/PixelMath.js @@ -0,0 +1,102 @@ +function decodeParams(hex) { + const buffer = new Uint8Array(hex.length / 4) + + for (let i = 0; i < hex.length; i += 4) { + buffer[i / 4] = parseInt(hex.substr(i, 4), 16) + } + + return JSON.parse(String.fromCharCode.apply(null, buffer)) +} + +function pixelMath() { + const data = { + success: true, + errorMessage: null, + stackedImage: null, + } + + try { + const input = decodeParams(jsArguments[0]) + + const statusPath = input.statusPath + const inputPaths = input.inputPaths + const outputPath = input.outputPath + let expressionRK = input.expressionRK + let expressionG = input.expressionG + let expressionB = input.expressionB + + console.writeln("statusPath=" + statusPath) + console.writeln("inputPaths=" + inputPaths) + console.writeln("outputPath=" + outputPath) + + const windows = [] + + for (let i = 0; i < inputPaths.length; i++) { + windows.push(ImageWindow.open(inputPaths[i])[0]) + } + + for (let i = 0; i < windows.length; i++) { + if (expressionRK) { + expressionRK = expressionRK.replace("{{" + i + "}}", windows[i].mainView.id) + } + if (expressionG) { + expressionG = expressionG.replace("{{" + i + "}}", windows[i].mainView.id) + } + if (expressionB) { + expressionB = expressionB.replace("{{" + i + "}}", windows[i].mainView.id) + } + } + + console.writeln("expressionRK=" + expressionRK) + console.writeln("expressionG=" + expressionG) + console.writeln("expressionB=" + expressionB) + + var P = new PixelMath + P.expression = expressionRK || "" + P.expression1 = expressionG || "" + P.expression2 = expressionB || "" + P.expression3 = "" + P.useSingleExpression = false + P.symbols = "" + P.clearImageCacheAndExit = false + P.cacheGeneratedImages = false + P.generateOutput = true + P.singleThreaded = false + P.optimization = true + P.use64BitWorkingImage = false + P.rescale = false + P.rescaleLower = 0 + P.rescaleUpper = 1 + P.truncate = true + P.truncateLower = 0 + P.truncateUpper = 1 + P.createNewImage = false + P.showNewImage = false + P.newImageId = "" + P.newImageWidth = 0 + P.newImageHeight = 0 + P.newImageAlpha = false + P.newImageColorSpace = PixelMath.prototype.SameAsTarget + P.newImageSampleFormat = PixelMath.prototype.SameAsTarget + + P.executeOn(windows[0].mainView) + + windows[0].saveAs(outputPath, false, false, false, false) + + for (let i = 0; i < windows.length; i++) { + windows[i].forceClose() + } + + data.stackedImage = outputPath + + console.writeln("stacking finished") + } catch (e) { + data.success = false + data.errorMessage = e.message + console.writeln(data.errorMessage) + } finally { + File.writeTextFile(statusPath, "@" + JSON.stringify(data) + "#") + } +} + +pixelMath() diff --git a/nebulosa-pixinsight/src/main/resources/pixinsight/Startup.js b/nebulosa-pixinsight/src/main/resources/pixinsight/Startup.js new file mode 100644 index 000000000..3d9a7c5eb --- /dev/null +++ b/nebulosa-pixinsight/src/main/resources/pixinsight/Startup.js @@ -0,0 +1 @@ +File.writeTextFile(jsArguments[0], "STARTED") diff --git a/nebulosa-pixinsight/src/test/kotlin/PixInsightScriptTest.kt b/nebulosa-pixinsight/src/test/kotlin/PixInsightScriptTest.kt new file mode 100644 index 000000000..2bc11d4d2 --- /dev/null +++ b/nebulosa-pixinsight/src/test/kotlin/PixInsightScriptTest.kt @@ -0,0 +1,65 @@ +import io.kotest.core.annotation.EnabledIf +import io.kotest.engine.spec.tempdir +import io.kotest.engine.spec.tempfile +import io.kotest.matchers.booleans.shouldBeTrue +import io.kotest.matchers.doubles.plusOrMinus +import io.kotest.matchers.nulls.shouldNotBeNull +import io.kotest.matchers.paths.shouldExist +import io.kotest.matchers.shouldBe +import nebulosa.pixinsight.script.* +import nebulosa.test.AbstractFitsAndXisfTest +import nebulosa.test.NonGitHubOnlyCondition +import java.nio.file.Files +import java.nio.file.Path + +@EnabledIf(NonGitHubOnlyCondition::class) +class PixInsightScriptTest : AbstractFitsAndXisfTest() { + + init { + val runner = PixInsightScriptRunner(Path.of("PixInsight")) + val workingDirectory = tempdir("pi-").toPath() + + "startup" { + PixInsightStartup(PixInsightScript.DEFAULT_SLOT) + .use { it.runSync(runner).shouldBeTrue() } + } + "is running" { + PixInsightIsRunning(PixInsightScript.DEFAULT_SLOT) + .use { it.runSync(runner).shouldBeTrue() } + } + "calibrate" { + PixInsightCalibrate(PixInsightScript.UNSPECIFIED_SLOT, workingDirectory, PI_01_LIGHT, PI_DARK, PI_FLAT, PI_BIAS) + .use { it.runSync(runner).also(::println).outputImage.shouldNotBeNull().shouldExist() } + } + "align" { + PixInsightAlign(PixInsightScript.UNSPECIFIED_SLOT, workingDirectory, PI_01_LIGHT, PI_02_LIGHT) + .use { it.runSync(runner).also(::println).outputImage.shouldNotBeNull().shouldExist() } + } + "detect stars" { + PixInsightDetectStars(PixInsightScript.UNSPECIFIED_SLOT, PI_FOCUS_0) + .use { it.runSync(runner).also(::println).stars } + .map { it.hfd } + .average() shouldBe (8.43 plusOrMinus 1e-2) + + PixInsightDetectStars(PixInsightScript.UNSPECIFIED_SLOT, PI_FOCUS_30000) + .use { it.runSync(runner).also(::println).stars } + .map { it.hfd } + .average() shouldBe (1.85 plusOrMinus 1e-2) + + PixInsightDetectStars(PixInsightScript.UNSPECIFIED_SLOT, PI_FOCUS_100000) + .use { it.runSync(runner).also(::println).stars } + .map { it.hfd } + .average() shouldBe (18.35 plusOrMinus 1e-2) + } + "pixel math" { + val outputPath = Files.createTempFile("pi-stacked-", ".fits") + PixInsightPixelMath(PixInsightScript.UNSPECIFIED_SLOT, listOf(PI_01_LIGHT, PI_02_LIGHT), outputPath, "{{0}} + {{1}}") + .use { it.runSync(runner).also(::println).stackedImage.shouldNotBeNull().shouldExist() } + } + "abe" { + val outputPath = tempfile("pi-", ".fits").toPath() + PixInsightAutomaticBackgroundExtractor(PixInsightScript.UNSPECIFIED_SLOT, PI_01_LIGHT, outputPath) + .use { it.runSync(runner).also(::println).outputImage.shouldNotBeNull() } + } + } +} diff --git a/nebulosa-pixinsight/src/test/kotlin/PixInsightStarDetectorTest.kt b/nebulosa-pixinsight/src/test/kotlin/PixInsightStarDetectorTest.kt new file mode 100644 index 000000000..75d38714e --- /dev/null +++ b/nebulosa-pixinsight/src/test/kotlin/PixInsightStarDetectorTest.kt @@ -0,0 +1,19 @@ +import io.kotest.core.annotation.EnabledIf +import io.kotest.matchers.collections.shouldHaveSize +import nebulosa.pixinsight.script.PixInsightScriptRunner +import nebulosa.pixinsight.stardetector.PixInsightStarDetector +import nebulosa.test.AbstractFitsAndXisfTest +import nebulosa.test.NonGitHubOnlyCondition +import java.nio.file.Path + +@EnabledIf(NonGitHubOnlyCondition::class) +class PixInsightStarDetectorTest : AbstractFitsAndXisfTest() { + + init { + "detect stars" { + val runner = PixInsightScriptRunner(Path.of("PixInsight")) + val detectedStars = PixInsightStarDetector(runner, 0).detect(NGC3344_MONO_8_FITS) + detectedStars shouldHaveSize 15 + } + } +} diff --git a/nebulosa-plate-solving/src/main/kotlin/nebulosa/plate/solving/PlateSolvingException.kt b/nebulosa-plate-solving/src/main/kotlin/nebulosa/plate/solving/PlateSolvingException.kt deleted file mode 100644 index 1adb722af..000000000 --- a/nebulosa-plate-solving/src/main/kotlin/nebulosa/plate/solving/PlateSolvingException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package nebulosa.plate.solving - -open class PlateSolvingException(message: String) : Exception(message) diff --git a/nebulosa-plate-solving/build.gradle.kts b/nebulosa-platesolver/build.gradle.kts similarity index 100% rename from nebulosa-plate-solving/build.gradle.kts rename to nebulosa-platesolver/build.gradle.kts diff --git a/nebulosa-plate-solving/src/main/kotlin/nebulosa/plate/solving/Parity.kt b/nebulosa-platesolver/src/main/kotlin/nebulosa/platesolver/Parity.kt similarity index 60% rename from nebulosa-plate-solving/src/main/kotlin/nebulosa/plate/solving/Parity.kt rename to nebulosa-platesolver/src/main/kotlin/nebulosa/platesolver/Parity.kt index 4c3eb5100..38253c140 100644 --- a/nebulosa-plate-solving/src/main/kotlin/nebulosa/plate/solving/Parity.kt +++ b/nebulosa-platesolver/src/main/kotlin/nebulosa/platesolver/Parity.kt @@ -1,4 +1,4 @@ -package nebulosa.plate.solving +package nebulosa.platesolver enum class Parity { NORMAL, diff --git a/nebulosa-plate-solving/src/main/kotlin/nebulosa/plate/solving/PlateSolution.kt b/nebulosa-platesolver/src/main/kotlin/nebulosa/platesolver/PlateSolution.kt similarity index 90% rename from nebulosa-plate-solving/src/main/kotlin/nebulosa/plate/solving/PlateSolution.kt rename to nebulosa-platesolver/src/main/kotlin/nebulosa/platesolver/PlateSolution.kt index a09b66de3..04a6d68df 100644 --- a/nebulosa-plate-solving/src/main/kotlin/nebulosa/plate/solving/PlateSolution.kt +++ b/nebulosa-platesolver/src/main/kotlin/nebulosa/platesolver/PlateSolution.kt @@ -1,4 +1,4 @@ -package nebulosa.plate.solving +package nebulosa.platesolver import nebulosa.fits.FitsHeader import nebulosa.fits.FitsKeyword @@ -7,10 +7,7 @@ import nebulosa.image.format.ReadableHeader import nebulosa.log.loggerFor import nebulosa.math.* import nebulosa.wcs.computeCdMatrix -import kotlin.math.abs -import kotlin.math.atan2 -import kotlin.math.cos -import kotlin.math.hypot +import kotlin.math.* data class PlateSolution( @JvmField val solved: Boolean = false, @@ -22,8 +19,8 @@ data class PlateSolution( @JvmField val height: Angle = 0.0, @JvmField val parity: Parity = Parity.NORMAL, @JvmField val radius: Angle = hypot(width, height).rad / 2.0, - @JvmField val widthInPixels: Double = width / scale, - @JvmField val heightInPixels: Double = height / scale, + @JvmField val widthInPixels: Double = truncate(width / scale), + @JvmField val heightInPixels: Double = truncate(height / scale), private val header: Collection = emptyList(), ) : FitsHeader.ReadOnly(header) { diff --git a/nebulosa-plate-solving/src/main/kotlin/nebulosa/plate/solving/PlateSolver.kt b/nebulosa-platesolver/src/main/kotlin/nebulosa/platesolver/PlateSolver.kt similarity index 80% rename from nebulosa-plate-solving/src/main/kotlin/nebulosa/plate/solving/PlateSolver.kt rename to nebulosa-platesolver/src/main/kotlin/nebulosa/platesolver/PlateSolver.kt index 27ef2dadb..b1672ca58 100644 --- a/nebulosa-plate-solving/src/main/kotlin/nebulosa/plate/solving/PlateSolver.kt +++ b/nebulosa-platesolver/src/main/kotlin/nebulosa/platesolver/PlateSolver.kt @@ -1,4 +1,4 @@ -package nebulosa.plate.solving +package nebulosa.platesolver import nebulosa.common.concurrency.cancel.CancellationToken import nebulosa.image.Image @@ -11,7 +11,7 @@ interface PlateSolver { fun solve( path: Path?, image: Image?, centerRA: Angle = 0.0, centerDEC: Angle = 0.0, radius: Angle = 0.0, - downsampleFactor: Int = 0, timeout: Duration? = null, + downsampleFactor: Int = 0, timeout: Duration = Duration.ZERO, cancellationToken: CancellationToken = CancellationToken.NONE, ): PlateSolution } diff --git a/nebulosa-platesolver/src/main/kotlin/nebulosa/platesolver/PlateSolverException.kt b/nebulosa-platesolver/src/main/kotlin/nebulosa/platesolver/PlateSolverException.kt new file mode 100644 index 000000000..bbca6f579 --- /dev/null +++ b/nebulosa-platesolver/src/main/kotlin/nebulosa/platesolver/PlateSolverException.kt @@ -0,0 +1,3 @@ +package nebulosa.platesolver + +open class PlateSolverException(message: String) : Exception(message) diff --git a/nebulosa-plate-solving/src/test/kotlin/PlateSolutionTest.kt b/nebulosa-platesolver/src/test/kotlin/PlateSolutionTest.kt similarity index 98% rename from nebulosa-plate-solving/src/test/kotlin/PlateSolutionTest.kt rename to nebulosa-platesolver/src/test/kotlin/PlateSolutionTest.kt index 90afd4273..9ef2a59f2 100644 --- a/nebulosa-plate-solving/src/test/kotlin/PlateSolutionTest.kt +++ b/nebulosa-platesolver/src/test/kotlin/PlateSolutionTest.kt @@ -7,7 +7,7 @@ import nebulosa.math.formatHMS import nebulosa.math.formatSignedDMS import nebulosa.math.toArcsec import nebulosa.math.toDegrees -import nebulosa.plate.solving.PlateSolution +import nebulosa.platesolver.PlateSolution class PlateSolutionTest : StringSpec() { diff --git a/nebulosa-siril/build.gradle.kts b/nebulosa-siril/build.gradle.kts new file mode 100644 index 000000000..eb0f4ddb0 --- /dev/null +++ b/nebulosa-siril/build.gradle.kts @@ -0,0 +1,22 @@ +plugins { + kotlin("jvm") + id("maven-publish") +} + +dependencies { + api(project(":nebulosa-common")) + api(project(":nebulosa-math")) + api(project(":nebulosa-livestacker")) + api(project(":nebulosa-platesolver")) + api(project(":nebulosa-stardetector")) + implementation(project(":nebulosa-log")) + testImplementation(project(":nebulosa-test")) +} + +publishing { + publications { + create("pluginMaven") { + from(components["java"]) + } + } +} diff --git a/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/Cd.kt b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/Cd.kt new file mode 100644 index 000000000..f99dba012 --- /dev/null +++ b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/Cd.kt @@ -0,0 +1,39 @@ +package nebulosa.siril.command + +import nebulosa.common.concurrency.latch.CountUpDownLatch +import nebulosa.common.exec.CommandLineListener +import nebulosa.siril.command.SirilCommand.Companion.SCRIPT_EXECUTION_FAILED +import java.nio.file.Path +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicBoolean + +/** + * Sets the new current working [directory]. + */ +data class Cd(@JvmField val directory: Path) : SirilCommand, CommandLineListener { + + private val latch = CountUpDownLatch(1) + private val success = AtomicBoolean() + + override fun onLineRead(line: String) { + if (line.startsWith(SCRIPT_EXECUTION_FAILED)) { + success.set(false) + } else if (line.startsWith("log: Setting CWD")) { + success.set(true) + } else { + return + } + + latch.reset() + } + + override fun write(commandLine: SirilCommandLine): Boolean { + return try { + commandLine.registerCommandLineListener(this) + commandLine.write("cd $directory") + latch.await(30, TimeUnit.SECONDS) && success.get() + } finally { + commandLine.unregisterCommandLineListener(this) + } + } +} diff --git a/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/DumpHeader.kt b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/DumpHeader.kt new file mode 100644 index 000000000..a17992ba3 --- /dev/null +++ b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/DumpHeader.kt @@ -0,0 +1,58 @@ +package nebulosa.siril.command + +import nebulosa.common.concurrency.latch.CountUpDownLatch +import nebulosa.common.exec.CommandLineListener +import nebulosa.fits.FitsHeader +import nebulosa.fits.FitsHeaderCard +import nebulosa.image.format.Header +import nebulosa.log.debug +import nebulosa.log.loggerFor +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicBoolean + +data class DumpHeader(private val header: Header = FitsHeader()) : SirilCommand
, CommandLineListener { + + private val latch = CountUpDownLatch(1) + private val started = AtomicBoolean() + private val finished = AtomicBoolean() + + override fun onLineRead(line: String) { + if (finished.get()) return + + if (started.get()) { + val card = line.replaceFirst("log: ", "").trimStart() + + try { + with(FitsHeaderCard.from(card)) { + header.add(this) + + LOG.debug { line } + + if (key == "END") { + finished.set(true) + latch.reset() + } + } + } catch (ignored: Throwable) { + } + } else if (line.contains("FITS header for currently loaded image", true)) { + started.set(true) + } + } + + override fun write(commandLine: SirilCommandLine): Header { + return try { + commandLine.registerCommandLineListener(this) + commandLine.write("dumpheader") + latch.await(15, TimeUnit.SECONDS) + header + } finally { + commandLine.unregisterCommandLineListener(this) + } + } + + companion object { + + @JvmStatic private val LOG = loggerFor() + } +} diff --git a/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/Exit.kt b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/Exit.kt new file mode 100644 index 000000000..ab5f724e6 --- /dev/null +++ b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/Exit.kt @@ -0,0 +1,11 @@ +package nebulosa.siril.command + +/** + * Quits the application. + */ +data object Exit : SirilCommand { + + override fun write(commandLine: SirilCommandLine) { + commandLine.write("exit") + } +} diff --git a/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/FindStar.kt b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/FindStar.kt new file mode 100644 index 000000000..5f2fc4e50 --- /dev/null +++ b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/FindStar.kt @@ -0,0 +1,113 @@ +package nebulosa.siril.command + +import nebulosa.common.concurrency.latch.CountUpDownLatch +import nebulosa.common.exec.CommandLineListener +import nebulosa.fits.height +import nebulosa.log.debug +import nebulosa.log.loggerFor +import nebulosa.stardetector.StarPoint +import java.io.Closeable +import java.nio.file.Files +import java.nio.file.Path +import java.util.concurrent.TimeUnit +import kotlin.io.path.bufferedReader + +/** + * Detects stars in the currently loaded image. + */ +data class FindStar( + @JvmField val path: Path, + @JvmField val maxStars: Int = 0, +) : SirilCommand>, CommandLineListener, Closeable { + + data class Star( + override val x: Double, + override val y: Double, + override val hfd: Double, + override val snr: Double, + override val flux: Double, + ) : StarPoint + + private val outputPath by lazy { Files.createTempFile("siril-", ".txt") } + + private val command by lazy { + buildString(256) { + append("findstar \"-out=$outputPath\"") + if (maxStars > 0) append(" -maxstars=$maxStars") + } + } + + private val latch = CountUpDownLatch(0) + + override fun onLineRead(line: String) { + LOG.debug { line } + + if (line.startsWith("log: The file") && line.endsWith("has been created.")) { + latch.reset() + } + } + + override fun onExit(exitCode: Int, exception: Throwable?) { + latch.reset() + } + + override fun write(commandLine: SirilCommandLine): List { + if (commandLine.execute(Load(path))) { + try { + latch.countUp() + + commandLine.registerCommandLineListener(this) + commandLine.write(command) + + if (!latch.await(15, TimeUnit.SECONDS)) { + return emptyList() + } + } finally { + commandLine.unregisterCommandLineListener(this) + close() + } + + val header = commandLine.execute(DumpHeader()) + Thread.sleep(1000) + return outputPath.parseStars(header.height) + } else { + return emptyList() + } + } + + override fun close() { + // outputPath.deleteIfExists() + } + + companion object { + + const val FWHM = 1.1774100225154747 // sqrt(2 * ln(2)) + + @JvmStatic private val LOG = loggerFor() + + @JvmStatic + private fun Path.parseStars(height: Int): List { + val stars = ArrayList(256) + + bufferedReader().use { + for (line in it.lines()) { + if (line.startsWith('#')) continue + + val columns = line.split('\t') + val flux = columns[3].trim().toDouble() // A ??? + val x = columns[5].trim().toDouble() // X + val y = columns[6].trim().toDouble() // Y + val fwhmx = columns[7].trim().toDouble() // FWHMx [px] + val fwhmy = columns[8].trim().toDouble() // FWHMy [px] + val snr = columns[12].trim().toDouble() // RMSE ??? + val fwhm = (fwhmx + fwhmy) / 2.0 + val hfd = fwhm / FWHM + + stars.add(Star(x, height - y, hfd, snr, flux)) + } + } + + return stars + } + } +} diff --git a/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/LiveStack.kt b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/LiveStack.kt new file mode 100644 index 000000000..e880af8e1 --- /dev/null +++ b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/LiveStack.kt @@ -0,0 +1,57 @@ +package nebulosa.siril.command + +import nebulosa.common.concurrency.latch.CountUpDownLatch +import nebulosa.common.exec.CommandLineListener +import java.nio.file.Path +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicBoolean + +/** + * Processes the provided [path] for live stacking. + */ +data class LiveStack(@JvmField val path: Path) : SirilCommand, CommandLineListener { + + private val latch = CountUpDownLatch(1) + private val success = AtomicBoolean() + + override fun onLineRead(line: String) { + if (SUCCESSFUL_LOGS.any { line.startsWith(it, true) }) { + success.set(true) + } else if (FAILED_LOGS.any { line.contains(it, true) }) { + success.set(false) + } else { + return + } + + latch.reset() + } + + override fun onExit(exitCode: Int, exception: Throwable?) { + latch.reset() + } + + override fun write(commandLine: SirilCommandLine): Boolean { + return try { + commandLine.registerCommandLineListener(this) + commandLine.write("livestack \"$path\"") + latch.await(60, TimeUnit.SECONDS) + } finally { + commandLine.unregisterCommandLineListener(this) + } + } + + companion object { + + @JvmStatic private val SUCCESSFUL_LOGS = arrayOf( + "log: Waiting for second image", + "log: Stacked image", + "log: Live stacking waiting for files" + ) + + @JvmStatic private val FAILED_LOGS = arrayOf( + "Not enough stars", + "Sequence processing partially succeeded", + "Script execution failed", + ) + } +} diff --git a/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/Load.kt b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/Load.kt new file mode 100644 index 000000000..ebcc84b36 --- /dev/null +++ b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/Load.kt @@ -0,0 +1,39 @@ +package nebulosa.siril.command + +import nebulosa.common.concurrency.latch.CountUpDownLatch +import nebulosa.common.exec.CommandLineListener +import nebulosa.siril.command.SirilCommand.Companion.SCRIPT_EXECUTION_FAILED +import java.nio.file.Path +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicBoolean + +/** + * Loads the image at [path]. + */ +data class Load(@JvmField val path: Path) : SirilCommand, CommandLineListener { + + private val latch = CountUpDownLatch(1) + private val success = AtomicBoolean() + + override fun onLineRead(line: String) { + if (line.startsWith("log: Reading FITS")) { + success.set(true) + } else if (line.startsWith("log: Error opening image") || line.startsWith(SCRIPT_EXECUTION_FAILED)) { + success.set(false) + } else { + return + } + + latch.reset() + } + + override fun write(commandLine: SirilCommandLine): Boolean { + return try { + commandLine.registerCommandLineListener(this) + commandLine.write("load $path") + latch.await(30, TimeUnit.SECONDS) && success.get() + } finally { + commandLine.unregisterCommandLineListener(this) + } + } +} diff --git a/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/PlateSolve.kt b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/PlateSolve.kt new file mode 100644 index 000000000..df72d7bd3 --- /dev/null +++ b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/PlateSolve.kt @@ -0,0 +1,180 @@ +package nebulosa.siril.command + +import nebulosa.common.concurrency.latch.CountUpDownLatch +import nebulosa.common.exec.CommandLineListener +import nebulosa.log.debug +import nebulosa.log.loggerFor +import nebulosa.math.* +import nebulosa.platesolver.Parity +import nebulosa.platesolver.PlateSolution +import java.nio.file.Path +import java.time.Duration +import java.util.concurrent.atomic.AtomicBoolean + +/** + * Plate solves the loaded image. + * + * ```txt + * log: Up is +164.28 deg ClockWise wrt. N + * log: Resolution: 1.368 arcsec/px + * log: Focal length: 1395.85 mm + * log: Pixel size: 9.26 µm + * log: Field of view: 47' 15.23" x 32' 9.38" + * log: Saved focal length 1395.85 and pixel size 9.26 as default values + * log: Image center: alpha: 13h25m38s, delta: -43°00'52" + * ``` + */ +data class PlateSolve( + @JvmField val path: Path, + @JvmField val focalLength: Double = 0.0, + @JvmField val pixelSize: Double = 0.0, + @JvmField val useCenterCoordinates: Boolean = false, + @JvmField val rightAscension: Angle = 0.0, val declination: Angle = 0.0, + @JvmField val downsampleFactor: Int = 0, + @JvmField val timeout: Duration = Duration.ZERO, +) : SirilCommand, CommandLineListener { + + private val command by lazy { + buildString(256) { + append("platesolve") + if (useCenterCoordinates) append(" ${rightAscension.toHours},${declination.toDegrees}") + append(" -platesolve -noflip") + if (focalLength > 0.0) append(" -focal=$focalLength") + if (pixelSize > 0.0) append(" -pixelsize=$pixelSize") + if (downsampleFactor > 1) append(" -downscale") + } + } + + private val latch = CountUpDownLatch(1) + private val success = AtomicBoolean() + private val exited = AtomicBoolean() + + @Volatile private var orientation: Angle = 0.0 + @Volatile private var parity = Parity.NORMAL + @Volatile private var resolution: Angle = 0.0 + @Volatile private var fovWidth: Angle = 0.0 + @Volatile private var fovHeight: Angle = 0.0 + @Volatile private var imageCenterRA: Angle = 0.0 + @Volatile private var imageCenterDEC: Angle = 0.0 + + override fun onLineRead(line: String) { + LOG.debug { line } + + if (line.matchesOrientation() || line.matchesUndeterminatedOrientation() || + line.matchesResolution() || line.matchesFOV() + ) { + return + } + + if (line.matchesImageCenter()) { + success.set(true) + latch.reset() + } + } + + override fun onExit(exitCode: Int, exception: Throwable?) { + LOG.info("plate solver finished. exitCode={}", exitCode, exception) + exited.set(true) + latch.reset() + } + + override fun write(commandLine: SirilCommandLine): PlateSolution { + if (commandLine.execute(Load(path))) { + LOG.info("plate solver started. pid={}", commandLine.pid) + + try { + commandLine.registerCommandLineListener(this) + commandLine.write(command) + + if (!latch.await(maxOf(timeout, MIN_TIMEOUT)) || exited.get() || !success.get()) { + return PlateSolution.NO_SOLUTION + } + } finally { + commandLine.unregisterCommandLineListener(this) + } + + if (success.get()) { + return PlateSolution(true, orientation, resolution, imageCenterRA, imageCenterDEC, fovWidth, fovHeight, parity) + } + } else { + LOG.error("failed to load $path") + } + + return PlateSolution.NO_SOLUTION + } + + private fun String.matchesOrientation(): Boolean { + val m = ORIENTATION_REGEX.matchEntire(this) ?: return false + orientation = m.groupValues[1].toDouble().deg + parity = if ("flipped" in this) Parity.FLIPPED else Parity.NORMAL + return true + } + + private fun String.matchesUndeterminatedOrientation(): Boolean { + return if (startsWith(UNDETERMINED_ORIENTATION_REGEX)) { + orientation = 0.0 + true + } else { + false + } + } + + private fun String.matchesResolution(): Boolean { + val m = RESOLUTION_REGEX.matchEntire(this) ?: return false + resolution = m.groupValues[1].toDouble().arcsec + return true + } + + private fun String.matchesFOV(): Boolean { + val m = FOV_REGEX.matchEntire(this) ?: return false + val (_, width, height) = m.groupValues + fovWidth = width.parseFovInDHMS() + fovHeight = height.parseFovInDHMS() + return true + } + + private fun String.matchesImageCenter(): Boolean { + val m = IMAGE_CENTER_REGEX.matchEntire(this) ?: return false + val (_, alpha, delta) = m.groupValues + imageCenterRA = alpha.hours + imageCenterDEC = delta.deg + return true + } + + companion object { + + @JvmStatic private val LOG = loggerFor() + @JvmStatic private val MIN_TIMEOUT = Duration.ofSeconds(30) + + private const val INT_REGEX = "\\d+" + private const val SIGNED_INT_REGEX = "[-+]?$INT_REGEX" + private const val FLOAT_REGEX = "$SIGNED_INT_REGEX(?:\\.$INT_REGEX)?" + + // https://gitlab.com/free-astro/siril/-/blob/master/src/algos/astrometry_solver.c + + @JvmStatic private val ORIENTATION_REGEX = "log: Up is ($FLOAT_REGEX) deg ClockWise wrt. N( \\(flipped\\))?".toRegex() + private const val UNDETERMINED_ORIENTATION_REGEX = "log: Up position wrt. N is undetermined" + @JvmStatic private val RESOLUTION_REGEX = "log: Resolution:\\s*($FLOAT_REGEX) arcsec/px".toRegex() + @JvmStatic private val FOV_REGEX = "log: Field of view:\\s*(.*) x (.*)".toRegex() + @JvmStatic private val IMAGE_CENTER_REGEX = "log: Image center: alpha: (.*), delta: (.*)".toRegex() + + @JvmStatic + private fun String.parseFovInDHMS(): Angle { + val parts = split(" ") + + var value = 0.0 + + for (part in parts) { + if (part.endsWith('d')) { + value = part.substring(0, part.length - 1).toDouble() + } else if (part.endsWith('m') || part.endsWith('\'')) { + value += part.substring(0, part.length - 1).toDouble() / 60.0 + } else if (part.endsWith('s') || part.endsWith('"')) { + value += part.substring(0, part.length - 1).toDouble() / 3600.0 + } + } + + return value.deg + } + } +} diff --git a/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/Requires.kt b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/Requires.kt new file mode 100644 index 000000000..4dafe6c17 --- /dev/null +++ b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/Requires.kt @@ -0,0 +1,13 @@ +package nebulosa.siril.command + +/** + * Returns an error if the version of Siril is older than the one passed in argument. + */ +data object Requires : SirilCommand { + + const val MIN_VERSION = "1.0.0" + + override fun write(commandLine: SirilCommandLine) { + commandLine.write("requires $MIN_VERSION") + } +} diff --git a/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/SirilCommand.kt b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/SirilCommand.kt new file mode 100644 index 000000000..ad6bf8b7a --- /dev/null +++ b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/SirilCommand.kt @@ -0,0 +1,14 @@ +package nebulosa.siril.command + +/** + * @see Commands + */ +sealed interface SirilCommand { + + fun write(commandLine: SirilCommandLine): T + + companion object { + + internal const val SCRIPT_EXECUTION_FAILED = "log: Script execution failed" + } +} diff --git a/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/SirilCommandLine.kt b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/SirilCommandLine.kt new file mode 100644 index 000000000..23d873705 --- /dev/null +++ b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/SirilCommandLine.kt @@ -0,0 +1,64 @@ +package nebulosa.siril.command + +import nebulosa.common.concurrency.cancel.CancellationListener +import nebulosa.common.concurrency.cancel.CancellationSource +import nebulosa.common.exec.CommandLineListener +import nebulosa.common.exec.commandLine +import nebulosa.log.debug +import nebulosa.log.loggerFor +import java.io.Closeable +import java.nio.file.Path + +data class SirilCommandLine(private val executablePath: Path) : Runnable, CancellationListener, Closeable { + + private val commandLine = commandLine { + executablePath(executablePath) + putArg("-s", "-") + } + + val isRunning + get() = commandLine.isRunning + + val pid + get() = commandLine.pid + + fun registerCommandLineListener(listener: CommandLineListener) { + commandLine.registerCommandLineListener(listener) + } + + fun unregisterCommandLineListener(listener: CommandLineListener) { + commandLine.unregisterCommandLineListener(listener) + } + + override fun run() { + if (!commandLine.isRunning) { + commandLine.start() + execute(Requires) + } + } + + internal fun write(command: String) { + if (commandLine.isRunning) { + LOG.debug { "writing command: $command" } + commandLine.writer.println(command) + } + } + + fun execute(command: SirilCommand): T { + return command.write(this) + } + + override fun onCancel(source: CancellationSource) { + close() + } + + override fun close() { + execute(Exit) + commandLine.stop() + } + + companion object { + + @JvmStatic private val LOG = loggerFor() + } +} diff --git a/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/StartLs.kt b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/StartLs.kt new file mode 100644 index 000000000..716b47754 --- /dev/null +++ b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/StartLs.kt @@ -0,0 +1,53 @@ +package nebulosa.siril.command + +import nebulosa.common.concurrency.latch.CountUpDownLatch +import nebulosa.common.exec.CommandLineListener +import java.nio.file.Path +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicBoolean +import kotlin.io.path.exists +import kotlin.io.path.isRegularFile + +/** + * Initializes a livestacking session. + */ +data class StartLs( + @JvmField val dark: Path? = null, + @JvmField val flat: Path? = null, + @JvmField val use32Bits: Boolean = false, +) : SirilCommand, CommandLineListener { + + private val command by lazy { + buildString(256) { + append("start_ls") + if (dark != null && dark.exists() && dark.isRegularFile()) append(" \"-dark=$dark\"") + if (flat != null && flat.exists() && flat.isRegularFile()) append(" \"-flat=$flat\"") + if (use32Bits) append(" -32bits") + } + } + + private val latch = CountUpDownLatch(1) + private val success = AtomicBoolean() + + override fun onLineRead(line: String) { + if (line.startsWith("log: Live stacking waiting for files")) { + success.set(true) + } else if (line.startsWith(SirilCommand.SCRIPT_EXECUTION_FAILED)) { + success.set(false) + } else { + return + } + + latch.reset() + } + + override fun write(commandLine: SirilCommandLine): Boolean { + return try { + commandLine.registerCommandLineListener(this) + commandLine.write(command) + latch.await(30, TimeUnit.SECONDS) && success.get() + } finally { + commandLine.unregisterCommandLineListener(this) + } + } +} diff --git a/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/StopLs.kt b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/StopLs.kt new file mode 100644 index 000000000..03298c976 --- /dev/null +++ b/nebulosa-siril/src/main/kotlin/nebulosa/siril/command/StopLs.kt @@ -0,0 +1,11 @@ +package nebulosa.siril.command + +/** + * Stops the live stacking session. + */ +data object StopLs : SirilCommand { + + override fun write(commandLine: SirilCommandLine) { + commandLine.write("stop_ls") + } +} diff --git a/nebulosa-siril/src/main/kotlin/nebulosa/siril/livestacker/SirilLiveStacker.kt b/nebulosa-siril/src/main/kotlin/nebulosa/siril/livestacker/SirilLiveStacker.kt new file mode 100644 index 000000000..3e1a89708 --- /dev/null +++ b/nebulosa-siril/src/main/kotlin/nebulosa/siril/livestacker/SirilLiveStacker.kt @@ -0,0 +1,101 @@ +package nebulosa.siril.livestacker + +import nebulosa.common.concurrency.latch.CountUpDownLatch +import nebulosa.common.exec.CommandLineListener +import nebulosa.livestacker.LiveStacker +import nebulosa.log.debug +import nebulosa.log.loggerFor +import nebulosa.siril.command.* +import java.nio.file.Path +import kotlin.io.path.deleteIfExists +import kotlin.io.path.isSymbolicLink +import kotlin.io.path.listDirectoryEntries +import kotlin.io.path.name + +data class SirilLiveStacker( + private val executablePath: Path, + private val workingDirectory: Path, + private val dark: Path? = null, + private val flat: Path? = null, + private val use32Bits: Boolean = false, +) : LiveStacker, CommandLineListener { + + private val commandLine = SirilCommandLine(executablePath) + private val waitForStacking = CountUpDownLatch() + + override val isRunning + get() = commandLine.isRunning + + override val isStacking + get() = !waitForStacking.get() + + @Synchronized + override fun start() { + if (!commandLine.isRunning) { + commandLine.registerCommandLineListener(this) + commandLine.run() + + LOG.info("live stacking started. pid={}", commandLine.pid) + + try { + check(commandLine.execute(Cd(workingDirectory))) { "failed to run cd command" } + check(commandLine.execute(StartLs(dark, flat, use32Bits))) { "failed to start livestacking" } + } catch (e: Throwable) { + commandLine.close() + throw e + } + } + } + + @Synchronized + override fun add(path: Path): Path? { + return if (commandLine.isRunning && commandLine.execute(LiveStack(path))) { + Path.of("$workingDirectory", "live_stack_00001.fit") + } else { + null + } + } + + @Synchronized + override fun stop() { + waitForStacking.reset() + commandLine.execute(StopLs) + commandLine.close() + } + + override fun close() { + stop() + workingDirectory.deleteStackingFiles() + } + + override fun onLineRead(line: String) { + LOG.debug { line } + } + + override fun onExit(exitCode: Int, exception: Throwable?) { + LOG.info("live stacking finished. exitCode={}", exitCode, exception) + } + + companion object { + + @JvmStatic private val LOG = loggerFor() + + @JvmStatic private val LIVE_STACK_FIT_REGEX = Regex("live_stack_\\d+.fit") + @JvmStatic private val LIVE_STACK_SEQ_REGEX = Regex("live_stack_\\d*.seq") + + @JvmStatic + fun Path.deleteStackingFiles() { + for (file in listDirectoryEntries("*.fit")) { + if (file.isSymbolicLink() && LIVE_STACK_FIT_REGEX.matches(file.name)) { + file.deleteIfExists() + } + } + + for (file in listDirectoryEntries("*.seq")) { + if (LIVE_STACK_SEQ_REGEX.matches(file.name)) { + file.deleteIfExists() + } + } + } + } +} diff --git a/nebulosa-siril/src/main/kotlin/nebulosa/siril/platesolver/SirilPlateSolver.kt b/nebulosa-siril/src/main/kotlin/nebulosa/siril/platesolver/SirilPlateSolver.kt new file mode 100644 index 000000000..9af5bd07c --- /dev/null +++ b/nebulosa-siril/src/main/kotlin/nebulosa/siril/platesolver/SirilPlateSolver.kt @@ -0,0 +1,37 @@ +package nebulosa.siril.platesolver + +import nebulosa.common.concurrency.cancel.CancellationToken +import nebulosa.image.Image +import nebulosa.math.Angle +import nebulosa.math.toDegrees +import nebulosa.platesolver.PlateSolution +import nebulosa.platesolver.PlateSolver +import nebulosa.siril.command.PlateSolve +import nebulosa.siril.command.SirilCommandLine +import java.nio.file.Path +import java.time.Duration + +data class SirilPlateSolver( + private val executablePath: Path, + private val focalLength: Double = 0.0, + private val pixelSize: Double = 0.0, +) : PlateSolver { + + override fun solve( + path: Path?, image: Image?, + centerRA: Angle, centerDEC: Angle, radius: Angle, + downsampleFactor: Int, timeout: Duration, cancellationToken: CancellationToken + ): PlateSolution { + val commandLine = SirilCommandLine(executablePath) + + return try { + commandLine.run() + cancellationToken.listen(commandLine) + val useCenterCoordinates = radius > 0.0 && radius.toDegrees >= 0.1 && centerRA.isFinite() && centerDEC.isFinite() + commandLine.execute(PlateSolve(path!!, focalLength, pixelSize, useCenterCoordinates, centerRA, centerDEC, downsampleFactor, timeout)) + } finally { + cancellationToken.unlisten(commandLine) + commandLine.close() + } + } +} diff --git a/nebulosa-siril/src/main/kotlin/nebulosa/siril/stardetector/SirilStarDetector.kt b/nebulosa-siril/src/main/kotlin/nebulosa/siril/stardetector/SirilStarDetector.kt new file mode 100644 index 000000000..78880f873 --- /dev/null +++ b/nebulosa-siril/src/main/kotlin/nebulosa/siril/stardetector/SirilStarDetector.kt @@ -0,0 +1,24 @@ +package nebulosa.siril.stardetector + +import nebulosa.siril.command.FindStar +import nebulosa.siril.command.SirilCommandLine +import nebulosa.stardetector.StarDetector +import nebulosa.stardetector.StarPoint +import java.nio.file.Path + +// https://gitlab.com/free-astro/siril/-/blob/master/src/algos/star_finder.c + +data class SirilStarDetector( + private val executablePath: Path, + private val maxStars: Int = 0, +) : StarDetector { + + override fun detect(input: Path): List { + val commandLine = SirilCommandLine(executablePath) + + return commandLine.use { + commandLine.run() + commandLine.execute(FindStar(input, maxStars)) + } + } +} diff --git a/nebulosa-siril/src/test/kotlin/SirilTest.kt b/nebulosa-siril/src/test/kotlin/SirilTest.kt new file mode 100644 index 000000000..7da243822 --- /dev/null +++ b/nebulosa-siril/src/test/kotlin/SirilTest.kt @@ -0,0 +1,82 @@ +import io.kotest.core.annotation.EnabledIf +import io.kotest.engine.spec.tempdir +import io.kotest.matchers.booleans.shouldBeTrue +import io.kotest.matchers.collections.shouldHaveSize +import io.kotest.matchers.doubles.plusOrMinus +import io.kotest.matchers.doubles.shouldBeExactly +import io.kotest.matchers.nulls.shouldNotBeNull +import io.kotest.matchers.shouldBe +import nebulosa.math.* +import nebulosa.platesolver.Parity +import nebulosa.siril.livestacker.SirilLiveStacker +import nebulosa.siril.platesolver.SirilPlateSolver +import nebulosa.siril.stardetector.SirilStarDetector +import nebulosa.test.AbstractFitsAndXisfTest +import nebulosa.test.NonGitHubOnlyCondition +import java.nio.file.Path +import kotlin.io.path.copyTo +import kotlin.io.path.listDirectoryEntries + +@EnabledIf(NonGitHubOnlyCondition::class) +class SirilTest : AbstractFitsAndXisfTest() { + + init { + val executablePath = Path.of("siril-cli") + + "live stacking" { + val workingDirectory = Path.of("/home/tiagohm/Git/nebulosa/data/siril") + + SirilLiveStacker(executablePath, workingDirectory).use { + it.start() + + val fitsDir = tempdir().toPath() + + PI_01_LIGHT.copyTo(Path.of("$fitsDir", "01.fits")) + PI_02_LIGHT.copyTo(Path.of("$fitsDir", "02.fits")) + PI_03_LIGHT.copyTo(Path.of("$fitsDir", "03.fits")) + PI_04_LIGHT.copyTo(Path.of("$fitsDir", "04.fits")) + + for (fits in fitsDir.listDirectoryEntries().shouldHaveSize(4).sorted()) { + it.add(fits).shouldNotBeNull() + } + + workingDirectory.listDirectoryEntries().shouldHaveSize(5) + } + + workingDirectory.listDirectoryEntries().shouldHaveSize(1) + } + "plate solver" { + val solver = SirilPlateSolver(executablePath) + val solution = solver.solve(PI_01_LIGHT, null) + + solution.solved.shouldBeTrue() + solution.orientation.toDegrees shouldBe (-90.02 plusOrMinus 1e-2) + solution.rightAscension.formatHMS() shouldBe "00h06m46.0s" + solution.declination.formatSignedDMS() shouldBe "+089°51'42.0\"" + solution.scale.toArcsec shouldBe (3.575 plusOrMinus 1e-3) + solution.width.formatDMS() shouldBe "001°16'16.3\"" + solution.height.formatDMS() shouldBe "001°01'01.1\"" + solution.parity shouldBe Parity.FLIPPED + solution.widthInPixels shouldBeExactly 1280.0 + solution.heightInPixels shouldBeExactly 1024.0 + } + "star detector" { + val detector = SirilStarDetector(executablePath) + + with(detector.detect(PI_FOCUS_0)) { + this shouldHaveSize 307 + map { it.hfd }.average() shouldBe (7.9 plusOrMinus 1e-1) + } + + with(detector.detect(PI_FOCUS_30000)) { + this shouldHaveSize 258 + map { it.hfd }.average() shouldBe (1.1 plusOrMinus 1e-1) + } + + with(detector.detect(PI_FOCUS_100000)) { + this shouldHaveSize 82 + map { it.hfd }.average() shouldBe (22.4 plusOrMinus 1e-1) + } + } + } +} diff --git a/nebulosa-skycatalog/src/main/kotlin/nebulosa/skycatalog/SkyObjectFilter.kt b/nebulosa-skycatalog/src/main/kotlin/nebulosa/skycatalog/SkyObjectFilter.kt deleted file mode 100644 index f06d75212..000000000 --- a/nebulosa-skycatalog/src/main/kotlin/nebulosa/skycatalog/SkyObjectFilter.kt +++ /dev/null @@ -1,5 +0,0 @@ -package nebulosa.skycatalog - -import java.util.function.Predicate - -fun interface SkyObjectFilter : Predicate diff --git a/nebulosa-star-detection/src/main/kotlin/nebulosa/star/detection/StarDetector.kt b/nebulosa-star-detection/src/main/kotlin/nebulosa/star/detection/StarDetector.kt deleted file mode 100644 index 126f370ce..000000000 --- a/nebulosa-star-detection/src/main/kotlin/nebulosa/star/detection/StarDetector.kt +++ /dev/null @@ -1,6 +0,0 @@ -package nebulosa.star.detection - -interface StarDetector { - - fun detect(input: T): List -} diff --git a/nebulosa-star-detection/build.gradle.kts b/nebulosa-stardetector/build.gradle.kts similarity index 100% rename from nebulosa-star-detection/build.gradle.kts rename to nebulosa-stardetector/build.gradle.kts diff --git a/nebulosa-stardetector/src/main/kotlin/nebulosa/stardetector/StarDetector.kt b/nebulosa-stardetector/src/main/kotlin/nebulosa/stardetector/StarDetector.kt new file mode 100644 index 000000000..bddb597ed --- /dev/null +++ b/nebulosa-stardetector/src/main/kotlin/nebulosa/stardetector/StarDetector.kt @@ -0,0 +1,6 @@ +package nebulosa.stardetector + +interface StarDetector { + + fun detect(input: T): List +} diff --git a/nebulosa-star-detection/src/main/kotlin/nebulosa/star/detection/ImageStar.kt b/nebulosa-stardetector/src/main/kotlin/nebulosa/stardetector/StarPoint.kt similarity index 60% rename from nebulosa-star-detection/src/main/kotlin/nebulosa/star/detection/ImageStar.kt rename to nebulosa-stardetector/src/main/kotlin/nebulosa/stardetector/StarPoint.kt index fb911bdca..936dce471 100644 --- a/nebulosa-star-detection/src/main/kotlin/nebulosa/star/detection/ImageStar.kt +++ b/nebulosa-stardetector/src/main/kotlin/nebulosa/stardetector/StarPoint.kt @@ -1,8 +1,8 @@ -package nebulosa.star.detection +package nebulosa.stardetector import nebulosa.math.Point2D -interface ImageStar : Point2D { +interface StarPoint : Point2D { val hfd: Double diff --git a/nebulosa-test/src/main/kotlin/nebulosa/test/AbstractFitsAndXisfTest.kt b/nebulosa-test/src/main/kotlin/nebulosa/test/AbstractFitsAndXisfTest.kt index 7fda567c9..f14f90738 100644 --- a/nebulosa-test/src/main/kotlin/nebulosa/test/AbstractFitsAndXisfTest.kt +++ b/nebulosa-test/src/main/kotlin/nebulosa/test/AbstractFitsAndXisfTest.kt @@ -109,6 +109,26 @@ abstract class AbstractFitsAndXisfTest : StringSpec() { protected val STAR_FOCUS_16 by lazy { download("STAR.FOCUS.16.fits", GITHUB_FITS_URL) } protected val STAR_FOCUS_17 by lazy { download("STAR.FOCUS.17.fits", GITHUB_FITS_URL) } + protected val PI_01_LIGHT by lazy { download("PI.01.LIGHT.fits", GITHUB_FITS_URL) } + protected val PI_02_LIGHT by lazy { download("PI.02.LIGHT.fits", GITHUB_FITS_URL) } + protected val PI_03_LIGHT by lazy { download("PI.03.LIGHT.fits", GITHUB_FITS_URL) } + protected val PI_04_LIGHT by lazy { download("PI.04.LIGHT.fits", GITHUB_FITS_URL) } + protected val PI_05_LIGHT by lazy { download("PI.05.LIGHT.fits", GITHUB_FITS_URL) } + protected val PI_06_LIGHT by lazy { download("PI.06.LIGHT.fits", GITHUB_FITS_URL) } + protected val PI_07_LIGHT by lazy { download("PI.07.LIGHT.fits", GITHUB_FITS_URL) } + protected val PI_08_LIGHT by lazy { download("PI.08.LIGHT.fits", GITHUB_FITS_URL) } + protected val PI_09_LIGHT by lazy { download("PI.09.LIGHT.fits", GITHUB_FITS_URL) } + protected val PI_10_LIGHT by lazy { download("PI.10.LIGHT.fits", GITHUB_FITS_URL) } + protected val PI_BIAS by lazy { download("PI.BIAS.fits", GITHUB_FITS_URL) } + protected val PI_DARK by lazy { download("PI.DARK.fits", GITHUB_FITS_URL) } + protected val PI_FLAT by lazy { download("PI.FLAT.fits", GITHUB_FITS_URL) } + + protected val PI_FOCUS_0 by lazy { download("PI.FOCUS.0.fits", GITHUB_FITS_URL) } + protected val PI_FOCUS_10000 by lazy { download("PI.FOCUS.10000.fits", GITHUB_FITS_URL) } + protected val PI_FOCUS_20000 by lazy { download("PI.FOCUS.20000.fits", GITHUB_FITS_URL) } + protected val PI_FOCUS_30000 by lazy { download("PI.FOCUS.30000.fits", GITHUB_FITS_URL) } + protected val PI_FOCUS_100000 by lazy { download("PI.FOCUS.100000.fits", GITHUB_FITS_URL) } + private val afterEach = AfterEach() init { diff --git a/nebulosa-watney/build.gradle.kts b/nebulosa-watney/build.gradle.kts index fd34d8f83..9cb23922e 100644 --- a/nebulosa-watney/build.gradle.kts +++ b/nebulosa-watney/build.gradle.kts @@ -6,8 +6,8 @@ plugins { dependencies { api(project(":nebulosa-erfa")) api(project(":nebulosa-image")) - api(project(":nebulosa-star-detection")) - api(project(":nebulosa-plate-solving")) + api(project(":nebulosa-stardetector")) + api(project(":nebulosa-platesolver")) api(libs.apache.collections) implementation(project(":nebulosa-log")) testImplementation(project(":nebulosa-test")) diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/BlindSearchStrategy.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/BlindSearchStrategy.kt similarity index 89% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/BlindSearchStrategy.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/BlindSearchStrategy.kt index 1faeacae2..08733807f 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/BlindSearchStrategy.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/BlindSearchStrategy.kt @@ -1,12 +1,12 @@ -package nebulosa.watney.plate.solving +package nebulosa.watney.platesolver import nebulosa.constants.TAU import nebulosa.math.deg import nebulosa.math.toDegrees -import nebulosa.watney.plate.solving.BlindSearchStrategyOptions.DecSearchOrder.NORTH_FIRST -import nebulosa.watney.plate.solving.BlindSearchStrategyOptions.DecSearchOrder.SOUTH_FIRST -import nebulosa.watney.plate.solving.BlindSearchStrategyOptions.RaSearchOrder.EAST_FIRST -import nebulosa.watney.plate.solving.BlindSearchStrategyOptions.RaSearchOrder.WEST_FIRST +import nebulosa.watney.platesolver.BlindSearchStrategyOptions.DecSearchOrder.NORTH_FIRST +import nebulosa.watney.platesolver.BlindSearchStrategyOptions.DecSearchOrder.SOUTH_FIRST +import nebulosa.watney.platesolver.BlindSearchStrategyOptions.RaSearchOrder.EAST_FIRST +import nebulosa.watney.platesolver.BlindSearchStrategyOptions.RaSearchOrder.WEST_FIRST import kotlin.math.ceil import kotlin.math.cos diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/BlindSearchStrategyOptions.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/BlindSearchStrategyOptions.kt similarity index 94% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/BlindSearchStrategyOptions.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/BlindSearchStrategyOptions.kt index 6cdb115f9..130324ac2 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/BlindSearchStrategyOptions.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/BlindSearchStrategyOptions.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving +package nebulosa.watney.platesolver import nebulosa.math.Angle import nebulosa.math.deg diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/ComputedPlateSolution.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/ComputedPlateSolution.kt similarity index 89% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/ComputedPlateSolution.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/ComputedPlateSolution.kt index ebb7a4ac9..6cdca6b1c 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/ComputedPlateSolution.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/ComputedPlateSolution.kt @@ -1,9 +1,9 @@ -package nebulosa.watney.plate.solving +package nebulosa.watney.platesolver import nebulosa.image.format.Header import nebulosa.image.format.ReadableHeader import nebulosa.math.Angle -import nebulosa.plate.solving.Parity +import nebulosa.platesolver.Parity internal data class ComputedPlateSolution( @JvmField val header: ReadableHeader = Header.Empty, diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/NearbySearchStrategy.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/NearbySearchStrategy.kt similarity index 99% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/NearbySearchStrategy.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/NearbySearchStrategy.kt index 9cf140915..5b315fac3 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/NearbySearchStrategy.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/NearbySearchStrategy.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving +package nebulosa.watney.platesolver import nebulosa.erfa.SphericalCoordinate import nebulosa.math.Angle diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/NearbySearchStrategyOptions.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/NearbySearchStrategyOptions.kt similarity index 94% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/NearbySearchStrategyOptions.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/NearbySearchStrategyOptions.kt index 3d99ba6e3..70451db07 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/NearbySearchStrategyOptions.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/NearbySearchStrategyOptions.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving +package nebulosa.watney.platesolver import nebulosa.math.Angle import nebulosa.math.deg diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/PartialBlindSearchStrategy.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/PartialBlindSearchStrategy.kt similarity index 84% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/PartialBlindSearchStrategy.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/PartialBlindSearchStrategy.kt index 32ea97a4b..adeb30976 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/PartialBlindSearchStrategy.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/PartialBlindSearchStrategy.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving +package nebulosa.watney.platesolver internal data class PartialBlindSearchStrategy(internal val searchRuns: MutableList = ArrayList()) : SearchStrategy { diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/PlateConstants.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/PlateConstants.kt similarity index 92% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/PlateConstants.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/PlateConstants.kt index 20e2b735e..e5b463281 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/PlateConstants.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/PlateConstants.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving +package nebulosa.watney.platesolver data class PlateConstants( @JvmField val a: Double, @JvmField val b: Double, @JvmField val c: Double, diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/PointSearchStrategy.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/PointSearchStrategy.kt similarity index 94% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/PointSearchStrategy.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/PointSearchStrategy.kt index 93a886840..9f4352154 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/PointSearchStrategy.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/PointSearchStrategy.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving +package nebulosa.watney.platesolver import nebulosa.math.Angle diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/PointSearchStrategyOptions.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/PointSearchStrategyOptions.kt similarity index 90% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/PointSearchStrategyOptions.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/PointSearchStrategyOptions.kt index ff8212ae2..922bddebc 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/PointSearchStrategyOptions.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/PointSearchStrategyOptions.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving +package nebulosa.watney.platesolver import nebulosa.math.Angle import nebulosa.math.deg diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/SearchRun.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/SearchRun.kt similarity index 83% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/SearchRun.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/SearchRun.kt index d0f642cb7..e2b9dbc5e 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/SearchRun.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/SearchRun.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving +package nebulosa.watney.platesolver import nebulosa.math.Angle diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/SearchStrategy.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/SearchStrategy.kt similarity index 64% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/SearchStrategy.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/SearchStrategy.kt index acc268045..df890556a 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/SearchStrategy.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/SearchStrategy.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving +package nebulosa.watney.platesolver interface SearchStrategy { diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/SearchStrategyOptions.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/SearchStrategyOptions.kt similarity index 75% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/SearchStrategyOptions.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/SearchStrategyOptions.kt index c292f2bd4..6d6269ecb 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/SearchStrategyOptions.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/SearchStrategyOptions.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving +package nebulosa.watney.platesolver interface SearchStrategyOptions { diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/SolveResult.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/SolveResult.kt similarity index 76% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/SolveResult.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/SolveResult.kt index 26f6a1dd9..6ebf97488 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/SolveResult.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/SolveResult.kt @@ -1,6 +1,6 @@ -package nebulosa.watney.plate.solving +package nebulosa.watney.platesolver -import nebulosa.watney.plate.solving.quad.StarQuadMatch +import nebulosa.watney.platesolver.quad.StarQuadMatch internal data class SolveResult( @JvmField var success: Boolean = false, diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/WatneyPlateSolver.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/WatneyPlateSolver.kt similarity index 96% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/WatneyPlateSolver.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/WatneyPlateSolver.kt index ece585232..6f651db3c 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/WatneyPlateSolver.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/WatneyPlateSolver.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving +package nebulosa.watney.platesolver import nebulosa.common.concurrency.cancel.CancellationToken import nebulosa.erfa.SphericalCoordinate @@ -11,20 +11,20 @@ import nebulosa.log.loggerFor import nebulosa.math.Angle import nebulosa.math.deg import nebulosa.math.toDegrees -import nebulosa.plate.solving.Parity -import nebulosa.plate.solving.PlateSolution -import nebulosa.plate.solving.PlateSolver -import nebulosa.star.detection.ImageStar -import nebulosa.star.detection.StarDetector -import nebulosa.watney.plate.solving.math.equatorialToStandardCoordinates -import nebulosa.watney.plate.solving.math.lerp -import nebulosa.watney.plate.solving.math.solveLeastSquares -import nebulosa.watney.plate.solving.math.standardToEquatorialCoordinates -import nebulosa.watney.plate.solving.quad.ImageStarQuad -import nebulosa.watney.plate.solving.quad.QuadDatabase -import nebulosa.watney.plate.solving.quad.StarQuad -import nebulosa.watney.plate.solving.quad.StarQuadMatch -import nebulosa.watney.star.detection.WatneyStarDetector +import nebulosa.platesolver.Parity +import nebulosa.platesolver.PlateSolution +import nebulosa.platesolver.PlateSolver +import nebulosa.stardetector.StarDetector +import nebulosa.stardetector.StarPoint +import nebulosa.watney.platesolver.math.equatorialToStandardCoordinates +import nebulosa.watney.platesolver.math.lerp +import nebulosa.watney.platesolver.math.solveLeastSquares +import nebulosa.watney.platesolver.math.standardToEquatorialCoordinates +import nebulosa.watney.platesolver.quad.ImageStarQuad +import nebulosa.watney.platesolver.quad.QuadDatabase +import nebulosa.watney.platesolver.quad.StarQuad +import nebulosa.watney.platesolver.quad.StarQuadMatch +import nebulosa.watney.stardetector.WatneyStarDetector import org.apache.commons.collections4.bag.HashBag import java.nio.file.Path import java.time.Duration @@ -43,7 +43,7 @@ data class WatneyPlateSolver( override fun solve( path: Path?, image: Image?, centerRA: Angle, centerDEC: Angle, radius: Angle, - downsampleFactor: Int, timeout: Duration?, + downsampleFactor: Int, timeout: Duration, cancellationToken: CancellationToken, ): PlateSolution { val image = image ?: path!!.fits().use(Image::open) @@ -135,7 +135,7 @@ data class WatneyPlateSolver( @JvmStatic private val DEFAULT_STAR_DETECTOR = WatneyStarDetector() @JvmStatic - internal fun formImageStarQuads(starsFound: List): Pair, Int> { + internal fun formImageStarQuads(starsFound: List): Pair, Int> { val quads = ArrayList() var countInFirstPass = 0 diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/math/Coordinates.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/math/Coordinates.kt similarity index 95% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/math/Coordinates.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/math/Coordinates.kt index 383c33e94..1d1b4f651 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/math/Coordinates.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/math/Coordinates.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving.math +package nebulosa.watney.platesolver.math import nebulosa.math.Angle import kotlin.math.* diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/math/Equations.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/math/Equations.kt similarity index 97% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/math/Equations.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/math/Equations.kt index 1a2f8b138..3927fc60e 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/math/Equations.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/math/Equations.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving.math +package nebulosa.watney.platesolver.math /** * Solving least squares, for solving the plate constants. diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/CellStarQuad.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/CellStarQuad.kt similarity index 62% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/CellStarQuad.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/CellStarQuad.kt index 5c6c32555..994c31349 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/CellStarQuad.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/CellStarQuad.kt @@ -1,6 +1,6 @@ -package nebulosa.watney.plate.solving.quad +package nebulosa.watney.platesolver.quad -import nebulosa.star.detection.ImageStar +import nebulosa.stardetector.StarPoint @Suppress("ArrayInDataClass") data class CellStarQuad( @@ -10,5 +10,5 @@ data class CellStarQuad( override val midPointY: Double, ) : StarQuad { - override val stars: List = emptyList() + override val stars: List = emptyList() } diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/CompactQuadDatabase.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/CompactQuadDatabase.kt similarity index 95% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/CompactQuadDatabase.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/CompactQuadDatabase.kt index 63a469035..e6a46dfbc 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/CompactQuadDatabase.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/CompactQuadDatabase.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving.quad +package nebulosa.watney.platesolver.quad import nebulosa.math.Angle import java.nio.file.Path @@ -7,7 +7,7 @@ import kotlin.io.path.listDirectoryEntries data class CompactQuadDatabase(private val path: Path) : QuadDatabase { private val indexes = path.listDirectoryEntries("*.qdbindex") - .map(QuadDatabaseCellFileIndex::read) + .map(QuadDatabaseCellFileIndex.Companion::read) private val fileSets = QuadDatabaseCellFileSet.from(indexes) override fun quads( diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/CoordinateBounds.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/CoordinateBounds.kt similarity index 93% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/CoordinateBounds.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/CoordinateBounds.kt index 977ecd721..1206be0e2 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/CoordinateBounds.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/CoordinateBounds.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving.quad +package nebulosa.watney.platesolver.quad import nebulosa.math.Angle diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/ImageStarQuad.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/ImageStarQuad.kt similarity index 89% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/ImageStarQuad.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/ImageStarQuad.kt index 61e246251..65dc8c6a4 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/ImageStarQuad.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/ImageStarQuad.kt @@ -1,6 +1,6 @@ -package nebulosa.watney.plate.solving.quad +package nebulosa.watney.platesolver.quad -import nebulosa.star.detection.ImageStar +import nebulosa.stardetector.StarPoint @Suppress("ArrayInDataClass") data class ImageStarQuad( @@ -8,10 +8,10 @@ data class ImageStarQuad( override val largestDistance: Double, override val midPointX: Double, override val midPointY: Double, - override val stars: List = emptyList(), + override val stars: List = emptyList(), ) : StarQuad { - constructor(ratios: DoubleArray, largestDistance: Double, stars: List = emptyList()) + constructor(ratios: DoubleArray, largestDistance: Double, stars: List = emptyList()) : this( ratios, largestDistance, (stars[0].x + stars[1].x + stars[2].x + stars[3].x) / 4.0, diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/QuadDatabase.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/QuadDatabase.kt similarity index 92% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/QuadDatabase.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/QuadDatabase.kt index cfe366dc9..27d0432e2 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/QuadDatabase.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/QuadDatabase.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving.quad +package nebulosa.watney.platesolver.quad import nebulosa.math.Angle diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/QuadDatabaseCellFile.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/QuadDatabaseCellFile.kt similarity index 98% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/QuadDatabaseCellFile.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/QuadDatabaseCellFile.kt index 07d741fbd..40f47878d 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/QuadDatabaseCellFile.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/QuadDatabaseCellFile.kt @@ -1,10 +1,10 @@ -package nebulosa.watney.plate.solving.quad +package nebulosa.watney.platesolver.quad import nebulosa.erfa.SphericalCoordinate import nebulosa.io.* import nebulosa.math.Angle import nebulosa.math.deg -import nebulosa.watney.plate.solving.quad.QuadDatabaseCellFileDescriptor.SubCellInfo +import nebulosa.watney.platesolver.quad.QuadDatabaseCellFileDescriptor.SubCellInfo import okio.Buffer import kotlin.math.abs diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/QuadDatabaseCellFileDescriptor.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/QuadDatabaseCellFileDescriptor.kt similarity index 97% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/QuadDatabaseCellFileDescriptor.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/QuadDatabaseCellFileDescriptor.kt index 3fe249eed..99478788a 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/QuadDatabaseCellFileDescriptor.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/QuadDatabaseCellFileDescriptor.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving.quad +package nebulosa.watney.platesolver.quad import nebulosa.erfa.SphericalCoordinate import nebulosa.io.ByteOrder @@ -7,7 +7,7 @@ import nebulosa.io.readInt import nebulosa.log.loggerFor import nebulosa.math.Angle import nebulosa.math.deg -import nebulosa.watney.plate.solving.quad.QuadDatabase.Companion.FORMAT_ID +import nebulosa.watney.platesolver.quad.QuadDatabase.Companion.FORMAT_ID import okio.BufferedSource import java.nio.file.Path diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/QuadDatabaseCellFileIndex.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/QuadDatabaseCellFileIndex.kt similarity index 87% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/QuadDatabaseCellFileIndex.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/QuadDatabaseCellFileIndex.kt index 38bb5bfe1..f860c2e13 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/QuadDatabaseCellFileIndex.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/QuadDatabaseCellFileIndex.kt @@ -1,10 +1,10 @@ -package nebulosa.watney.plate.solving.quad +package nebulosa.watney.platesolver.quad import nebulosa.io.ByteOrder import nebulosa.io.readUnsignedByte import nebulosa.io.seekableSource -import nebulosa.watney.plate.solving.quad.QuadDatabase.Companion.INDEX_FORMAT_ID -import nebulosa.watney.plate.solving.quad.QuadDatabase.Companion.INDEX_VERSION +import nebulosa.watney.platesolver.quad.QuadDatabase.Companion.INDEX_FORMAT_ID +import nebulosa.watney.platesolver.quad.QuadDatabase.Companion.INDEX_VERSION import okio.buffer import java.nio.file.Path diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/QuadDatabaseCellFileSet.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/QuadDatabaseCellFileSet.kt similarity index 98% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/QuadDatabaseCellFileSet.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/QuadDatabaseCellFileSet.kt index 8b8b92e30..fd2bae151 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/QuadDatabaseCellFileSet.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/QuadDatabaseCellFileSet.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving.quad +package nebulosa.watney.platesolver.quad import nebulosa.math.Angle import kotlin.math.abs diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/QuadHelper.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/QuadHelper.kt similarity index 96% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/QuadHelper.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/QuadHelper.kt index 0c3c9cdc6..a2f3c3278 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/QuadHelper.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/QuadHelper.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving.quad +package nebulosa.watney.platesolver.quad import nebulosa.constants.PIOVERTWO import nebulosa.erfa.SphericalCoordinate diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/SkySegmentSphere.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/SkySegmentSphere.kt similarity index 99% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/SkySegmentSphere.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/SkySegmentSphere.kt index 6b28e12a5..10e42d6d5 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/SkySegmentSphere.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/SkySegmentSphere.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving.quad +package nebulosa.watney.platesolver.quad import nebulosa.erfa.SphericalCoordinate import nebulosa.math.Angle diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/StarQuad.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/StarQuad.kt similarity index 94% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/StarQuad.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/StarQuad.kt index 7237a0011..fb1dfa053 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/StarQuad.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/StarQuad.kt @@ -1,6 +1,6 @@ -package nebulosa.watney.plate.solving.quad +package nebulosa.watney.platesolver.quad -import nebulosa.star.detection.ImageStar +import nebulosa.stardetector.StarPoint /** * Represents a star quad (in database or in image). @@ -30,7 +30,7 @@ interface StarQuad { /** * The stars that make up this quad. */ - val stars: List + val stars: List class StarBasedEqualityKey(@JvmField val quad: StarQuad) { diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/StarQuadMatch.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/StarQuadMatch.kt similarity index 93% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/StarQuadMatch.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/StarQuadMatch.kt index 7c048169f..5cdc34f06 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/plate/solving/quad/StarQuadMatch.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/platesolver/quad/StarQuadMatch.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.plate.solving.quad +package nebulosa.watney.platesolver.quad /** * Represents a star quad match, i.e. a pair of quads, diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/star/detection/DefaultStarDetectionFilter.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/stardetector/DefaultStarDetectionFilter.kt similarity index 97% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/star/detection/DefaultStarDetectionFilter.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/stardetector/DefaultStarDetectionFilter.kt index cd3a4468e..cc1e70ae2 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/star/detection/DefaultStarDetectionFilter.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/stardetector/DefaultStarDetectionFilter.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.star.detection +package nebulosa.watney.stardetector import nebulosa.constants.PI import nebulosa.constants.TAU diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/star/detection/Star.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/stardetector/Star.kt similarity index 70% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/star/detection/Star.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/stardetector/Star.kt index ee650cec0..814616e4a 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/star/detection/Star.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/stardetector/Star.kt @@ -1,6 +1,6 @@ -package nebulosa.watney.star.detection +package nebulosa.watney.stardetector -import nebulosa.star.detection.ImageStar +import nebulosa.stardetector.StarPoint data class Star( override val x: Double = 0.0, @@ -9,4 +9,4 @@ data class Star( override var hfd: Double = 0.0, override var snr: Double = 0.0, override var flux: Double = 0.0, -) : ImageStar +) : StarPoint diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/star/detection/StarDetectionFilter.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/stardetector/StarDetectionFilter.kt similarity index 83% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/star/detection/StarDetectionFilter.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/stardetector/StarDetectionFilter.kt index b972d6967..fb9ea4d1c 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/star/detection/StarDetectionFilter.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/stardetector/StarDetectionFilter.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.star.detection +package nebulosa.watney.stardetector import nebulosa.image.Image diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/star/detection/StarPixel.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/stardetector/StarPixel.kt similarity index 75% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/star/detection/StarPixel.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/stardetector/StarPixel.kt index cdb28e5c1..4c7c98dfb 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/star/detection/StarPixel.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/stardetector/StarPixel.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.star.detection +package nebulosa.watney.stardetector internal data class StarPixel( @JvmField val x: Int, diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/star/detection/StarPixelBin.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/stardetector/StarPixelBin.kt similarity index 98% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/star/detection/StarPixelBin.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/stardetector/StarPixelBin.kt index c8bb00988..e24efbeef 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/star/detection/StarPixelBin.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/stardetector/StarPixelBin.kt @@ -1,4 +1,4 @@ -package nebulosa.watney.star.detection +package nebulosa.watney.stardetector import kotlin.math.hypot diff --git a/nebulosa-watney/src/main/kotlin/nebulosa/watney/star/detection/WatneyStarDetector.kt b/nebulosa-watney/src/main/kotlin/nebulosa/watney/stardetector/WatneyStarDetector.kt similarity index 98% rename from nebulosa-watney/src/main/kotlin/nebulosa/watney/star/detection/WatneyStarDetector.kt rename to nebulosa-watney/src/main/kotlin/nebulosa/watney/stardetector/WatneyStarDetector.kt index 0786eb5ad..8a25bfaac 100644 --- a/nebulosa-watney/src/main/kotlin/nebulosa/watney/star/detection/WatneyStarDetector.kt +++ b/nebulosa-watney/src/main/kotlin/nebulosa/watney/stardetector/WatneyStarDetector.kt @@ -1,9 +1,9 @@ -package nebulosa.watney.star.detection +package nebulosa.watney.stardetector import nebulosa.image.Image import nebulosa.image.algorithms.computation.Statistics import nebulosa.image.algorithms.computation.hfd.HFD -import nebulosa.star.detection.StarDetector +import nebulosa.stardetector.StarDetector import kotlin.math.roundToInt data class WatneyStarDetector( diff --git a/nebulosa-watney/src/test/kotlin/EquationsTest.kt b/nebulosa-watney/src/test/kotlin/EquationsTest.kt index cddfea61d..1efb1a557 100644 --- a/nebulosa-watney/src/test/kotlin/EquationsTest.kt +++ b/nebulosa-watney/src/test/kotlin/EquationsTest.kt @@ -1,7 +1,7 @@ import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.doubles.plusOrMinus import io.kotest.matchers.shouldBe -import nebulosa.watney.plate.solving.math.solveLeastSquares +import nebulosa.watney.platesolver.math.solveLeastSquares class EquationsTest : StringSpec() { diff --git a/nebulosa-watney/src/test/kotlin/QuadDatabaseTest.kt b/nebulosa-watney/src/test/kotlin/QuadDatabaseTest.kt index a74168318..30525a065 100644 --- a/nebulosa-watney/src/test/kotlin/QuadDatabaseTest.kt +++ b/nebulosa-watney/src/test/kotlin/QuadDatabaseTest.kt @@ -9,9 +9,9 @@ import io.kotest.matchers.string.shouldEndWith import nebulosa.io.ByteOrder import nebulosa.math.deg import nebulosa.test.NonGitHubOnlyCondition -import nebulosa.watney.plate.solving.quad.CellStarQuad -import nebulosa.watney.plate.solving.quad.CompactQuadDatabase -import nebulosa.watney.plate.solving.quad.QuadDatabaseCellFileIndex +import nebulosa.watney.platesolver.quad.CellStarQuad +import nebulosa.watney.platesolver.quad.CompactQuadDatabase +import nebulosa.watney.platesolver.quad.QuadDatabaseCellFileIndex import java.nio.file.Path @Suppress("NestedLambdaShadowedImplicitParameter") diff --git a/nebulosa-watney/src/test/kotlin/SearchStrategyTest.kt b/nebulosa-watney/src/test/kotlin/SearchStrategyTest.kt index aa4ea34dd..bc1753a19 100644 --- a/nebulosa-watney/src/test/kotlin/SearchStrategyTest.kt +++ b/nebulosa-watney/src/test/kotlin/SearchStrategyTest.kt @@ -4,10 +4,10 @@ import io.kotest.matchers.maps.shouldContainKey import nebulosa.math.deg import nebulosa.math.hours import nebulosa.math.toDegrees -import nebulosa.watney.plate.solving.BlindSearchStrategy -import nebulosa.watney.plate.solving.BlindSearchStrategyOptions -import nebulosa.watney.plate.solving.NearbySearchStrategy -import nebulosa.watney.plate.solving.NearbySearchStrategyOptions +import nebulosa.watney.platesolver.BlindSearchStrategy +import nebulosa.watney.platesolver.BlindSearchStrategyOptions +import nebulosa.watney.platesolver.NearbySearchStrategy +import nebulosa.watney.platesolver.NearbySearchStrategyOptions class SearchStrategyTest : StringSpec() { diff --git a/nebulosa-watney/src/test/kotlin/SkySegmentSphereTest.kt b/nebulosa-watney/src/test/kotlin/SkySegmentSphereTest.kt index cad518e60..6119dce66 100644 --- a/nebulosa-watney/src/test/kotlin/SkySegmentSphereTest.kt +++ b/nebulosa-watney/src/test/kotlin/SkySegmentSphereTest.kt @@ -3,7 +3,7 @@ import io.kotest.matchers.collections.shouldHaveSize import io.kotest.matchers.doubles.plusOrMinus import io.kotest.matchers.shouldBe import nebulosa.math.toDegrees -import nebulosa.watney.plate.solving.quad.SkySegmentSphere +import nebulosa.watney.platesolver.quad.SkySegmentSphere class SkySegmentSphereTest : StringSpec() { diff --git a/nebulosa-watney/src/test/kotlin/WatnetPlateSolverTest.kt b/nebulosa-watney/src/test/kotlin/WatnetPlateSolverTest.kt index 552d408a6..ab76a4cee 100644 --- a/nebulosa-watney/src/test/kotlin/WatnetPlateSolverTest.kt +++ b/nebulosa-watney/src/test/kotlin/WatnetPlateSolverTest.kt @@ -8,9 +8,9 @@ import nebulosa.image.Image import nebulosa.math.deg import nebulosa.test.AbstractFitsAndXisfTest import nebulosa.test.NonGitHubOnlyCondition -import nebulosa.watney.plate.solving.WatneyPlateSolver -import nebulosa.watney.plate.solving.quad.CompactQuadDatabase -import nebulosa.watney.star.detection.Star +import nebulosa.watney.platesolver.WatneyPlateSolver +import nebulosa.watney.platesolver.quad.CompactQuadDatabase +import nebulosa.watney.stardetector.Star import java.nio.file.Path @EnabledIf(NonGitHubOnlyCondition::class) diff --git a/nebulosa-watney/src/test/kotlin/WatneyStarDetectorTest.kt b/nebulosa-watney/src/test/kotlin/WatneyStarDetectorTest.kt index 1499471a9..1bc8dee5a 100644 --- a/nebulosa-watney/src/test/kotlin/WatneyStarDetectorTest.kt +++ b/nebulosa-watney/src/test/kotlin/WatneyStarDetectorTest.kt @@ -4,9 +4,9 @@ import nebulosa.fits.fits import nebulosa.image.Image import nebulosa.image.algorithms.transformation.Draw import nebulosa.image.algorithms.transformation.convolution.Mean -import nebulosa.star.detection.ImageStar +import nebulosa.stardetector.StarPoint import nebulosa.test.AbstractFitsAndXisfTest -import nebulosa.watney.star.detection.WatneyStarDetector +import nebulosa.watney.stardetector.WatneyStarDetector import java.awt.Color import java.awt.Graphics2D import kotlin.math.roundToInt @@ -31,7 +31,7 @@ class WatneyStarDetectorTest : AbstractFitsAndXisfTest() { } } - private data class ImageStarsDraw(private val stars: List) : Draw() { + private data class ImageStarsDraw(private val stars: List) : Draw() { override fun draw(source: Image, graphics: Graphics2D) { graphics.color = Color.YELLOW diff --git a/settings.gradle.kts b/settings.gradle.kts index 0e03d366f..3e378dd64 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -69,6 +69,7 @@ include(":nebulosa-indi-client") include(":nebulosa-indi-device") include(":nebulosa-indi-protocol") include(":nebulosa-io") +include(":nebulosa-livestacker") include(":nebulosa-log") include(":nebulosa-lx200-protocol") include(":nebulosa-math") @@ -76,15 +77,17 @@ include(":nebulosa-nasa") include(":nebulosa-netty") include(":nebulosa-nova") include(":nebulosa-phd2-client") -include(":nebulosa-plate-solving") +include(":nebulosa-pixinsight") +include(":nebulosa-platesolver") include(":nebulosa-retrofit") include(":nebulosa-sbd") include(":nebulosa-simbad") +include(":nebulosa-siril") include(":nebulosa-skycatalog") include(":nebulosa-skycatalog-hyg") include(":nebulosa-skycatalog-sao") include(":nebulosa-skycatalog-stellarium") -include(":nebulosa-star-detection") +include(":nebulosa-stardetector") include(":nebulosa-stellarium-protocol") include(":nebulosa-test") include(":nebulosa-time")