[kstars] kstars: This includes 3 small fixes.
Jasem Mutlaq
null at kde.org
Sun Feb 5 06:14:45 UTC 2017
Git commit 960f016e5383c22ca759e200b6cab136a671f3dd by Jasem Mutlaq, on behalf of Robert Lancaster.
Committed on 05/02/2017 at 06:13.
Pushed by mutlaqja into branch 'master'.
This includes 3 small fixes.
CCMAIL:kstars-devel at kde.org
M +5 -5 kstars/fitsviewer/fitsview.cpp
M +4 -1 kstars/indi/indiccd.cpp
M +1 -0 kstars/options/opscolors.cpp
https://commits.kde.org/kstars/960f016e5383c22ca759e200b6cab136a671f3dd
diff --git a/kstars/fitsviewer/fitsview.cpp b/kstars/fitsviewer/fitsview.cpp
index d84db6f26..e7124b4b8 100644
--- a/kstars/fitsviewer/fitsview.cpp
+++ b/kstars/fitsviewer/fitsview.cpp
@@ -289,6 +289,11 @@ void FITSLabel::mouseMoveEvent(QMouseEvent *e)
QToolTip::hideText();
}
+ double HFR = image->getImageData()->getHFR(x, y);
+
+ if (HFR > 0)
+ QToolTip::showText(e->globalPos(), i18nc("Half Flux Radius", "HFR: %1", QString::number(HFR, 'g' , 3)), this);
+
//setCursor(Qt::CrossCursor);
e->accept();
@@ -382,11 +387,6 @@ void FITSLabel::mousePressEvent(QMouseEvent *e)
if (e->buttons() & Qt::LeftButton&&image->getMouseMode()==FITSView::selectMouse)
{
emit pointSelected(x, y);
-
- double HFR = image->getImageData()->getHFR(x, y);
-
- if (HFR > 0)
- QToolTip::showText(e->globalPos(), i18nc("Half Flux Radius", "HFR: %1", QString::number(HFR, 'g' , 3)), this);
}
}
diff --git a/kstars/indi/indiccd.cpp b/kstars/indi/indiccd.cpp
index 80ba85a05..fb0196220 100644
--- a/kstars/indi/indiccd.cpp
+++ b/kstars/indi/indiccd.cpp
@@ -1446,7 +1446,10 @@ void CCD::processBLOB(IBLOB* bp)
return;
}
} else{
- targetChip->setImageView(KStars::Instance()->ekosManager()->getPreviewView(),FITS_NORMAL);
+ if(previewView){
+ targetChip->setImageView(previewView,FITS_NORMAL);
+ emit newImage(previewView->getDisplayImage(), targetChip);
+ }
}
}
break;
diff --git a/kstars/options/opscolors.cpp b/kstars/options/opscolors.cpp
index 6fb80245b..4a88e8c14 100644
--- a/kstars/options/opscolors.cpp
+++ b/kstars/options/opscolors.cpp
@@ -281,6 +281,7 @@ void OpsColors::slotStarColorIntensity( int i ) {
void OpsColors::slotDarkAppColors(bool enable)
{
KStarsData::Instance()->colorScheme()->setDarkPalette(enable);
+ KStars::Instance()->loadColorScheme( KStars::Instance()->data()->colorScheme()->fileName());
}
More information about the Kstars-devel
mailing list