summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-09-02 15:52:22 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-09-02 15:52:22 (GMT)
commiteeb3f9e1806f4dbef7a5e7e2d71f3b80c61226dc (patch)
tree3cdc841ea6a0828a40e21a1111b11c6371f2f2ca
parentd53f6ffbc527479c3b9971a64f83a5f489e455d3 (diff)
Fix few focus box selection issues especially with different bin settings
-rw-r--r--kstars/ekos/ekosmanager.cpp4
-rw-r--r--kstars/ekos/focus.cpp283
-rw-r--r--kstars/ekos/focus.h16
-rw-r--r--kstars/ekos/scheduler.cpp8
-rw-r--r--kstars/indi/indiccd.cpp6
-rw-r--r--kstars/indi/indiccd.h6
-rw-r--r--kstars/org.kde.kstars.Ekos.Focus.xml5
7 files changed, 225 insertions, 103 deletions
diff --git a/kstars/ekos/ekosmanager.cpp b/kstars/ekos/ekosmanager.cpp
index 5ee75c1..bf8c1fb 100644
--- a/kstars/ekos/ekosmanager.cpp
+++ b/kstars/ekos/ekosmanager.cpp
@@ -1223,8 +1223,8 @@ void EkosManager::processTabChange()
{
QWidget *currentWidget = toolsWidget->currentWidget();
- if (focusProcess && currentWidget != focusProcess)
- focusProcess->resetFrame();
+ //if (focusProcess && currentWidget != focusProcess)
+ //focusProcess->resetFrame();
if (alignProcess && currentWidget == alignProcess)
{
diff --git a/kstars/ekos/focus.cpp b/kstars/ekos/focus.cpp
index 97fcc73..854acf6 100644
--- a/kstars/ekos/focus.cpp
+++ b/kstars/ekos/focus.cpp
@@ -65,8 +65,8 @@ Focus::Focus()
inFocusLoop = false;
captureInProgress = false;
inSequenceFocus = false;
- starSelected = false;
- frameModified = false;
+ //starSelected = false;
+ //frameModified = false;
subFramed = false;
resetFocus = false;
m_autoFocusSuccesful = false;
@@ -86,8 +86,8 @@ Focus::Focus()
pulseDuration = 1000;
resetFocusIteration=0;
- fy=fw=fh=0;
- orig_x = orig_y = orig_w = orig_h =-1;
+ //fy=fw=fh=0;
+ //orig_x = orig_y = orig_w = orig_h =-1;
lockedFilterIndex=-1;
maxHFR=1;
minimumRequiredHFR = -1;
@@ -110,7 +110,7 @@ Focus::Focus()
connect(kcfg_subFrame, SIGNAL(toggled(bool)), this, SLOT(toggleSubframe(bool)));
- connect(resetFrameB, SIGNAL(clicked()), this, SLOT(resetFocusFrame()));
+ connect(resetFrameB, SIGNAL(clicked()), this, SLOT(resetFrame()));
connect(CCDCaptureCombo, SIGNAL(activated(QString)), this, SLOT(setDefaultCCD(QString)));
connect(CCDCaptureCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(checkCCD(int)));
@@ -250,7 +250,7 @@ void Focus::toggleAutofocus(bool enable)
resetButtons();
}
-void Focus::resetFrame()
+/*void Focus::resetFrame()
{
if (currentCCD)
{
@@ -265,9 +265,10 @@ void Focus::resetFrame()
haveDarkFrame=false;
calibrationState = CALIBRATE_NONE;
}
-}
+}*/
-void Focus::resetFocusFrame()
+//void Focus::resetFocusFrame()
+void Focus::resetFrame()
{
if (currentCCD)
{
@@ -275,10 +276,22 @@ void Focus::resetFocusFrame()
if (targetChip)
{
- fx=fy=fw=fh=0;
+ //fx=fy=fw=fh=0;
targetChip->resetFrame();
- targetChip->setFocusFrame(0,0,0,0);
- starSelected = false;
+
+ int x,y,w,h;
+ targetChip->getFrame(&x,&y,&w, &h);
+
+ QVariantMap settings;
+ settings["x"] = x;
+ settings["y"] = y;
+ settings["w"] = w;
+ settings["h"] = h;
+ frameSettings[targetChip] = settings;
+ //targetChip->setFocusFrame(0,0,0,0);
+
+ //starSelected = false;
+ starCoords = QVector3D();
subFramed = false;
FITSView *targetImage = targetChip->getImage(FITS_FOCUS);
@@ -327,10 +340,10 @@ void Focus::checkCCD(int ccdNum)
kcfg_autoSelectStar->setEnabled(targetChip->canSubframe());
if (targetChip->canBin())
{
- int binx=1,biny=1;
+ int subBinX=1,subBinY=1;
binningCombo->clear();
- targetChip->getMaxBin(&binx, &biny);
- for (int i=1; i <= binx; i++)
+ targetChip->getMaxBin(&subBinX, &subBinY);
+ for (int i=1; i <= subBinX; i++)
binningCombo->addItem(QString("%1x%2").arg(i).arg(i));
binningCombo->setCurrentIndex(activeBin-1);
@@ -366,8 +379,25 @@ void Focus::syncCCDInfo()
return;
ISD::CCDChip *targetChip = currentCCD->getChip(ISD::CCDChip::PRIMARY_CCD);
- if (targetChip)
- targetChip->getFocusFrame(&fx, &fy, &fw, &fh);
+
+ if (frameSettings.contains(targetChip) == false)
+ {
+ int x,y,w,h;
+ if (targetChip->getFrame(&x, &y, &w, &h))
+ {
+ if (w > 0 && h > 0)
+ {
+ QVariantMap settings;
+
+ settings["x"] = x;
+ settings["y"] = y;
+ settings["w"] = w;
+ settings["h"] = h;
+
+ frameSettings[targetChip] = settings;
+ }
+ }
+ }
}
void Focus::addFilter(ISD::GDInterface *newFilter)
@@ -743,7 +773,7 @@ void Focus::abort()
targetChip->abortExposure();
- resetFrame();
+ //resetFrame();
FITSView *targetImage = targetChip->getImage(FITS_FOCUS);
if (targetImage)
@@ -803,6 +833,10 @@ void Focus::capture()
currentCCD->setUploadMode(ISD::CCD::UPLOAD_CLIENT);
}
+ // On bin change, invalidate the dark frame
+ if (starCoords.isNull() == false && starCoords.z() != activeBin)
+ haveDarkFrame = false;
+
// Check if we need to capture a dark frame
if (inFocusLoop == false && haveDarkFrame == false && focusDarkFrameCheck->isChecked() && calibrationState == CALIBRATE_NONE)
{
@@ -825,7 +859,7 @@ void Focus::capture()
targetChip->setFrameType(ccdFrame);
- if (fw == 0 || fh == 0)
+ /*if (fw == 0 || fh == 0)
targetChip->getFrame(&fx, &fy, &fw, &fh);
targetChip->setFrame(fx, fy, fw, fh);
@@ -834,7 +868,13 @@ void Focus::capture()
targetChip->getFrame(&orig_x, &orig_y, &orig_w, &orig_h);
if (frameModified == false && (fx != orig_x || fy != orig_y || fw != orig_w || fh != orig_h))
- frameModified = true;
+ frameModified = true;*/
+
+ if (frameSettings.contains(targetChip))
+ {
+ QVariantMap settings = frameSettings[targetChip];
+ targetChip->setFrame(settings["x"].toInt(), settings["y"].toInt(), settings["w"].toInt(), settings["h"].toInt());
+ }
captureInProgress = true;
@@ -994,6 +1034,23 @@ void Focus::newFITS(IBLOB *bp)
return;
}
+ int subBinX=1, subBinY=1;
+ targetChip->getBinning(&subBinX, &subBinY);
+
+ if (starCoords.isNull() == false)
+ {
+ // If binning changed, update coords accordingly
+ if (subBinX != starCoords.z())
+ {
+ starCoords.setX(starCoords.x() * (starCoords.z()/subBinX));
+ starCoords.setY(starCoords.y() * (starCoords.z()/subBinY));
+ starCoords.setZ(subBinX);
+ }
+
+ QRect starRect = QRect( (starCoords.x()-focusBoxSize->value()/(2*subBinX)), starCoords.y()-focusBoxSize->value()/(2*subBinY), focusBoxSize->value()/subBinX, focusBoxSize->value()/subBinY);
+ targetImage->setTrackingBox(starRect);
+ }
+
connect(targetImage, SIGNAL(trackingStarSelected(int,int)), this, SLOT(focusStarSelected(int, int)), Qt::UniqueConnection);
if (inFocusLoop == false)
@@ -1063,16 +1120,20 @@ void Focus::newFITS(IBLOB *bp)
if (currentHFR > 0)
{
// Center tracking box around selected star
- if (starSelected && inAutoFocus)
+ //if (starSelected && inAutoFocus)
+ if (starCoords.isNull() == false && inAutoFocus)
{
Edge *maxStarHFR = image_data->getMaxHFRStar();
if (maxStarHFR)
{
- int x = qMax(0, static_cast<int>(maxStarHFR->x-focusBoxSize->value()/2));
- int y = qMax(0, static_cast<int>(maxStarHFR->y-focusBoxSize->value()/2));
+ //int x = qMax(0, static_cast<int>(maxStarHFR->x-focusBoxSize->value()/(2*subBinX)));
+ //int y = qMax(0, static_cast<int>(maxStarHFR->y-focusBoxSize->value()/(2*subBinY)));
- targetImage->setTrackingBox(QRect(x, y, focusBoxSize->value(), focusBoxSize->value()));
+ //targetImage->setTrackingBox(QRect(x, y, focusBoxSize->value(), focusBoxSize->value()));
+ starCoords.setX(qMax(0, static_cast<int>(maxStarHFR->x)));
+ starCoords.setY(qMax(0, static_cast<int>(maxStarHFR->y)));
+ targetImage->setTrackingBox(QRect( (starCoords.x()-focusBoxSize->value()/(2*subBinX)), starCoords.y()-focusBoxSize->value()/(2*subBinY), focusBoxSize->value()/subBinX, focusBoxSize->value()/subBinY));
}
}
@@ -1097,10 +1158,21 @@ void Focus::newFITS(IBLOB *bp)
return;
}
- if (starSelected == false)
+ //if (starSelected == false)
+ if (starCoords.isNull())
{
- int subBinX=1, subBinY=1;
- targetChip->getBinning(&subBinX, &subBinY);
+ int x=0, y=0, w=0,h=0;
+
+ if (frameSettings.contains(targetChip))
+ {
+ QVariantMap settings = frameSettings[targetChip];
+ x = settings["x"].toInt();
+ y = settings["y"].toInt();
+ w = settings["w"].toInt();
+ h = settings["h"].toInt();
+ }
+ else
+ targetChip->getFrame(&x, &y, &w, &h);
if (kcfg_autoSelectStar->isEnabled() && kcfg_autoSelectStar->isChecked() && focusType == FOCUS_AUTO)
{
@@ -1109,10 +1181,11 @@ void Focus::newFITS(IBLOB *bp)
{
appendLogText(i18n("Failed to automatically select a star. Please select a star manually."));
- if (fw == 0 || fh == 0)
- targetChip->getFrame(&fx, &fy, &fw, &fh);
+ //if (fw == 0 || fh == 0)
+ //targetChip->getFrame(&fx, &fy, &fw, &fh);
- targetImage->setTrackingBox(QRect((fw-focusBoxSize->value())/2, (fh-focusBoxSize->value())/2, focusBoxSize->value(), focusBoxSize->value()));
+ //targetImage->setTrackingBox(QRect((fw-focusBoxSize->value())/2, (fh-focusBoxSize->value())/2, focusBoxSize->value(), focusBoxSize->value()));
+ targetImage->setTrackingBox(QRect(w-focusBoxSize->value()/(subBinX*2), h-focusBoxSize->value()/(subBinY*2), focusBoxSize->value()/subBinX, focusBoxSize->value()/subBinY));
targetImage->setTrackingBoxEnabled(true);
state = Ekos::FOCUS_WAITING;
@@ -1143,30 +1216,47 @@ void Focus::newFITS(IBLOB *bp)
if ((subH+subY)> maxH)
subH=maxH-subY;
- targetChip->setFocusFrame(subX, subY, subW, subH);
+ //targetChip->setFocusFrame(subX, subY, subW, subH);
+
+ //fx += subX;
+ //fy += subY;
+ //fw = subW;
+ //fh = subH;
+ //frameModified = true;
+
+ //x += subX;
+ //y += subY;
+ //w = subW;
+ //h = subH;
- //if (orig_x == -1)
- // targetChip->getFrame(&orig_x, &orig_y, &orig_w, &orig_h);
+ QVariantMap settings = frameSettings[targetChip];
+ settings["x"] = subX;
+ settings["y"] = subY;
+ settings["w"] = subW;
+ settings["h"] = subH;
+ frameSettings[targetChip] = settings;
+
+ starCoords.setX(subW/(2*subBinX));
+ starCoords.setY(subH/(2*subBinY));
- fx += subX;
- fy += subY;
- fw = subW;
- fh = subH;
- frameModified = true;
subFramed = true;
haveDarkFrame=false;
calibrationState = CALIBRATE_NONE;
-
- //targetImage->setTrackingBoxCenter(QPointF(fw/2.0,fh/2.0));
- //targetImage->setTrackingBoxSize(QSize(subW/5.0, subH/5.0));
}
else
- targetChip->getFrame(&fx, &fy, &fw, &fh);
+ {
+ starCoords.setX(maxStar->x);
+ starCoords.setY(maxStar->y);
+ }
+
+ starCoords.setZ(subBinX);
+ //else
+ //targetChip->getFrame(&fx, &fy, &fw, &fh);
- targetImage->setTrackingBox(QRect((fw/subBinX-focusBoxSize->value())/2, (fh/subBinY-focusBoxSize->value())/2, focusBoxSize->value(), focusBoxSize->value()));
+ //targetImage->setTrackingBox(QRect((w-focusBoxSize->value())/(subBinX*2), (h-focusBoxSize->value())/(subBinY*2), focusBoxSize->value()/subBinX, focusBoxSize->value()/subBinX));
targetImage->setTrackingBoxEnabled(true);
- starSelected=true;
+ //starSelected=true;
defaultScale = static_cast<FITSScale>(filterCombo->currentIndex());
@@ -1180,12 +1270,13 @@ void Focus::newFITS(IBLOB *bp)
{
appendLogText(i18n("Capture complete. Select a star to focus."));
- if (fw == 0 || fh == 0)
- targetChip->getFrame(&fx, &fy, &fw, &fh);
+ //if (fw == 0 || fh == 0)
+ //targetChip->getFrame(&fx, &fy, &fw, &fh);
- int binx=1,biny=1;
- targetChip->getBinning(&binx, &biny);
- targetImage->setTrackingBox(QRect((fw/binx-focusBoxSize->value())/2, (fh/biny-focusBoxSize->value())/2, focusBoxSize->value(), focusBoxSize->value()));
+ int subBinX=1,subBinY=1;
+ targetChip->getBinning(&subBinX, &subBinY);
+
+ targetImage->setTrackingBox(QRect((w-focusBoxSize->value())/(subBinX*2), (h-focusBoxSize->value())/(2*subBinY), focusBoxSize->value()/subBinX, focusBoxSize->value()/subBinY));
targetImage->setTrackingBoxEnabled(true);
connect(targetImage, SIGNAL(trackingStarSelected(int,int)), this, SLOT(focusStarSelected(int, int)), Qt::UniqueConnection);
return;
@@ -1201,7 +1292,7 @@ void Focus::newFITS(IBLOB *bp)
appendLogText(i18n("No stars detected, capturing again..."));
// On Last Attempt reset focus frame to capture full frame and recapture star if possible
if (noStarCount == MAX_RECAPTURE_RETRIES)
- resetFocusFrame();
+ resetFrame();
capture();
return;
}
@@ -2017,8 +2108,19 @@ void Focus::focusStarSelected(int x, int y)
return;
ISD::CCDChip *targetChip = currentCCD->getChip(ISD::CCDChip::PRIMARY_CCD);
- int offset = focusBoxSize->value();
- int binx, biny;
+
+ int subBinX, subBinY;
+ targetChip->getBinning(&subBinX, &subBinY);
+
+ // If binning was changed outside of the focus module, recapture
+ if (subBinX != activeBin)
+ {
+ haveDarkFrame=false;
+ capture();
+ return;
+ }
+
+ int offset = focusBoxSize->value()/subBinX;
FITSView *targetImage = targetChip->getImage(FITS_FOCUS);
@@ -2027,15 +2129,16 @@ void Focus::focusStarSelected(int x, int y)
QRect starRect;
if (subFramed == false && kcfg_subFrame->isChecked() && targetChip->canSubframe())
- {
- targetChip->getBinning(&binx, &biny);
- int minX, maxX, minY, maxY, minW, maxW, minH, maxH;
+ {
+ int minX, maxX, minY, maxY, minW, maxW, minH, maxH;//, fx,fy,fw,fh;
+
targetChip->getFrameMinMax(&minX, &maxX, &minY, &maxY, &minW, &maxW, &minH, &maxH);
+ //targetChip->getFrame(&fx, &fy, &fw, &fy);
- x = (x - offset) * binx;
- y = (y - offset) * biny;
- int w=offset*2*binx;
- int h=offset*2*biny;
+ x = (x - offset) * subBinX;
+ y = (y - offset) * subBinY;
+ int w=offset*2*subBinX;
+ int h=offset*2*subBinY;
if (x<minX)
x=minX;
@@ -2046,36 +2149,50 @@ void Focus::focusStarSelected(int x, int y)
if ((y+h)>maxH)
h=maxH-y;
- targetChip->getFrame(&orig_x, &orig_y, &orig_w, &orig_h);
+ //targetChip->getFrame(&orig_x, &orig_y, &orig_w, &orig_h);
+
+ //fx += x;
+ //fy += y;
+ //fw = w;
+ //fh = h;
+
+ //targetChip->setFocusFrame(fx, fy, fw, fh);
+ //frameModified=true;
+
+ QVariantMap settings = frameSettings[targetChip];
+ settings["x"] = x;
+ settings["y"] = y;
+ settings["w"] = w;
+ settings["h"] = h;
+ frameSettings[targetChip] = settings;
+
- fx += x;
- fy += y;
- fw = w;
- fh = h;
- targetChip->setFocusFrame(fx, fy, fw, fh);
- frameModified=true;
subFramed = true;
haveDarkFrame=false;
calibrationState = CALIBRATE_NONE;
capture();
- starRect = QRect((fw/binx-focusBoxSize->value())/2, (fh/biny-focusBoxSize->value())/2, focusBoxSize->value(), focusBoxSize->value());
+ //starRect = QRect((w-focusBoxSize->value())/(subBinX*2), (h-focusBoxSize->value())/(subBinY*2), focusBoxSize->value()/subBinX, focusBoxSize->value()/subBinY);
+ starCoords.setX(w/(2*subBinX));
+ starCoords.setY(h/(2*subBinY));
}
else
- starRect = QRect(x-focusBoxSize->value()/2, y-focusBoxSize->value()/2, focusBoxSize->value(), focusBoxSize->value());
+ {
+ //starRect = QRect(x-focusBoxSize->value()/(subBinX*2), y-focusBoxSize->value()/(subBinY*2), focusBoxSize->value()/subBinX, focusBoxSize->value()/subBinY);
+ starCoords.setX(x);
+ starCoords.setY(y);
+ starRect = QRect( starCoords.x()-focusBoxSize->value()/(2*subBinX), starCoords.y()-focusBoxSize->value()/(2*subBinY), focusBoxSize->value()/subBinX, focusBoxSize->value()/subBinY);
+ targetImage->setTrackingBox(starRect);
+ }
- starSelected=true;
+ starCoords.setZ(subBinX);
- defaultScale = static_cast<FITSScale>(filterCombo->currentIndex());
+ //starSelected=true;
- //targetImage->setTrackingBoxCenter(QPointF(fw/2.0,fh/2.0));
- //targetImage->setTrackingBoxSize(QSize(fw/5.0, fh/5.0));
- targetImage->setTrackingBox(starRect);
- //targetImage->setTrackingBoxEnabled(true);
+ defaultScale = static_cast<FITSScale>(filterCombo->currentIndex());
- //state = Ekos::FOCUS_PROGRESS;
- //emit newStatus(state);
+ //targetImage->setTrackingBox(starRect);
}
void Focus::checkFocus(double requiredHFR)
@@ -2089,11 +2206,12 @@ void Focus::toggleSubframe(bool enable)
{
if (enable == false)
{
- resetFocusFrame();
+ resetFrame();
kcfg_autoSelectStar->setChecked(false);
}
- starSelected = false;
+ //starSelected = false;
+ starCoords = QVector3D();
}
void Focus::filterChangeWarning(int index)
@@ -2112,10 +2230,10 @@ void Focus::setExposure(double value)
exposureIN->setValue(value);
}
-void Focus::setBinning(int binX, int binY)
+void Focus::setBinning(int subBinX, int subBinY)
{
- INDI_UNUSED(binY);
- binningCombo->setCurrentIndex(binX-1);
+ INDI_UNUSED(subBinY);
+ binningCombo->setCurrentIndex(subBinX-1);
}
void Focus::setImageFilter(const QString & value)
@@ -2177,7 +2295,7 @@ void Focus::setAutoFocusResult(bool status)
{
resetFocus = true;
// Reset focus frame in case the star in subframe was lost
- resetFocusFrame();
+ resetFrame();
return;
}
}
@@ -2202,7 +2320,8 @@ void Focus::setAutoFocusResult(bool status)
void Focus::checkAutoStarTimeout()
{
- if (starSelected == false && inAutoFocus)
+ //if (starSelected == false && inAutoFocus)
+ if (starCoords.isNull() && inAutoFocus)
{
appendLogText(i18n("No star was selected. Aborting..."));
initialFocuserAbsPosition=-1;
diff --git a/kstars/ekos/focus.h b/kstars/ekos/focus.h
index ca4323a..8717ac8 100644
--- a/kstars/ekos/focus.h
+++ b/kstars/ekos/focus.h
@@ -207,7 +207,7 @@ public slots:
/** DBUS interface function.
* resetFocusFrame Resets the focus frame to the CCDs original dimensions before any subframing was done.
*/
- Q_SCRIPTABLE Q_NOREPLY void resetFocusFrame();
+ //Q_SCRIPTABLE Q_NOREPLY void resetFocusFrame();
/** @}*/
@@ -412,7 +412,7 @@ private:
// Are we in the process of capturing an image?
bool captureInProgress;
// Was the frame modified by us? Better keep track since we need to return it to its previous state once we are done with the focus operation.
- bool frameModified;
+ //bool frameModified;
// Was the modified frame subFramed?
bool subFramed;
// If the autofocus process fails, let's not ruin the capture session probably taking place in the next tab. Instead, we should restart it and try again, but we keep count until we hit MAXIMUM_RESET_ITERATIONS
@@ -425,11 +425,11 @@ private:
// Did we reverse direction?
bool reverseDir;
// Did the user or the auto selection process finish selecting our focus star?
- bool starSelected;
+ //bool starSelected;
// Target frame dimensions
- int fx,fy,fw,fh;
+ //int fx,fy,fw,fh;
// Origianl frame dimensions
- int orig_x, orig_y, orig_w, orig_h;
+ //int orig_x, orig_y, orig_w, orig_h;
// If HFR=-1 which means no stars detected, we need to decide how many times should the re-capture process take place before we give up or reverse direction.
int noStarCount;
// Track which upload mode the CCD is set to. If set to UPLOAD_LOCAL, then we need to switch it to UPLOAD_CLIENT in order to do focusing, and then switch it back to UPLOAD_LOCAL
@@ -476,6 +476,12 @@ private:
// FITS Scale
FITSScale defaultScale;
+
+ // CCD Chip frame settings
+ QMap<ISD::CCDChip *, QVariantMap> frameSettings;
+
+ // Selected star coordinates
+ QVector3D starCoords;
};
}
diff --git a/kstars/ekos/scheduler.cpp b/kstars/ekos/scheduler.cpp
index 3c65abd..16ed0d7 100644
--- a/kstars/ekos/scheduler.cpp
+++ b/kstars/ekos/scheduler.cpp
@@ -2535,7 +2535,7 @@ void Scheduler::checkJobStage()
if (currentJob->getStage() == SchedulerJob::STAGE_FOCUSING)
{
// Reset frame to original size.
- //focusInterface->call(QDBus::AutoDetect,"resetFocusFrame");
+ //focusInterface->call(QDBus::AutoDetect,"resetFrame");
currentJob->setStage(SchedulerJob::STAGE_FOCUS_COMPLETE);
}
else
@@ -2552,7 +2552,7 @@ void Scheduler::checkJobStage()
{
appendLogText(i18n("Restarting %1 focusing procedure...", currentJob->getName()));
// Reset frame to original size.
- focusInterface->call(QDBus::AutoDetect,"resetFocusFrame");
+ focusInterface->call(QDBus::AutoDetect,"resetFrame");
// Restart focusing
startFocusing();
return;
@@ -3394,9 +3394,9 @@ void Scheduler::startFocusing()
QDBusMessage reply;
// We always need to reset frame first
- if ( (reply = focusInterface->call(QDBus::AutoDetect,"resetFocusFrame")).type() == QDBusMessage::ErrorMessage)
+ if ( (reply = focusInterface->call(QDBus::AutoDetect,"resetFrame")).type() == QDBusMessage::ErrorMessage)
{
- appendLogText(i18n("resetFocusFrame DBUS error: %1", reply.errorMessage()));
+ appendLogText(i18n("resetFrame DBUS error: %1", reply.errorMessage()));
return;
}
diff --git a/kstars/indi/indiccd.cpp b/kstars/indi/indiccd.cpp
index 4f17254..294d65e 100644
--- a/kstars/indi/indiccd.cpp
+++ b/kstars/indi/indiccd.cpp
@@ -57,7 +57,7 @@ CCDChip::CCDChip(INDI::BaseDevice *bDevice, ClientManager *cManager, ChipType cT
captureMode = FITS_NORMAL;
captureFilter = FITS_NONE;
- fx=fy=fw=fh=0;
+ //fx=fy=fw=fh=0;
normalImage = focusImage = guideImage = calibrationImage = NULL;
}
@@ -395,7 +395,7 @@ bool CCDChip::canAbort() const
return CanAbort;
}
-bool CCDChip::getFocusFrame(int *x, int *y, int *w, int *h)
+/*bool CCDChip::getFocusFrame(int *x, int *y, int *w, int *h)
{
*x = fx;
*y = fy;
@@ -413,7 +413,7 @@ bool CCDChip::setFocusFrame(int x, int y, int w, int h)
fh=h;
return true;
-}
+}*/
void CCDChip::setCanAbort(bool value)
{
diff --git a/kstars/indi/indiccd.h b/kstars/indi/indiccd.h
index 019096f..2c390ca 100644
--- a/kstars/indi/indiccd.h
+++ b/kstars/indi/indiccd.h
@@ -55,8 +55,8 @@ public:
bool getFrame(int *x, int *y, int *w, int *h);
bool getFrameMinMax(int *minX, int *maxX, int *minY, int *maxY, int *minW, int *maxW, int *minH, int *maxH);
bool setFrame(int x, int y, int w, int h);
- bool getFocusFrame(int *x, int *y, int *w, int *h);
- bool setFocusFrame(int x, int y, int w, int h);
+ //bool getFocusFrame(int *x, int *y, int *w, int *h);
+ //bool setFocusFrame(int x, int y, int w, int h);
bool resetFrame();
bool capture(double exposure);
bool setFrameType(CCDFrameType fType);
@@ -111,7 +111,7 @@ private:
bool CanBin;
bool CanSubframe;
bool CanAbort;
- int fx,fy,fw,fh;
+ //int fx,fy,fw,fh;
};
diff --git a/kstars/org.kde.kstars.Ekos.Focus.xml b/kstars/org.kde.kstars.Ekos.Focus.xml
index 25faa2a..16525c7 100644
--- a/kstars/org.kde.kstars.Ekos.Focus.xml
+++ b/kstars/org.kde.kstars.Ekos.Focus.xml
@@ -80,9 +80,6 @@
</method>
<method name="resetFrame">
<annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
- </method>
- <method name="resetFocusFrame">
- <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
- </method>
+ </method>
</interface>
</node>