summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-08-18 06:35:47 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-08-18 06:35:47 (GMT)
commit9658f6bd53870ab8c7c2a0894b35741a099b81aa (patch)
treeed0065e5a12b332889f0da101b35824675ba129d
parent9095118860409ea4ebab6b2a382b3ad089aa4b72 (diff)
Send target chip info for newImage and do not send guide image to the summary screen. Thanks to Robert for noting this
-rw-r--r--kstars/ekos/capture.cpp6
-rw-r--r--kstars/ekos/capture.h2
-rw-r--r--kstars/indi/indiccd.cpp6
-rw-r--r--kstars/indi/indiccd.h2
4 files changed, 8 insertions, 8 deletions
diff --git a/kstars/ekos/capture.cpp b/kstars/ekos/capture.cpp
index 3809f07..1cbb13e 100644
--- a/kstars/ekos/capture.cpp
+++ b/kstars/ekos/capture.cpp
@@ -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)
{
diff --git a/kstars/ekos/capture.h b/kstars/ekos/capture.h
index 44e2305..8cc12a0 100644
--- a/kstars/ekos/capture.h
+++ b/kstars/ekos/capture.h
@@ -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();
diff --git a/kstars/indi/indiccd.cpp b/kstars/indi/indiccd.cpp
index e7dc049..3163762 100644
--- a/kstars/indi/indiccd.cpp
+++ b/kstars/indi/indiccd.cpp
@@ -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);
diff --git a/kstars/indi/indiccd.h b/kstars/indi/indiccd.h
index 505048a..019096f 100644
--- a/kstars/indi/indiccd.h
+++ b/kstars/indi/indiccd.h
@@ -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);