Commit 9658f6bd authored by Jasem Mutlaq's avatar Jasem Mutlaq

Send target chip info for newImage and do not send guide image to the summary...

Send target chip info for newImage and do not send guide image to the summary screen. Thanks to Robert for noting this
parent 90951188
......@@ -386,9 +386,9 @@ void Capture::abort()
}
void Capture::sendNewImage(QImage *image)
void Capture::sendNewImage(QImage *image, ISD::CCDChip *myChip)
{
if (activeJob)
if (activeJob && myChip != guideChip)
emit newImage(image, activeJob);
}
......@@ -795,7 +795,7 @@ void Capture::newFITS(IBLOB *bp)
return;
disconnect(currentCCD, SIGNAL(BLOBUpdated(IBLOB*)), this, SLOT(newFITS(IBLOB*)));
disconnect(currentCCD, SIGNAL(newImage(QImage*)), this, SLOT(sendNewImage(QImage*)));
disconnect(currentCCD, SIGNAL(newImage(QImage*, ISD::CCDChip*)), this, SLOT(sendNewImage(QImage*, ISD::CCDChip)));
if (calibrationState == CALIBRATE_START)
{
......
......@@ -416,7 +416,7 @@ private slots:
bool processPostCaptureCalibrationStage();
// Send image info
void sendNewImage(QImage *image);
void sendNewImage(QImage *image, ISD::CCDChip *myChip);
signals:
void newLog();
......
......@@ -1278,7 +1278,7 @@ void CCD::processBLOB(IBLOB* bp)
normalTabID = tabRC;
targetChip->setImage(fv->getView(normalTabID), FITS_NORMAL);
emit newImage(fv->getView(normalTabID)->getDisplayImage());
emit newImage(fv->getView(normalTabID)->getDisplayImage(), targetChip);
}
else
// If opening file fails, we treat it the same as exposure failure and recapture again if possible
......@@ -1302,7 +1302,7 @@ void CCD::processBLOB(IBLOB* bp)
focusTabID = tabRC;
targetChip->setImage(fv->getView(focusTabID), FITS_FOCUS);
emit newImage(fv->getView(focusTabID)->getDisplayImage());
emit newImage(fv->getView(focusTabID)->getDisplayImage(), targetChip);
}
else
emit newExposureValue(targetChip, 0, IPS_ALERT);
......@@ -1324,7 +1324,7 @@ void CCD::processBLOB(IBLOB* bp)
guideTabID = tabRC;
targetChip->setImage(fv->getView(guideTabID), FITS_GUIDE);
emit newImage(fv->getView(guideTabID)->getDisplayImage());
emit newImage(fv->getView(guideTabID)->getDisplayImage(), targetChip);
}
else
emit newExposureValue(targetChip, 0, IPS_ALERT);
......
......@@ -172,7 +172,7 @@ signals:
void newExposureValue(ISD::CCDChip *chip, double value, IPState state);
void newGuideStarData(ISD::CCDChip *chip, double dx, double dy, double fit);
void newRemoteFile(QString);
void newImage(QImage *image);
void newImage(QImage *image, ISD::CCDChip *targetChip);
private:
void addFITSKeywords(QString filename);
......
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