Commit 3f95d5bd authored by Artem Fedoskin's avatar Artem Fedoskin
Browse files

Merge branch 'master' of git://anongit.kde.org/kstars

parents 3606db6f 9ca83ff2
<?xml version="1.0"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.1" package="org.kde.kstars" android:installLocation="auto" android:versionCode="8">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.2" package="org.kde.kstars" android:installLocation="auto" android:versionCode="9">
<application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="KStars Lite" android:icon="@drawable/icon">
<activity android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="KStars Lite" android:screenOrientation="unspecified" android:theme="@style/AppTheme" android:launchMode="singleTop" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation">
<intent-filter>
......@@ -35,5 +35,5 @@
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16"/>
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21"/>
</manifest>
......@@ -974,6 +974,8 @@ void Focus::newFITS(IBLOB *bp)
connect(DarkLibrary::Instance(), SIGNAL(darkFrameCompleted(bool)), this, SLOT(setCaptureComplete()));
connect(DarkLibrary::Instance(), SIGNAL(newLog(QString)), this, SLOT(appendLogText(QString)));
targetChip->setCaptureFilter(defaultScale);
if (darkData)
DarkLibrary::Instance()->subtract(darkData, focusView, defaultScale, offsetX, offsetY);
else
......
......@@ -2073,6 +2073,8 @@ bool Guide::executeOneOperation(GuideState operation)
actionRequired = true;
targetChip->setCaptureFilter((FITSScale) filterCombo->currentIndex());
if (darkData)
DarkLibrary::Instance()->subtract(darkData, guideView, targetChip->getCaptureFilter(), offsetX, offsetY);
else
......
......@@ -460,7 +460,11 @@ double AltVsTime::findAltitude( SkyPoint *p, double hour ) {
return p->alt().Degrees();
}
void AltVsTime::slotHighlight( int row ) {
void AltVsTime::slotHighlight( int row )
{
if (row < 0)
return;
int rowIndex = 0;
//highlight the curve of the selected object
for ( int i=0; i<avtUI->View->graphCount(); i++ ) {
......@@ -999,7 +1003,7 @@ void AltVsTime::slotUpdateDateLoc() {
else
DayOffset = 0;
setLSTLimits();
setLSTLimits();
slotHighlight( avtUI->PlotList->currentRow() );
avtUI->View->update();
......
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