Commit 7e4ad776 authored by Jasem Mutlaq's avatar Jasem Mutlaq

Do not set currentCCD on addCCD, it should be set later by checkCCD

parent 08aeb5a7
......@@ -122,11 +122,14 @@ void Guide::setDefaultCCD(QString ccd)
void Guide::addCCD(ISD::GDInterface *newCCD)
{
currentCCD = static_cast<ISD::CCD*>(newCCD);
ISD::CCD *ccd = static_cast<ISD::CCD*>(newCCD);
CCDs.append(currentCCD);
if (CCDs.contains(ccd))
return;
CCDs.append(ccd);
guiderCombo->addItem(currentCCD->getDeviceName());
guiderCombo->addItem(ccd->getDeviceName());
//checkCCD(CCDs.count()-1);
//guiderCombo->setCurrentIndex(CCDs.count()-1);
......@@ -134,13 +137,13 @@ void Guide::addCCD(ISD::GDInterface *newCCD)
setGuiderProcess(Options::useEkosGuider() ? GUIDE_INTERNAL : GUIDE_PHD2);
}
void Guide::addGuideHead(ISD::GDInterface *ccd)
void Guide::addGuideHead(ISD::GDInterface *newCCD)
{
ISD::CCD *newCCD = static_cast<ISD::CCD *> (ccd);
ISD::CCD *ccd = static_cast<ISD::CCD *> (newCCD);
CCDs.append(newCCD);
CCDs.append(ccd);
QString guiderName = newCCD->getDeviceName() + QString(" Guider");
QString guiderName = ccd->getDeviceName() + QString(" Guider");
if (guiderCombo->findText(guiderName) == -1)
{
......
......@@ -191,7 +191,7 @@ public:
bool isDithering();
void addGuideHead(ISD::GDInterface *ccd);
void addGuideHead(ISD::GDInterface *newCCD);
void syncTelescopeInfo();
void syncCCDInfo();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment