Git commit b291c293dd126aa91aeb032f4c95b0353e46adb6 by Jasem Mutlaq.
Committed on 30/09/2016 at 10:19.
Pushed by mutlaqja into branch 'bleeding'.

Refactor changes

M  +1    -1    kstars/ekos/auxiliary/darklibrary.cpp
M  +6    -6    kstars/ekos/focus/focus.cpp

http://commits.kde.org/kstars/b291c293dd126aa91aeb032f4c95b0353e46adb6

diff --git a/kstars/ekos/auxiliary/darklibrary.cpp b/kstars/ekos/auxiliary/=
darklibrary.cpp
index b068cdb..6aa938e 100644
--- a/kstars/ekos/auxiliary/darklibrary.cpp
+++ b/kstars/ekos/auxiliary/darklibrary.cpp
@@ -256,7 +256,7 @@ void DarkLibrary::newFITS(IBLOB *bp)
 =

     disconnect(subtractParams.targetChip->getCCD(), SIGNAL(BLOBUpdated(IBL=
OB*)), this, SLOT(newFITS(IBLOB*)));
 =

-    FITSView *calibrationView =3D subtractParams.targetChip->getImage(FITS=
_CALIBRATE);
+    FITSView *calibrationView =3D subtractParams.targetChip->getImageView(=
FITS_CALIBRATE);
 =

     emit newLog(i18n("Dark frame received."));
 =

diff --git a/kstars/ekos/focus/focus.cpp b/kstars/ekos/focus/focus.cpp
index 5086c4a..69b63a2 100644
--- a/kstars/ekos/focus/focus.cpp
+++ b/kstars/ekos/focus/focus.cpp
@@ -273,7 +273,7 @@ void Focus::resetFrame()
             starCenter =3D QVector3D();
             subFramed =3D false;
 =

-            FITSView *targetImage =3D targetChip->getImage(FITS_FOCUS);
+            FITSView *targetImage =3D targetChip->getImageView(FITS_FOCUS);
             if (targetImage)
                 targetImage->setTrackingBox(QRect());
         }
@@ -758,7 +758,7 @@ void Focus::abort()
 =

     //resetFrame();
 =

-    FITSView *targetImage =3D targetChip->getImage(FITS_FOCUS);
+    FITSView *targetImage =3D targetChip->getImageView(FITS_FOCUS);
     if (targetImage)
         targetImage->updateMode(FITS_FOCUS);
 =

@@ -953,7 +953,7 @@ void Focus::newFITS(IBLOB *bp)
 =

     if (darkFrameCheck->isChecked())
     {
-        FITSView *currentImage   =3D targetChip->getImage(FITS_FOCUS);
+        FITSView *currentImage   =3D targetChip->getImageView(FITS_FOCUS);
         FITSData *darkData       =3D NULL;
         QVariantMap settings =3D frameSettings[targetChip];
         uint16_t offsetX =3D settings["x"].toInt() / settings["binx"].toIn=
t();
@@ -985,7 +985,7 @@ void Focus::setCaptureComplete()
     // JM 2016-09-28: Disable setting back to FITS_NORMAL as it might be c=
ausing issues. Each module should set capture module separately.
     //targetChip->setCaptureMode(FITS_NORMAL);
 =

-    FITSView *targetImage =3D targetChip->getImage(FITS_FOCUS);
+    FITSView *targetImage =3D targetChip->getImageView(FITS_FOCUS);
 =

     if (targetImage =3D=3D NULL)
     {
@@ -2056,7 +2056,7 @@ void Focus::updateBoxSize(int value)
     if (targetChip =3D=3D NULL)
         return;
 =

-    FITSView *targetImage =3D targetChip->getImage(FITS_FOCUS);
+    FITSView *targetImage =3D targetChip->getImageView(FITS_FOCUS);
     if (targetImage =3D=3D NULL)
         return;
 =

@@ -2088,7 +2088,7 @@ void Focus::focusStarSelected(int x, int y)
 =

     int offset =3D focusBoxSize->value()/subBinX;
 =

-    FITSView *targetImage =3D targetChip->getImage(FITS_FOCUS);
+    FITSView *targetImage =3D targetChip->getImageView(FITS_FOCUS);
 =

     //targetImage->updateMode(FITS_FOCUS);
 =