Git commit a8a8b94e76b0bdaa786ee4e87dbf382d378f754b by Jasem Mutlaq. Committed on 30/09/2016 at 20:36. Pushed by mutlaqja into branch 'bleeding'. Minor GUI update to utilize space. Refactor sync M +2 -2 kstars/ekos/capture/capture.cpp M +743 -796 kstars/ekos/capture/capture.ui http://commits.kde.org/kstars/a8a8b94e76b0bdaa786ee4e87dbf382d378f754b diff --git a/kstars/ekos/capture/capture.cpp b/kstars/ekos/capture/capture.= cpp index 86ca633..8e373ce 100644 --- a/kstars/ekos/capture/capture.cpp +++ b/kstars/ekos/capture/capture.cpp @@ -926,7 +926,7 @@ void Capture::newFITS(IBLOB *bp) = if (useGuideHead =3D=3D false && darkSubCheck->isChecked() && acti= veJob->isPreview()) { - FITSView *currentImage =3D targetChip->getImage(FITS_NORMAL); + FITSView *currentImage =3D targetChip->getImageView(FITS_NOR= MAL); FITSData *darkData =3D NULL; uint16_t offsetX =3D activeJob->getSubX() / activeJob->getXBin= (); uint16_t offsetY =3D activeJob->getSubY() / activeJob->getYBin= (); @@ -3646,7 +3646,7 @@ bool Capture::processPostCaptureCalibrationStage() if (activeJob->getFrameType() =3D=3D FRAME_FLAT && activeJob->getFlatF= ieldDuration() =3D=3D DURATION_ADU && activeJob->getTargetADU() > 0) { FITSData *image_data =3D NULL; - FITSView *currentImage =3D targetChip->getImage(FITS_NORMAL); + FITSView *currentImage =3D targetChip->getImageView(FITS_NORMAL); if (currentImage) { image_data =3D currentImage->getImageData(); diff --git a/kstars/ekos/capture/capture.ui b/kstars/ekos/capture/capture.ui index ff64248..0a87956 100644 --- a/kstars/ekos/capture/capture.ui +++ b/kstars/ekos/capture/capture.ui @@ -7,12 +7,12 @@ 0 0 728 - 413 + 412 - + - 1 + 3 3 @@ -27,10 +27,7 @@ 3 - - - 1 - + @@ -51,355 +48,131 @@ CCD && Filter Wheel - - - 1 - - - + + + + + + + + + + + CCD: + + + + + + + + 1 - - + + - + Filter Wheel - CCD: + FW: - - - - - - - 1 + + + + + 0 + 0 + - - - - Filter Wheel - - - - - - FW: - - - - - - - - 0 - 0 - - - - - - - - Number of images to capture - - - - - - Filter: - - - - - - - - 0 - 0 - - - - - + - - + + - Set the exposure time in seconds for individual image= s, if applicable + Number of images to capture - Exposure: + Filter: - - + + 0 0 - - 3 - - - 0.001000000000000 - - - 3600.000000000000000 - - - 1.000000000000000 - - - - - 1 - - - - - Horizontal and Vertical binning - - - - - - Binning: - - - - - - - - - - - - - X: - - - - - - - - 0 - 0 - - - - Horizontal binning - - - 1 - - - 10 - - - 1 - - - - - - - - - - - - - Y: - - - - - - - - 0 - 0 - - - - Vertical binning - - - 1 - - - 10 - - - 1 - - - - - - - + + + + + + Set the exposure time in seconds for individual images,= if applicable + + + + + + Exposure: + + + + + + + + 0 + 0 + + + + 3 + + + 0.001000000000000 + + + 3600.000000000000000 + + + 1.000000000000000 + + + + + + + 1 + + + - + Horizontal and Vertical binning - Frame: + Binning: - - - - 1 - - - - - - - - - - - X: - - - - - - - - 0 - 0 - - - - - - - - - - - - - - Y: - - - - - - - - 0 - 0 - - - - - - - - - - 1 - - - - - - - - - - - W: - - - - - - - - 0 - 0 - - - - 99 - - - - - - - - - - - - - H: - - - - - - - - 0 - 0 - - - - - - - - - 32 - 32 - - - - - 32 - 32 - - - - Reset CCD frame values to default values - - - - - - - - - - + + @@ -407,302 +180,525 @@ - Type: + X: - - + + 0 0 - - - - - - 1 + + Horizontal binning - - - - <html><head/><body>Enfor= ce temperature value before capturing an image</body></h= tml> - - - T=C2=BA - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - false - - - - 0 - 0 - - - - - - - - false - - - Set CCD temperature - - - Set - - - - - - - false - - - - 0 - 0 - - - - - 32 - 32 - - - - - 32 - 32 - - - - Calibration Options - - - - - - - + + 1 + + + 10 + + + 1 + + - - + + - Prefix to append to the beginning of file names + - Prefix: + Y: - - - - - - + + + + + 0 + 0 + + + + Vertical binning + + 1 - - - - Append the active filter slot to the prefix - - - Filter - - - - - - - Append the expose duration to the prefix - - - Duration - - - - - - - Append time stamp to the prefix - - - TS - - - false - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + + 10 + + + 1 + + - - + + + + + + + + + + + + Frame: + + + + + + + 1 + + + - Number of images to capture + - Count: + X: - - + + - + 0 0 - - 1 + + + + + + + + + + + + Y: + + + + + + + + 0 + 0 + + + + + + + + + + 1 + + + + + + + + + + + W: + + + + + + + + 0 + 0 + - 999 + 99 - - 1 + + + + + + + + + + + + H: - - - - 1 + + + + + 0 + 0 + - - - - Delay in seconds between consecutive images - - - - - - Delay: - - - - - - - - 0 - 0 - - - - 3600 - - - - + + + + + + + 32 + 32 + + + + + 32 + 32 + + + + Reset CCD frame values to default values + + + + + - - + + + + + + + + + + + + Type: + + + + + + + + 0 + 0 + + + + + + + + Cooler: + + + + + + + - Apply filter to image after capture to enhance it + <html><head/><body>Enforce= temperature value before capturing an image</body></htm= l> + + + T=C2=BA + + + false + + + + + + + + 0 + 0 + - Filters: + - - + + + + false + 0 0 - - - -- - - - - - - 1 + + + + + + + + false - - - - false - - - ISO: - - - - - - - false - - - - 0 - 0 - - - - - + + Set CCD temperature + + + Set + + - + + + + Prefix to append to the beginning of file names + + + + + + Prefix: + + + + + + + + + + 1 + + + + + Append the active filter slot to the prefix + + + Filter + + + + + + + Append the expose duration to the prefix + + + Duration + + + + + + + Append time stamp to the prefix + + + TS + + + false + + + + + + + + + Number of images to capture + + + + + + Count: + + + + + + + + 0 + 0 + + + + 1 + + + 999 + + + 1 + + + + + + + 1 + + + + + Delay in seconds between consecutive images + + + + + + Delay: + + + + + + + + 0 + 0 + + + + 3600 + + + + + + + + + Apply filter to image after capture to enhance it + + + Filters: + + + + + + + + 0 + 0 + + + + + -- + + + + + + + + + + Qt::Vertical + + + + + + + Perform automatic dark subtraction in preview mode + + + Auto dark subtract + + + false + + + + + + + Qt::Vertical + + + + + + + Dark & Flat frames calibration + + + Calibration: + + + Qt::AlignCenter + + + + + + + false + + + + 0 + 0 + + + + + 32 + 32 + + + + + 32 + 32 + + + + Dark & Flat frames calibration options + + + + + + + + + 1 @@ -744,25 +740,42 @@ - + + + + + + + + + + 1 + + + + + false + + + ISO: + + + + + + + false + + + + 0 + 0 + - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -1067,6 +1080,12 @@ + + + 0 + 32 + + @@ -1158,238 +1177,180 @@ - - 1 - Options - + + + 3 + + + 3 + + + 3 + + + 3 + - 1 + 3 - - - - 1 + + + + false - - - - Perform automatic dark subtraction in preview mode - - - Auto dark subtract - - - false - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + + Abort sequence if guiding deviation exceed this value + + + Guiding Deviation < + + + false + + - - - - 1 + + + + false - - - - false - - - Abort sequence if guiding deviation exceed this value= - - - Guiding Deviation < - - - false - - - - - - - false - - - 2 - - - 30.000000000000000 - - - 0.500000000000000 - - - - - - - Number of images to capture - - - - - - " - - - - - - - Number of images to capture - - - - - - pixels - - - - - - - false - - - <html><head/><body>Command= a meridian flip if the hour angle exceeds the specified value. Capture and= Guiding will be suspended and resumed after the flip is complete.= ;</body></html> - - - Meridian Flip if HA > - - - - - - - false - - - Automatically park telescope once all sequence jobs a= re completed - - - Park When Complete - - - - - - - false - - - 3 - - - 0.000000000000000 - - - 10.000000000000000 - - - 0.100000000000000 - - - 0.000000000000000 - - - - - - - Number of images to capture - - - - - - hours - - - - - - - false - - - 2 - - - 0.000000000000000 - - - 3.000000000000000 - - - 0.100000000000000 - - - 0.000000000000000 - - - - - - - false - - - Perform autofocusing once Half-Flux-Radius (HFR) valu= e exceeds this limit - - - Autofocus if HFR > - - - - - - - Qt::Vertical - - - - - - - Qt::Vertical - - - - + + 2 + + + 30.000000000000000 + + + 0.500000000000000 + + - - - - Qt::Vertical + + + + Number of images to capture + + + + + + " + + + + + + + false + + + Perform autofocusing once Half-Flux-Radius (HFR) value = exceeds this limit + + + Autofocus if HFR > + + + + + + + false + + + 3 + + + 0.000000000000000 + + + 10.000000000000000 + + + 0.100000000000000 + + + 0.000000000000000 + + + + + + + Number of images to capture + + + + + + pixels + + + + + + + false + + + <html><head/><body>Command a= meridian flip if the hour angle exceeds the specified value. Capture and G= uiding will be suspended and resumed after the flip is complete.&= lt;/body></html> + + + Meridian Flip if HA > + + + + + + + false + + + 2 + + + 0.000000000000000 + + + 3.000000000000000 + + + 0.100000000000000 + + + 0.000000000000000 - - - 20 - 40 - + + + + + + Number of images to capture + + + + + + hours + + + + + + + false + + + Automatically park telescope once all sequence jobs are= completed - + + Park When Complete + + @@ -1556,19 +1517,6 @@ - - - - Qt::Vertical - - - - 20 - 1 - - - - @@ -1588,7 +1536,6 @@ - verticalSpacer