diff -Nru kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/debian/changelog kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/debian/changelog --- kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/debian/changelog 2023-06-19 04:07:48.000000000 +0000 +++ kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/debian/changelog 2023-07-04 12:51:19.000000000 +0000 @@ -1,8 +1,8 @@ -kstars-bleeding (6:3.6.5+202306190407~ubuntu22.04.1) jammy; urgency=low +kstars-bleeding (6:3.6.5+202307041251~ubuntu22.04.1) jammy; urgency=low * Auto build. - -- Jasem Mutlaq Mon, 19 Jun 2023 04:07:48 +0000 + -- Jasem Mutlaq Tue, 04 Jul 2023 12:51:19 +0000 kstars-bleeding (6:3.6.5) jammy; urgency=medium diff -Nru kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/debian/git-build-recipe.manifest kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/debian/git-build-recipe.manifest --- kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/debian/git-build-recipe.manifest 2023-06-19 04:07:48.000000000 +0000 +++ kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/debian/git-build-recipe.manifest 2023-07-04 12:51:19.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version {debversion}+202306190407 -lp:~mutlaqja/kstars-bleeding/+git/kstars-master git-commit:678d3b330187523618a246c20035f90e6e910ad9 -nest-part packaging lp:~mutlaqja/kstars-bleeding/+git/kstars-master packaging/linux/debian debian git-commit:678d3b330187523618a246c20035f90e6e910ad9 +# git-build-recipe format 0.4 deb-version {debversion}+202307041251 +lp:~mutlaqja/kstars-bleeding/+git/kstars-master git-commit:e50b834d00b544e1a43d938b10ead5d886fedb99 +nest-part packaging lp:~mutlaqja/kstars-bleeding/+git/kstars-master packaging/linux/debian debian git-commit:e50b834d00b544e1a43d938b10ead5d886fedb99 diff -Nru kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/data/qml/mount/mountbox.qml kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/data/qml/mount/mountbox.qml --- kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/data/qml/mount/mountbox.qml 2023-06-19 04:07:40.000000000 +0000 +++ kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/data/qml/mount/mountbox.qml 2023-07-04 12:51:13.000000000 +0000 @@ -515,7 +515,7 @@ columns: 4 MouseArea { - anchors.fill: parent + Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter property bool toggle: false onClicked: { if (toggle) { diff -Nru kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/align/align.ui kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/align/align.ui --- kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/align/align.ui 2023-06-19 04:07:41.000000000 +0000 +++ kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/align/align.ui 2023-07-04 12:51:13.000000000 +0000 @@ -6,7 +6,7 @@ 0 0 - 611 + 648 640 @@ -719,7 +719,7 @@ - + .. diff -Nru kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/auxiliary/filtermanager.cpp kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/auxiliary/filtermanager.cpp --- kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/auxiliary/filtermanager.cpp 2023-06-19 04:07:41.000000000 +0000 +++ kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/auxiliary/filtermanager.cpp 2023-07-04 12:51:13.000000000 +0000 @@ -810,9 +810,11 @@ return false; } - int absFocusPos = m_ActiveFilters[index]->absoluteFocusPosition(); + // By default filter absolute focus offset is zero + // JM 2023.07.03: So if it is zero, we return immediately. + auto absFocusPos = m_ActiveFilters[index]->absoluteFocusPosition(); - if (m_FocusAbsPosition == absFocusPos) + if (m_FocusAbsPosition == absFocusPos || absFocusPos <= 0) { m_FocusAbsPositionPending = false; return true; diff -Nru kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/auxiliary/opticaltrains.ui kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/auxiliary/opticaltrains.ui --- kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/auxiliary/opticaltrains.ui 2023-06-19 04:07:41.000000000 +0000 +++ kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/auxiliary/opticaltrains.ui 2023-07-04 12:51:13.000000000 +0000 @@ -300,7 +300,7 @@ <html><head/><body>Select the device that receives the guiding correction pulses. This can be one of the following devices:Mount: If the Mount can receive guiding correction pulses, then it is best to select it so that the pulses are directly sent to the mount. This is the recommended option.ST4: If using an ST4 cable between the guide camera and mount, then you should select the Guide Camera as the Guider.Dedicated Guider: If using a dedicated guider interface device (like Shoestring GPUSB) then select it as the Guider.</body></html> - Guider: + Guide Via: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter diff -Nru kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/capture/capturedeviceadaptor.cpp kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/capture/capturedeviceadaptor.cpp --- kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/capture/capturedeviceadaptor.cpp 2023-06-19 04:07:41.000000000 +0000 +++ kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/capture/capturedeviceadaptor.cpp 2023-07-04 12:51:13.000000000 +0000 @@ -222,13 +222,15 @@ disconnect(this, &CaptureDeviceAdaptor::newRotatorAngle, state, &SequenceJobState::setCurrentRotatorPositionAngle); } -void CaptureDeviceAdaptor::setRotatorAngle(double *rawAngle) +void CaptureDeviceAdaptor::setRotatorAngle(double rawAngle) { - if (m_ActiveRotator != nullptr) - if (!m_ActiveRotator->setAbsoluteAngle(*rawAngle)) - { - qWarning(KSTARS_EKOS_CAPTURE) << "Rotator is not responding!"; - } + if (m_ActiveRotator != nullptr && m_ActiveRotator->setAbsoluteAngle(rawAngle)) + { + qCInfo(KSTARS_EKOS_CAPTURE) << "Setting rotator angle to" << rawAngle << "degrees."; + } + else + qCWarning(KSTARS_EKOS_CAPTURE) << "Setting rotator angle to " << rawAngle + << "failed due missing or unresponsive rotator."; } double CaptureDeviceAdaptor::getRotatorAngle() diff -Nru kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/capture/capturedeviceadaptor.h kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/capture/capturedeviceadaptor.h --- kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/capture/capturedeviceadaptor.h 2023-06-19 04:07:41.000000000 +0000 +++ kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/capture/capturedeviceadaptor.h 2023-07-04 12:51:13.000000000 +0000 @@ -117,7 +117,7 @@ /** * @brief Set the rotator's angle */ - void setRotatorAngle(double *rawAngle); + void setRotatorAngle(double rawAngle); /** * @brief Get the rotator's angle diff -Nru kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/capture/capture.ui kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/capture/capture.ui --- kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/capture/capture.ui 2023-06-19 04:07:41.000000000 +0000 +++ kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/capture/capture.ui 2023-07-04 12:51:13.000000000 +0000 @@ -6,7 +6,7 @@ 0 0 - 811 + 815 539 @@ -756,7 +756,7 @@ - + .. @@ -2237,6 +2237,7 @@ + 50 false @@ -2268,6 +2269,7 @@ + 75 true @@ -2306,6 +2308,7 @@ + 75 true diff -Nru kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/capture/rotatorsettings.cpp kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/capture/rotatorsettings.cpp --- kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/capture/rotatorsettings.cpp 2023-06-19 04:07:41.000000000 +0000 +++ kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/capture/rotatorsettings.cpp 2023-07-04 12:51:13.000000000 +0000 @@ -146,7 +146,7 @@ void RotatorSettings::activateRotator(double Angle) { - m_CaptureDA->setRotatorAngle(&Angle); + m_CaptureDA->setRotatorAngle(Angle); } void RotatorSettings::commitRotatorDirection(bool Reverse) diff -Nru kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/capture/sequencejobstate.cpp kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/capture/sequencejobstate.cpp --- kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/capture/sequencejobstate.cpp 2023-06-19 04:07:41.000000000 +0000 +++ kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/capture/sequencejobstate.cpp 2023-07-04 12:51:13.000000000 +0000 @@ -317,7 +317,7 @@ prepareActions[CaptureModuleState::ACTION_ROTATOR] = false; double rawAngle = RotatorUtils::Instance()->calcRotatorAngle(targetPositionAngle); emit prepareState(CAPTURE_SETTING_ROTATOR); - emit setRotatorAngle(&rawAngle); + emit setRotatorAngle(rawAngle); } // trigger setting current value first if not initialized else @@ -587,7 +587,7 @@ // check already running? if (flatSyncStatus == FS_BUSY) { - QTimer::singleShot(1000, [&] + QTimer::singleShot(1000, this, [this] { // wait for one second and repeat the request again emit flatSyncFocus(targetFilterID); diff -Nru kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/capture/sequencejobstate.h kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/capture/sequencejobstate.h --- kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/capture/sequencejobstate.h 2023-06-19 04:07:41.000000000 +0000 +++ kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/capture/sequencejobstate.h 2023-07-04 12:51:13.000000000 +0000 @@ -268,7 +268,7 @@ // Capture initialization complete(d) void initCaptureComplete(FITSMode mode); // change the rotator angle - void setRotatorAngle(double *rawAngle); + void setRotatorAngle(double rawAngle); // ask for the current filter position void readFilterPosition(); // Change the filter to the given position and the filter change policy diff -Nru kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/focus/focus.cpp kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/focus/focus.cpp --- kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/focus/focus.cpp 2023-06-19 04:07:41.000000000 +0000 +++ kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/focus/focus.cpp 2023-07-04 12:51:13.000000000 +0000 @@ -6555,6 +6555,14 @@ syncControl(settings, name, checkbox); continue; } + + // Radio button + auto radioButton = findChild(name); + if (radioButton) + { + syncControl(settings, name, radioButton); + continue; + } } m_Settings = settings; @@ -6579,6 +6587,7 @@ QDoubleSpinBox *pDSB = nullptr; QCheckBox *pCB = nullptr; QComboBox *pComboBox = nullptr; + QRadioButton *pRadioButton = nullptr; bool ok = false; if ((pSB = qobject_cast(widget))) @@ -6612,6 +6621,12 @@ pComboBox->setCurrentText(value); return true; } + else if ((pRadioButton = qobject_cast(widget))) + { + const bool value = settings[key].toBool(); + pRadioButton->setChecked(value); + return true; + } return false; }; diff -Nru kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/profileeditor.cpp kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/profileeditor.cpp --- kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/ekos/profileeditor.cpp 2023-06-19 04:07:41.000000000 +0000 +++ kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/ekos/profileeditor.cpp 2023-07-04 12:51:13.000000000 +0000 @@ -808,6 +808,7 @@ ui->externalGuideHost->setText(profile["remote_guiding_host"].toString(("localhost"))); ui->externalGuideHost->setText(profile["remote_guiding_port"].toString()); ui->INDIWebManagerCheck->setChecked(profile["use_web_manager"].toBool()); + ui->remoteDrivers->setText(profile["remote"].toString(ui->remoteDrivers->text())); m_INDIHub = profile["indihub"].toInt(m_INDIHub); diff -Nru kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/indi/drivermanager.cpp kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/indi/drivermanager.cpp --- kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/kstars/indi/drivermanager.cpp 2023-06-19 04:07:41.000000000 +0000 +++ kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/kstars/indi/drivermanager.cpp 2023-07-04 12:51:13.000000000 +0000 @@ -674,6 +674,7 @@ updateMenuActions(); updateLocalTab(); + updateClientTab(); } void DriverManager::setServerStarted() diff -Nru kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/Tests/capture/test_sequencejobstate.cpp kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/Tests/capture/test_sequencejobstate.cpp --- kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/Tests/capture/test_sequencejobstate.cpp 2023-06-19 04:07:40.000000000 +0000 +++ kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/Tests/capture/test_sequencejobstate.cpp 2023-07-04 12:51:13.000000000 +0000 @@ -66,15 +66,33 @@ QTest::addColumn("angle_delta"); /*!< difference between current and target rotator angle */ // iterate over all combinations - for (bool preview : {false, true}) - for (bool rotate : {false, true}) - for (bool temperature : {false, true}) - for (bool guiding : {false, true}) - for (double delta_t : {-21.0, 0.0}) - for (double delta_r : {45.0, 0.0}) - QTest::newRow(QString("preview=%4 enforce rotate=%1, temperature=%2, guiding=%3, delta_t=%5, delta_rot=%6") - .arg(rotate).arg(temperature).arg(guiding).arg(preview).arg(delta_t).arg(delta_r).toLocal8Bit()) - << preview << rotate << temperature << guiding << delta_t << delta_r; + for (bool preview : + { + false, true + }) + for (bool rotate : + { + false, true + }) + for (bool temperature : + { + false, true + }) + for (bool guiding : + { + false, true + }) + for (double delta_t : + { + -21.0, 0.0 + }) + for (double delta_r : + { + 45.0, 0.0 + }) + QTest::newRow(QString("preview=%4 enforce rotate=%1, temperature=%2, guiding=%3, delta_t=%5, delta_rot=%6") + .arg(rotate).arg(temperature).arg(guiding).arg(preview).arg(delta_t).arg(delta_r).toLocal8Bit()) + << preview << rotate << temperature << guiding << delta_t << delta_r; } /* ********************************************************************************* @@ -126,7 +144,8 @@ temperatureTimer = new QTimer(this); temperatureTimer->setInterval(200); temperatureTimer->setSingleShot(false); - connect(temperatureTimer, &QTimer::timeout, this, [this]() { + connect(temperatureTimer, &QTimer::timeout, this, [this]() + { if (std::abs(m_ccdtemperature - m_targetccdtemp) > std::numeric_limits::epsilon()) { // decrease gap by 1 deg or less @@ -143,7 +162,8 @@ rotatorTimer = new QTimer(this); rotatorTimer->setInterval(200); rotatorTimer->setSingleShot(false); - connect(rotatorTimer, &QTimer::timeout, this, [this]() { + connect(rotatorTimer, &QTimer::timeout, this, [this]() + { if (std::abs(m_rotatorangle - m_targetrotatorangle) > std::numeric_limits::epsilon()) { // decrease gap by 10 deg or less @@ -160,7 +180,8 @@ guidingTimer = new QTimer(this); guidingTimer->setInterval(200); guidingTimer->setSingleShot(false); - connect(guidingTimer, &QTimer::timeout, this, [this]() { + connect(guidingTimer, &QTimer::timeout, this, [this]() + { if (m_guiding_dev > m_target_guiding_dev) { m_guiding_dev /= 2; @@ -196,10 +217,10 @@ temperatureTimer->start(); } -void TestAdapter::setRotatorAngle(double *value) +void TestAdapter::setRotatorAngle(double value) { // set the new target - m_targetrotatorangle = *value; + m_targetrotatorangle = value; // start timer if not already running if (! rotatorTimer->isActive()) rotatorTimer->start(); diff -Nru kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/Tests/capture/test_sequencejobstate.h kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/Tests/capture/test_sequencejobstate.h --- kstars-bleeding-3.6.5+202306190407~ubuntu22.04.1/Tests/capture/test_sequencejobstate.h 2023-06-19 04:07:40.000000000 +0000 +++ kstars-bleeding-3.6.5+202307041251~ubuntu22.04.1/Tests/capture/test_sequencejobstate.h 2023-07-04 12:51:13.000000000 +0000 @@ -81,7 +81,7 @@ // set the current CCD temperature void setCCDTemperature(double value); // set the current camera rotator position - void setRotatorAngle(double *value); + void setRotatorAngle(double value); // flag if capture preparation is completed bool isCapturePreparationComplete = false;