Changeset View
Changeset View
Standalone View
Standalone View
kstars/ekos/guide/guide.cpp
| Show First 20 Lines • Show All 109 Lines • ▼ Show 20 Line(s) | 41 | { | |||
|---|---|---|---|---|---|
| 110 | opsCalibration = new OpsCalibration(internalGuider); | 110 | opsCalibration = new OpsCalibration(internalGuider); | ||
| 111 | KPageWidgetItem *page = dialog->addPage(opsCalibration, i18n("Calibration")); | 111 | KPageWidgetItem *page = dialog->addPage(opsCalibration, i18n("Calibration")); | ||
| 112 | page->setIcon(QIcon::fromTheme("tool-measure")); | 112 | page->setIcon(QIcon::fromTheme("tool-measure")); | ||
| 113 | opsGuide = new OpsGuide(); | 113 | opsGuide = new OpsGuide(); | ||
| 114 | 114 | | |||
| 115 | connect(opsGuide, &OpsGuide::settingsUpdated, [this]() | 115 | connect(opsGuide, &OpsGuide::settingsUpdated, [this]() | ||
| 116 | { | 116 | { | ||
| 117 | onThresholdChanged(Options::guideAlgorithm()); | 117 | onThresholdChanged(Options::guideAlgorithm()); | ||
| 118 | configurePHD2Camera(); | ||||
| 118 | }); | 119 | }); | ||
| 119 | 120 | | |||
| 120 | page = dialog->addPage(opsGuide, i18n("Guide")); | 121 | page = dialog->addPage(opsGuide, i18n("Guide")); | ||
| 121 | page->setIcon(QIcon::fromTheme("kstars_guides")); | 122 | page->setIcon(QIcon::fromTheme("kstars_guides")); | ||
| 122 | 123 | | |||
| 123 | internalGuider->setGuideView(guideView); | 124 | internalGuider->setGuideView(guideView); | ||
| 124 | 125 | | |||
| 125 | // Set current guide type | 126 | // Set current guide type | ||
| ▲ Show 20 Lines • Show All 413 Lines • ▼ Show 20 Line(s) | |||||
| 539 | } | 540 | } | ||
| 540 | 541 | | |||
| 541 | void Guide::addCamera(ISD::GDInterface *newCCD) | 542 | void Guide::addCamera(ISD::GDInterface *newCCD) | ||
| 542 | { | 543 | { | ||
| 543 | ISD::CCD *ccd = static_cast<ISD::CCD *>(newCCD); | 544 | ISD::CCD *ccd = static_cast<ISD::CCD *>(newCCD); | ||
| 544 | 545 | | |||
| 545 | if (CCDs.contains(ccd)) | 546 | if (CCDs.contains(ccd)) | ||
| 546 | return; | 547 | return; | ||
| 547 | if (guiderType != GUIDE_INTERNAL) | 548 | if (guiderType == GUIDE_LINGUIDER) | ||
TallFurryMan: Switch case might have been appropriate now that all cases are distinct. | |||||
Well my hope is to get rid of the if statement that now only happens for Linguider entirely. But I don't have Linguider to try to make the same changes that I did for PHD2. Nor do I have any experience with it. lancaster: Well my hope is to get rid of the if statement that now only happens for Linguider entirely. | |||||
I went back to the old if structure here because it makes sense to disable PHD2 cameras using the old method until they get recognized by my configure PHD2 camera method and get enabled by the user lancaster: I went back to the old if structure here because it makes sense to disable PHD2 cameras using… | |||||
| 548 | { | 549 | { | ||
| 549 | connect(ccd, &ISD::CCD::newBLOBManager, [ccd](INDI::Property * prop) | 550 | connect(ccd, &ISD::CCD::newBLOBManager, [ccd](INDI::Property * prop) | ||
| 550 | { | 551 | { | ||
| 551 | if (!strcmp(prop->getName(), "CCD1") || !strcmp(prop->getName(), "CCD2")) | 552 | if (!strcmp(prop->getName(), "CCD1") || !strcmp(prop->getName(), "CCD2")) | ||
| 553 | { | ||||
| 552 | ccd->setBLOBEnabled(Options::guideRemoteImagesEnabled(), prop->getName()); | 554 | ccd->setBLOBEnabled(Options::guideRemoteImagesEnabled(), prop->getName()); | ||
| 555 | } | ||||
| 553 | }); | 556 | }); | ||
| 557 | } | ||||
| 558 | if(guiderType != GUIDE_INTERNAL) | ||||
| 559 | { | ||||
| 554 | guiderCombo->clear(); | 560 | guiderCombo->clear(); | ||
| 555 | guiderCombo->setEnabled(false); | 561 | guiderCombo->setEnabled(false); | ||
| 556 | if (guiderType == GUIDE_PHD2) | 562 | if (guiderType == GUIDE_PHD2) | ||
| 557 | guiderCombo->addItem("PHD2"); | 563 | guiderCombo->addItem("PHD2"); | ||
| 558 | else | 564 | else | ||
| 559 | guiderCombo->addItem("LinGuider"); | 565 | guiderCombo->addItem("LinGuider"); | ||
| 560 | return; | | |||
| 561 | } | 566 | } | ||
| 562 | else | 567 | else | ||
| 568 | { | ||||
| 563 | guiderCombo->setEnabled(true); | 569 | guiderCombo->setEnabled(true); | ||
| 570 | guiderCombo->addItem(ccd->getDeviceName()); | ||||
| 571 | } | ||||
| 564 | 572 | | |||
| 565 | CCDs.append(ccd); | 573 | CCDs.append(ccd); | ||
| 574 | checkCCD(); | ||||
| 575 | } | ||||
| 566 | 576 | | |||
| 567 | guiderCombo->addItem(ccd->getDeviceName()); | 577 | void Guide::configurePHD2Camera() | ||
| 578 | { | ||||
| 579 | if(phd2Guider->getCurrentCamera() == "" || guiderType != GUIDE_PHD2) | ||||
| 580 | return; | ||||
| 568 | 581 | | |||
| 569 | checkCCD(); | 582 | currentCCD = nullptr; | ||
| 583 | foreach(ISD::CCD *ccd, CCDs) | ||||
| 584 | { | ||||
| 585 | if(phd2Guider->getCurrentCamera().contains(ccd->getDeviceName())) | ||||
| 586 | { | ||||
At least when using the INDI Guiding simulator, ccd->getDeviceName() returns "Guide Simulator", and phd2Guider->getCurrentCamera() returns "INDI Camera [Guide Simulator]". As a result, this loop does not find the matching CCD. wreissenberger: At least when using the INDI Guiding simulator, ccd->getDeviceName() returns "Guide Simulator"… | |||||
Odd, for me, both returned "Guide Simulator". Well I could use the contains method to see if the PHD2 String contains the string from the CCD device name. lancaster: Odd, for me, both returned "Guide Simulator". Well I could use the contains method to see if… | |||||
lancaster: Try it again now with the change I just made. | |||||
| 587 | currentCCD = ccd; | ||||
| 588 | break; | ||||
| 589 | } | ||||
| 590 | } | ||||
| 591 | | ||||
| 592 | //This means that PHD2's current camera is not in Ekos. | ||||
| 593 | if(!currentCCD) | ||||
| 594 | { | ||||
| 595 | QString log = i18n("PHD2's current camera: %1, is NOT connected to Ekos. ", phd2Guider->getCurrentCamera()); | ||||
As a side note, this will be the case in my obs, so that branch will tested in my environment. I think the option "receive external guide frames" is confusing and should be renamed (no action from your part, warning is OK). TallFurryMan: As a side note, this will be the case in my obs, so that branch will tested in my environment. | |||||
So I partially agree. If you have seen my comments before, I have definitely advocated using PHD2-only connected guiders rather than using INDI connected guiders that are also connected to Ekos. In fact this is what I have been doing on my system the last couple of years. I would like to see this option of switching back and forth between receiving the full guide frames and the profile image become an option similar to and as easy to use as the "use subframe" checkboxes in Ekos. This is like my first step on that road. It still requires reconnecting or restarting. I haven't yet figured out how to make it switch perfectly. The issue is that the guide camera getting blobs enabled and disabled doesn't always seem to work except for the first time I call it. So a reconnection or restart is needed? it needs further analysis. But for now, the message just says restart Ekos and that works. lancaster: So I partially agree. If you have seen my comments before, I have definitely advocated using… | |||||
(What I meant was that my obs has two indiservers indeed, one for the guider ccd, one for Ekos. But configuring phd2 to capture from one and send corrections to the other is tricky.) TallFurryMan: (What I meant was that my obs has two indiservers indeed, one for the guider ccd, one for Ekos. | |||||
Do you mean one INDI Server for the Mount and one for the CCD? I'm not sure your configuration would cause any issues. With my new code, the only thing Ekos cares about for this option is what PHD2 is using for the Camera, not for the mount or aux mount. And basically if Ekos has a connection to the same camera, then it should get the name from PHD2, identify that they are the same camera and treat that as the "guide" camera. Then it should receive the full guide frames if the user wants that, or the guide star image instead. If the same camera isn't connected to Ekos, then all you can do is get the guide star image. lancaster: Do you mean one INDI Server for the Mount and one for the CCD?
I'm not sure your configuration… | |||||
| 596 | if(Options::guideRemoteImagesEnabled()) | ||||
| 597 | log += i18n("No guide image will be displayed while guiding. Please disable the Receive External Guide Frames Option in Ekos Guide Options if you want to receive the PHD2 Guide Star Image."); | ||||
| 598 | else | ||||
| 599 | log += i18n("It does not need to be connected, the PHD2 Guide Star Image should still be received."); | ||||
| 600 | appendLogText(log); | ||||
| 601 | return; | ||||
| 602 | } | ||||
| 603 | | ||||
| 604 | QString log = i18n("PHD2's current camera: %1, IS connected to Ekos. ", phd2Guider->getCurrentCamera()); | ||||
| 605 | if(Options::guideRemoteImagesEnabled()) | ||||
| 606 | log += i18n("Ekos is currently configured to receive the full External Guide Frames."); | ||||
| 607 | else | ||||
| 608 | log += i18n("Ekos is currently configured to ignore the full external guide frames. The PHD2 Guide Star Image should be received instead."); | ||||
| 609 | appendLogText(log); | ||||
| 610 | | ||||
| 611 | currentCCD->setBLOBEnabled(Options::guideRemoteImagesEnabled()); | ||||
| 612 | | ||||
| 613 | if(Options::guideRemoteImagesEnabled()) | ||||
| 614 | { | ||||
| 615 | if (currentCCD->hasGuideHead() && guiderCombo->currentText().contains("Guider")) | ||||
| 616 | useGuideHead = true; | ||||
| 617 | else | ||||
| 618 | useGuideHead = false; | ||||
| 619 | | ||||
| 620 | ISD::CCDChip *targetChip = | ||||
| 621 | currentCCD->getChip(useGuideHead ? ISD::CCDChip::GUIDE_CCD : ISD::CCDChip::PRIMARY_CCD); | ||||
| 622 | if (targetChip && !targetChip->isCapturing()) | ||||
| 623 | { | ||||
| 624 | targetChip->setImageView(guideView, FITS_GUIDE); | ||||
| 625 | targetChip->setCaptureMode(FITS_GUIDE); | ||||
| 626 | } | ||||
| 627 | syncCCDInfo(); | ||||
| 628 | } | ||||
| 570 | } | 629 | } | ||
| 571 | 630 | | |||
| 572 | void Guide::addGuideHead(ISD::GDInterface *newCCD) | 631 | void Guide::addGuideHead(ISD::GDInterface *newCCD) | ||
| 573 | { | 632 | { | ||
| 574 | if (guiderType != GUIDE_INTERNAL) | 633 | if (guiderType != GUIDE_INTERNAL) | ||
| 575 | return; | 634 | return; | ||
| 576 | 635 | | |||
| 577 | ISD::CCD *ccd = static_cast<ISD::CCD *>(newCCD); | 636 | ISD::CCD *ccd = static_cast<ISD::CCD *>(newCCD); | ||
| ▲ Show 20 Lines • Show All 214 Lines • ▼ Show 20 Line(s) | 841 | { | |||
| 792 | { | 851 | { | ||
| 793 | appendLogText(i18n("Connection to the guide CCD is lost.")); | 852 | appendLogText(i18n("Connection to the guide CCD is lost.")); | ||
| 794 | return; | 853 | return; | ||
| 795 | } | 854 | } | ||
| 796 | 855 | | |||
| 797 | if (targetChip->getFrameType() != FRAME_LIGHT) | 856 | if (targetChip->getFrameType() != FRAME_LIGHT) | ||
| 798 | return; | 857 | return; | ||
| 799 | 858 | | |||
| 859 | if(guiderType == GUIDE_INTERNAL) | ||||
| 800 | binningCombo->setEnabled(targetChip->canBin()); | 860 | binningCombo->setEnabled(targetChip->canBin()); | ||
| 861 | | ||||
| 801 | int subBinX = 1, subBinY = 1; | 862 | int subBinX = 1, subBinY = 1; | ||
| 802 | if (targetChip->canBin()) | 863 | if (targetChip->canBin()) | ||
| 803 | { | 864 | { | ||
| 804 | int maxBinX, maxBinY; | 865 | int maxBinX, maxBinY; | ||
| 805 | targetChip->getBinning(&subBinX, &subBinY); | 866 | targetChip->getBinning(&subBinX, &subBinY); | ||
| 806 | targetChip->getMaxBin(&maxBinX, &maxBinY); | 867 | targetChip->getMaxBin(&maxBinX, &maxBinY); | ||
| 807 | 868 | | |||
| 808 | binningCombo->blockSignals(true); | 869 | binningCombo->blockSignals(true); | ||
| ▲ Show 20 Lines • Show All 285 Lines • ▼ Show 20 Line(s) | 1145 | { | |||
| 1094 | stopB->setEnabled(true); | 1155 | stopB->setEnabled(true); | ||
| 1095 | 1156 | | |||
| 1096 | pi->startAnimation(); | 1157 | pi->startAnimation(); | ||
| 1097 | 1158 | | |||
| 1098 | //disconnect(guideView, SIGNAL(trackingStarSelected(int,int)), this, &Ekos::Guide::setTrackingStar(int,int))); | 1159 | //disconnect(guideView, SIGNAL(trackingStarSelected(int,int)), this, &Ekos::Guide::setTrackingStar(int,int))); | ||
| 1099 | } | 1160 | } | ||
| 1100 | else | 1161 | else | ||
| 1101 | { | 1162 | { | ||
| 1102 | if (guiderType == GUIDE_INTERNAL) | | |||
| 1103 | { | | |||
| 1104 | captureB->setEnabled(true); | 1163 | captureB->setEnabled(true); | ||
| 1105 | loopB->setEnabled(true); | 1164 | loopB->setEnabled(true); | ||
| 1165 | if (guiderType == GUIDE_INTERNAL) | ||||
| 1166 | { | ||||
| 1106 | darkFrameCheck->setEnabled(true); | 1167 | darkFrameCheck->setEnabled(true); | ||
| 1107 | subFrameCheck->setEnabled(true); | 1168 | subFrameCheck->setEnabled(true); | ||
| 1108 | autoStarCheck->setEnabled(true); | 1169 | autoStarCheck->setEnabled(true); | ||
| 1109 | } | 1170 | } | ||
| 1110 | 1171 | | |||
| 1111 | if (calibrationComplete) | 1172 | if (calibrationComplete) | ||
| 1112 | clearCalibrationB->setEnabled(true); | 1173 | clearCalibrationB->setEnabled(true); | ||
| 1113 | guideB->setEnabled(true); | 1174 | guideB->setEnabled(true); | ||
| ▲ Show 20 Lines • Show All 594 Lines • ▼ Show 20 Line(s) | 1757 | { | |||
| 1708 | emit newStatus(state); | 1769 | emit newStatus(state); | ||
| 1709 | 1770 | | |||
| 1710 | switch (state) | 1771 | switch (state) | ||
| 1711 | { | 1772 | { | ||
| 1712 | case GUIDE_CONNECTED: | 1773 | case GUIDE_CONNECTED: | ||
| 1713 | appendLogText(i18n("External guider connected.")); | 1774 | appendLogText(i18n("External guider connected.")); | ||
| 1714 | externalConnectB->setEnabled(false); | 1775 | externalConnectB->setEnabled(false); | ||
| 1715 | externalDisconnectB->setEnabled(true); | 1776 | externalDisconnectB->setEnabled(true); | ||
| 1716 | captureB->setEnabled(false); | 1777 | captureB->setEnabled(true); | ||
| 1717 | loopB->setEnabled(false); | 1778 | loopB->setEnabled(true); | ||
| 1718 | clearCalibrationB->setEnabled(true); | 1779 | clearCalibrationB->setEnabled(true); | ||
| 1719 | guideB->setEnabled(true); | 1780 | guideB->setEnabled(true); | ||
| 1720 | setBLOBEnabled(false); | 1781 | setBLOBEnabled(false); | ||
| 1721 | break; | 1782 | break; | ||
| 1722 | 1783 | | |||
| 1723 | case GUIDE_DISCONNECTED: | 1784 | case GUIDE_DISCONNECTED: | ||
| 1724 | appendLogText(i18n("External guider disconnected.")); | 1785 | appendLogText(i18n("External guider disconnected.")); | ||
| 1725 | setBusy(false); //This needs to come before caputureB since it will set it to enabled again. | 1786 | setBusy(false); //This needs to come before caputureB since it will set it to enabled again. | ||
| ▲ Show 20 Lines • Show All 174 Lines • ▼ Show 20 Line(s) | 1960 | if (newCenter.z() > 0) | |||
| 1900 | starCenter.setZ(newCenter.z()); | 1961 | starCenter.setZ(newCenter.z()); | ||
| 1901 | 1962 | | |||
| 1902 | if (updateNow) | 1963 | if (updateNow) | ||
| 1903 | syncTrackingBoxPosition(); | 1964 | syncTrackingBoxPosition(); | ||
| 1904 | } | 1965 | } | ||
| 1905 | 1966 | | |||
| 1906 | void Guide::syncTrackingBoxPosition() | 1967 | void Guide::syncTrackingBoxPosition() | ||
| 1907 | { | 1968 | { | ||
| 1969 | if(!currentCCD) | ||||
| 1970 | return; | ||||
| 1908 | ISD::CCDChip *targetChip = currentCCD->getChip(useGuideHead ? ISD::CCDChip::GUIDE_CCD : ISD::CCDChip::PRIMARY_CCD); | 1971 | ISD::CCDChip *targetChip = currentCCD->getChip(useGuideHead ? ISD::CCDChip::GUIDE_CCD : ISD::CCDChip::PRIMARY_CCD); | ||
| 1909 | Q_ASSERT(targetChip); | 1972 | Q_ASSERT(targetChip); | ||
| 1910 | 1973 | | |||
| 1911 | int subBinX = 1, subBinY = 1; | 1974 | int subBinX = 1, subBinY = 1; | ||
| 1912 | targetChip->getBinning(&subBinX, &subBinY); | 1975 | targetChip->getBinning(&subBinX, &subBinY); | ||
| 1913 | 1976 | | |||
| 1914 | if (starCenter.isNull() == false) | 1977 | if (starCenter.isNull() == false) | ||
| 1915 | { | 1978 | { | ||
| ▲ Show 20 Lines • Show All 149 Lines • ▼ Show 20 Line(s) | 2092 | case GUIDE_PHD2: | |||
| 2065 | l_FOV->setEnabled(false); | 2128 | l_FOV->setEnabled(false); | ||
| 2066 | l_FbyD->setEnabled(false); | 2129 | l_FbyD->setEnabled(false); | ||
| 2067 | l_Focal->setEnabled(false); | 2130 | l_Focal->setEnabled(false); | ||
| 2068 | driftGraphicsGroup->setEnabled(true); | 2131 | driftGraphicsGroup->setEnabled(true); | ||
| 2069 | 2132 | | |||
| 2070 | ST4Combo->setEnabled(false); | 2133 | ST4Combo->setEnabled(false); | ||
| 2071 | exposureIN->setEnabled(true); | 2134 | exposureIN->setEnabled(true); | ||
| 2072 | binningCombo->setEnabled(false); | 2135 | binningCombo->setEnabled(false); | ||
| 2073 | boxSizeCombo->setEnabled(false); | 2136 | boxSizeCombo->setEnabled(Options::guideRemoteImagesEnabled()); | ||
| 2074 | filterCombo->setEnabled(false); | 2137 | filterCombo->setEnabled(false); | ||
| 2075 | 2138 | | |||
| 2076 | if (Options::guideRemoteImagesEnabled() == false) | 2139 | if (Options::guideRemoteImagesEnabled() == false) | ||
| 2077 | { | 2140 | { | ||
| 2078 | //guiderCombo->setCurrentIndex(-1); | 2141 | //guiderCombo->setCurrentIndex(-1); | ||
| 2079 | guiderCombo->setToolTip(i18n("Select a camera to disable remote streaming.")); | 2142 | guiderCombo->setToolTip(i18n("Select a camera to disable remote streaming.")); | ||
| 2080 | } | 2143 | } | ||
| 2081 | else | 2144 | else | ||
| ▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Line(s) | 2192 | { | |||
| 2130 | connect(guider, &Ekos::GuideInterface::frameCaptureRequested, this, &Ekos::Guide::capture); | 2193 | connect(guider, &Ekos::GuideInterface::frameCaptureRequested, this, &Ekos::Guide::capture); | ||
| 2131 | connect(guider, &Ekos::GuideInterface::newLog, this, &Ekos::Guide::appendLogText); | 2194 | connect(guider, &Ekos::GuideInterface::newLog, this, &Ekos::Guide::appendLogText); | ||
| 2132 | connect(guider, &Ekos::GuideInterface::newStatus, this, &Ekos::Guide::setStatus); | 2195 | connect(guider, &Ekos::GuideInterface::newStatus, this, &Ekos::Guide::setStatus); | ||
| 2133 | connect(guider, &Ekos::GuideInterface::newStarPosition, this, &Ekos::Guide::setStarPosition); | 2196 | connect(guider, &Ekos::GuideInterface::newStarPosition, this, &Ekos::Guide::setStarPosition); | ||
| 2134 | 2197 | | |||
| 2135 | connect(guider, &Ekos::GuideInterface::newAxisDelta, this, &Ekos::Guide::setAxisDelta); | 2198 | connect(guider, &Ekos::GuideInterface::newAxisDelta, this, &Ekos::Guide::setAxisDelta); | ||
| 2136 | connect(guider, &Ekos::GuideInterface::newAxisPulse, this, &Ekos::Guide::setAxisPulse); | 2199 | connect(guider, &Ekos::GuideInterface::newAxisPulse, this, &Ekos::Guide::setAxisPulse); | ||
| 2137 | connect(guider, &Ekos::GuideInterface::newAxisSigma, this, &Ekos::Guide::setAxisSigma); | 2200 | connect(guider, &Ekos::GuideInterface::newAxisSigma, this, &Ekos::Guide::setAxisSigma); | ||
| 2201 | | ||||
| 2202 | connect(guider, &Ekos::GuideInterface::guideEquipmentUpdated, this, &Ekos::Guide::configurePHD2Camera); | ||||
| 2138 | } | 2203 | } | ||
| 2139 | 2204 | | |||
| 2140 | externalConnectB->setEnabled(false); | 2205 | externalConnectB->setEnabled(false); | ||
| 2141 | externalDisconnectB->setEnabled(false); | 2206 | externalDisconnectB->setEnabled(false); | ||
| 2142 | 2207 | | |||
| 2143 | if (guider != nullptr && guiderType != GUIDE_INTERNAL) | 2208 | if (guider != nullptr && guiderType != GUIDE_INTERNAL) | ||
| 2144 | { | 2209 | { | ||
| 2145 | externalConnectB->setEnabled(!guider->isConnected()); | 2210 | externalConnectB->setEnabled(!guider->isConnected()); | ||
| ▲ Show 20 Lines • Show All 282 Lines • ▼ Show 20 Line(s) | 2459 | { | |||
| 2428 | Options::setDECMinimumPulse(spinBox_MinPulseDEC->value()); | 2493 | Options::setDECMinimumPulse(spinBox_MinPulseDEC->value()); | ||
| 2429 | } | 2494 | } | ||
| 2430 | 2495 | | |||
| 2431 | void Guide::setTrackingStar(int x, int y) | 2496 | void Guide::setTrackingStar(int x, int y) | ||
| 2432 | { | 2497 | { | ||
| 2433 | QVector3D newStarPosition(x, y, -1); | 2498 | QVector3D newStarPosition(x, y, -1); | ||
| 2434 | setStarPosition(newStarPosition, true); | 2499 | setStarPosition(newStarPosition, true); | ||
| 2435 | 2500 | | |||
| 2501 | if(guiderType == GUIDE_PHD2 && Options::guideRemoteImagesEnabled()) | ||||
| 2502 | { | ||||
| 2503 | phd2Guider->setLockPosition(starCenter.x(),starCenter.y()); | ||||
| 2504 | } | ||||
| 2505 | | ||||
| 2436 | /*if (state == GUIDE_STAR_SELECT) | 2506 | /*if (state == GUIDE_STAR_SELECT) | ||
| 2437 | { | 2507 | { | ||
| 2438 | guider->setStarPosition(newStarPosition); | 2508 | guider->setStarPosition(newStarPosition); | ||
| 2439 | guider->calibrate(); | 2509 | guider->calibrate(); | ||
| 2440 | }*/ | 2510 | }*/ | ||
| 2441 | 2511 | | |||
| 2442 | if (operationStack.isEmpty() == false) | 2512 | if (operationStack.isEmpty() == false) | ||
| 2443 | executeOperationStack(); | 2513 | executeOperationStack(); | ||
| 2444 | } | 2514 | } | ||
| 2445 | 2515 | | |||
| 2446 | void Guide::setAxisDelta(double ra, double de) | 2516 | void Guide::setAxisDelta(double ra, double de) | ||
| 2447 | { | 2517 | { | ||
| 2518 | //If PHD2 starts guiding because somebody pusted the button remotely, we want to set the state to guiding. | ||||
| 2519 | //If guide pulses start coming in, it must be guiding. | ||||
| 2520 | if(guiderType == GUIDE_PHD2 && state != GUIDE_GUIDING) | ||||
| 2521 | setStatus(GUIDE_GUIDING); | ||||
| 2522 | | ||||
| 2448 | // Time since timer started. | 2523 | // Time since timer started. | ||
| 2449 | double key = guideTimer.elapsed() / 1000.0; | 2524 | double key = guideTimer.elapsed() / 1000.0; | ||
| 2450 | 2525 | | |||
| 2451 | ra = -ra; //The ra is backwards in sign from how it should be displayed on the graph. | 2526 | ra = -ra; //The ra is backwards in sign from how it should be displayed on the graph. | ||
| 2452 | 2527 | | |||
| 2453 | driftGraph->graph(0)->addData(key, ra); | 2528 | driftGraph->graph(0)->addData(key, ra); | ||
| 2454 | driftGraph->graph(1)->addData(key, de); | 2529 | driftGraph->graph(1)->addData(key, de); | ||
| 2455 | 2530 | | |||
| ▲ Show 20 Lines • Show All 521 Lines • ▼ Show 20 Line(s) | 3051 | else | |||
| 2977 | fv->updateFITS(url, 0); | 3052 | fv->updateFITS(url, 0); | ||
| 2978 | 3053 | | |||
| 2979 | fv->show(); | 3054 | fv->show(); | ||
| 2980 | } | 3055 | } | ||
| 2981 | } | 3056 | } | ||
| 2982 | 3057 | | |||
| 2983 | void Guide::setBLOBEnabled(bool enable, const QString &ccd) | 3058 | void Guide::setBLOBEnabled(bool enable, const QString &ccd) | ||
| 2984 | { | 3059 | { | ||
| 2985 | // Nothing to do if guider is international or remote images are enabled | 3060 | // Nothing to do if guider is internal or remote images are enabled | ||
| 2986 | if (guiderType == GUIDE_INTERNAL || Options::guideRemoteImagesEnabled()) | 3061 | if (guiderType == GUIDE_INTERNAL || Options::guideRemoteImagesEnabled()) | ||
| 2987 | return; | 3062 | return; | ||
| 2988 | 3063 | | |||
| 2989 | // If guider is external and remote images option is disabled AND BLOB is enabled, then we disabled it | 3064 | // If guider is external and remote images option is disabled AND BLOB is enabled, then we disabled it | ||
| 2990 | 3065 | | |||
| 2991 | foreach(ISD::CCD *oneCCD, CCDs) | 3066 | foreach(ISD::CCD *oneCCD, CCDs) | ||
| 2992 | { | 3067 | { | ||
| 2993 | // If it's not the desired CCD, continue. | 3068 | // If it's not the desired CCD, continue. | ||
| ▲ Show 20 Lines • Show All 423 Lines • ▼ Show 20 Line(s) | 3413 | { | |||
| 3417 | connect(spinBox_MinPulseDEC, &QSpinBox::editingFinished, this, &Ekos::Guide::syncSettings); | 3492 | connect(spinBox_MinPulseDEC, &QSpinBox::editingFinished, this, &Ekos::Guide::syncSettings); | ||
| 3418 | 3493 | | |||
| 3419 | // Capture | 3494 | // Capture | ||
| 3420 | connect(captureB, &QPushButton::clicked, this, [this]() | 3495 | connect(captureB, &QPushButton::clicked, this, [this]() | ||
| 3421 | { | 3496 | { | ||
| 3422 | state = GUIDE_CAPTURE; | 3497 | state = GUIDE_CAPTURE; | ||
| 3423 | emit newStatus(state); | 3498 | emit newStatus(state); | ||
| 3424 | 3499 | | |||
| 3500 | if(guiderType == GUIDE_PHD2) | ||||
| 3501 | phd2Guider->captureSingleFrame(); | ||||
| 3502 | else | ||||
| 3425 | capture(); | 3503 | capture(); | ||
| 3426 | }); | 3504 | }); | ||
| 3427 | 3505 | | |||
| 3428 | connect(loopB, &QPushButton::clicked, this, [this]() | 3506 | connect(loopB, &QPushButton::clicked, this, [this]() | ||
| 3429 | { | 3507 | { | ||
| 3430 | state = GUIDE_LOOPING; | 3508 | state = GUIDE_LOOPING; | ||
| 3431 | emit newStatus(state); | 3509 | emit newStatus(state); | ||
| 3432 | 3510 | | |||
| 3511 | if(guiderType == GUIDE_PHD2) | ||||
| 3512 | { | ||||
| 3513 | phd2Guider->loop(); | ||||
| 3514 | stopB->setEnabled(true); | ||||
| 3515 | } | ||||
| 3516 | else | ||||
| 3433 | capture(); | 3517 | capture(); | ||
| 3434 | }); | 3518 | }); | ||
| 3435 | 3519 | | |||
| 3436 | // Stop | 3520 | // Stop | ||
| 3437 | connect(stopB, &QPushButton::clicked, this, &Ekos::Guide::abort); | 3521 | connect(stopB, &QPushButton::clicked, this, &Ekos::Guide::abort); | ||
| 3438 | 3522 | | |||
| 3439 | // Clear Calibrate | 3523 | // Clear Calibrate | ||
| 3440 | //connect(calibrateB, &QPushButton::clicked, this, &Ekos::Guide::calibrate())); | 3524 | //connect(calibrateB, &QPushButton::clicked, this, &Ekos::Guide::calibrate())); | ||
| ▲ Show 20 Lines • Show All 89 Lines • Show Last 20 Lines | |||||
Switch case might have been appropriate now that all cases are distinct.