summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Fedoskin <afedoskin3@gmail.com>2016-08-23 00:00:25 (GMT)
committerArtem Fedoskin <afedoskin3@gmail.com>2016-08-23 00:00:25 (GMT)
commitba79cf5c998341b2743c037ece64ead06594eb48 (patch)
tree0072b3488674d4353d7950c4306404292165a555
parent858c2b217355f1e8a83ee4317a900e8650ee48e2 (diff)
Started to work on adopting DSO resolver. Fixed some compilation errors of regular KStars. Changed the way tap and pinch recognizers work.gsoc2016-kstarslite
-rw-r--r--kstars/CMakeLists.txt48
-rw-r--r--kstars/auxiliary/imageviewer.cpp17
-rw-r--r--kstars/dialogs/detaildialog.cpp2
-rw-r--r--kstars/dialogs/locationdialog.cpp10
-rw-r--r--kstars/indi/drivermanager.ui.autosave383
-rw-r--r--kstars/indi/indilistener.cpp30
-rw-r--r--kstars/indi/indilistener.h2
-rw-r--r--kstars/indi/inditelescope.cpp7
-rw-r--r--kstars/indi/inditelescope.h5
-rw-r--r--kstars/kstars.kcfg4
-rw-r--r--kstars/kstarslite.cpp3
-rw-r--r--kstars/kstarslite/dialogs/finddialoglite.cpp68
-rw-r--r--kstars/kstarslite/dialogs/finddialoglite.h6
-rw-r--r--kstars/kstarslite/qml/dialogs/FindDialog.qml18
-rw-r--r--kstars/kstarslite/qml/dialogs/helpers/DetailsAddLink.qml1
-rw-r--r--kstars/kstarslite/qml/dialogs/helpers/LocationEdit.qml2
-rw-r--r--kstars/kstarslite/qml/dialogs/helpers/LocationLoading.qml1
-rw-r--r--kstars/kstarslite/qml/dialogs/menus/LocationsGeoMenu.qml1
-rw-r--r--kstars/kstarslite/qml/main.qml2
-rw-r--r--kstars/kstarslite/qml/modules/helpers/PassiveNotification.qml2
-rw-r--r--kstars/kstarslite/res/CMakeLists.txt4
-rw-r--r--kstars/kstarslite/res/supernovae.dat62
-rw-r--r--kstars/kstarsliteinit.cpp9
-rw-r--r--kstars/main.cpp2
-rw-r--r--kstars/skycomponents/skymapcomposite.cpp10
-rw-r--r--kstars/skymaplite.h2
-rw-r--r--kstars/skymapliteevents.cpp26
-rw-r--r--kstars/time/simclock.cpp4
-rw-r--r--kstars/tools/nameresolver.cpp2
29 files changed, 222 insertions, 511 deletions
diff --git a/kstars/CMakeLists.txt b/kstars/CMakeLists.txt
index b135668..21deda0 100644
--- a/kstars/CMakeLists.txt
+++ b/kstars/CMakeLists.txt
@@ -78,7 +78,15 @@ if (INDI_FOUND)
kstarslite/skyitems/skynodes/crosshairnode.cpp
kstarslite/skyitems/telescopesymbolsitem.cpp
)
- elseif(BUILD_KSTARS_LITE)
+ else(BUILD_KSTARS_LITE)
+ set(indiui_SRCS
+ indi/streamform.ui
+ indi/drivermanager.ui
+ indi/opsindi.ui
+ indi/indihostconf.ui
+ indi/telescopewizard.ui
+ )
+
set(indi_SRCS
indi/drivermanager.cpp
indi/servermanager.cpp
@@ -107,14 +115,6 @@ if (INDI_FOUND)
indi/indiwebmanager.cpp
)
- set(indiui_SRCS
- indi/drivermanager.ui
- indi/opsindi.ui
- indi/indihostconf.ui
- indi/streamform.ui
- indi/telescopewizard.ui
- )
-
if (CFITSIO_FOUND)
set(ekosui_SRCS
ekos/scheduler.ui
@@ -598,6 +598,10 @@ set(kstars_extra_SRCS
skypainter.cpp
)
+set(libkstarstools_SRCS
+ tools/nameresolver.cpp
+ )
+
if(NOT BUILD_KSTARS_LITE)
LIST(APPEND kstars_extra_SRCS
auxiliary/imageviewer.cpp
@@ -900,19 +904,19 @@ if(INDI_FOUND)
target_link_libraries(KStarsLib ${INDI_CLIENT_ANDROID_LIBRARIES})
else(ANDROID)
if(WIN32)
+ add_definitions(-DUSE_QT5_INDI)
+ find_package(Nova REQUIRED)
+ target_link_libraries(KStarsLib ${NOVA_LIBRARIES} ${INDI_LIBRARIES} ${INDI_CLIENT_QT_LIBRARIES})
+ else(WIN32)
+ # If INDI Qt5 Client is found, use it.
+
+ if (INDI_CLIENT_QT_LIBRARIES)
add_definitions(-DUSE_QT5_INDI)
- find_package(Nova REQUIRED)
- target_link_libraries(KStarsLib ${NOVA_LIBRARIES} ${INDI_LIBRARIES} ${INDI_CLIENT_QT_LIBRARIES})
- else(WIN32)
- # If INDI Qt5 Client is found, use it.
-
- if (INDI_CLIENT_QT_LIBRARIES)
- add_definitions(-DUSE_QT5_INDI)
- target_link_libraries(KStarsLib ${INDI_LIBRARIES} ${INDI_CLIENT_QT_LIBRARIES})
- else(INDI_CLIENT_QT_LIBRARIES)
- target_link_libraries(KStarsLib ${INDI_LIBRARIES} ${INDI_CLIENT_LIBRARIES})
- endif(INDI_CLIENT_QT_LIBRARIES)
- endif(WIN32)
+ target_link_libraries(KStarsLib ${INDI_LIBRARIES} ${INDI_CLIENT_QT_LIBRARIES} z)
+ else(INDI_CLIENT_QT_LIBRARIES)
+ target_link_libraries(KStarsLib ${INDI_LIBRARIES} ${INDI_CLIENT_LIBRARIES} z)
+ endif(INDI_CLIENT_QT_LIBRARIES)
+ endif(WIN32)
endif(ANDROID)
endif(INDI_FOUND)
@@ -933,6 +937,7 @@ set (KSTARS_APP_SRCS
main.cpp
)
+if(NOT BUILD_KSTARS_LITE)
# add icon to application sources
ecm_add_app_icon(KSTARS_APP_SRCS ICONS
${CMAKE_CURRENT_SOURCE_DIR}/icons/16-apps-kstars.png
@@ -943,6 +948,7 @@ ecm_add_app_icon(KSTARS_APP_SRCS ICONS
)
qt5_add_resources(KSTARS_APP_SRCS data/kstars.qrc)
+endif(NOT BUILD_KSTARS_LITE)
add_executable(kstars ${KSTARS_APP_SRCS})
target_link_libraries(kstars KStarsLib)
diff --git a/kstars/auxiliary/imageviewer.cpp b/kstars/auxiliary/imageviewer.cpp
index 28a1955..83f89ed 100644
--- a/kstars/auxiliary/imageviewer.cpp
+++ b/kstars/auxiliary/imageviewer.cpp
@@ -86,19 +86,13 @@ void ImageLabel::paintEvent (QPaintEvent*)
void ImageLabel::resizeEvent(QResizeEvent *event)
{
- #ifndef KSTARS_LITE
int w=pix.width();
int h=pix.height();
if (event->size().width() == w && event->size().height() == h)
return;
-<<<<<<< HEAD
- pix = QPixmap::fromImage(m_Image.scaled(event->size(), Qt::KeepAspectRatio));
- #endif
-=======
pix = QPixmap::fromImage(m_Image.scaled(event->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
->>>>>>> master
}
ImageViewer::ImageViewer (const QString &caption, QWidget *parent):
@@ -196,15 +190,6 @@ void ImageViewer::init(QString caption, QString capText)
#endif
}
-<<<<<<< HEAD
-ImageViewer::~ImageViewer() {
-#ifndef KSTARS_LITE
- /*if ( downloadJob ) {
- // close job quietly, without emitting a result
- downloadJob->kill( KJob::Quietly );
- delete downloadJob;
- }*/
-=======
ImageViewer::~ImageViewer()
{
QString filename = file.fileName();
@@ -215,10 +200,8 @@ ImageViewer::~ImageViewer()
KStandardGuiItem::yes(), KStandardGuiItem::no(), i18n("imageviewer_temporary_file_removal")) == KMessageBox::Yes)
QFile::remove(filename);
}
->>>>>>> master
QApplication::restoreOverrideCursor();
-#endif
}
void ImageViewer::loadImageFromURL()
diff --git a/kstars/dialogs/detaildialog.cpp b/kstars/dialogs/detaildialog.cpp
index f95f4fb..3a0df9b 100644
--- a/kstars/dialogs/detaildialog.cpp
+++ b/kstars/dialogs/detaildialog.cpp
@@ -432,7 +432,7 @@ void DetailDialog::createGeneralTab()
}
//Common to all types:
- QString cname = KStarsData::Instance()->skyComposite()->getConstellationBoundary()->constellationName(selectedObject);
+ QString cname = KStarsData::Instance()->skyComposite()->constellationBoundary()->constellationName(selectedObject);
if (selectedObject->type() != SkyObject::CONSTELLATION) {
cname = i18nc("%1 type of sky object (planet, asteroid etc), %2 name of a constellation", "%1 in %2", objecttyp, cname);
}
diff --git a/kstars/dialogs/locationdialog.cpp b/kstars/dialogs/locationdialog.cpp
index f47d842..146f2f9 100644
--- a/kstars/dialogs/locationdialog.cpp
+++ b/kstars/dialogs/locationdialog.cpp
@@ -488,16 +488,6 @@ bool LocationDialog::checkLongLat() {
return true;
}
-dms LocationDialog::createDms ( bool deg, bool *ok )
-{
- dms dmsAngle(0.0); // FIXME: Should we change this to NaN?
- bool check;
- check = dmsAngle.setFromString( text(), deg );
- if (ok) *ok = check; //ok might be a null pointer!
-
- return dmsAngle;
-}
-
void LocationDialog::clearFields()
{
ld->CityFilter->clear();
diff --git a/kstars/indi/drivermanager.ui.autosave b/kstars/indi/drivermanager.ui.autosave
deleted file mode 100644
index 35a098c..0000000
--- a/kstars/indi/drivermanager.ui.autosave
+++ /dev/null
@@ -1,383 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DriverManager</class>
- <widget class="QWidget" name="DriverManager">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>519</width>
- <height>492</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Device Manager</string>
- </property>
- <layout class="QVBoxLayout">
- <property name="spacing">
- <number>2</number>
- </property>
- <property name="leftMargin">
- <number>2</number>
- </property>
- <property name="topMargin">
- <number>2</number>
- </property>
- <property name="rightMargin">
- <number>2</number>
- </property>
- <property name="bottomMargin">
- <number>2</number>
- </property>
- <item>
- <widget class="QTabWidget" name="ConfTabWidget">
- <property name="currentIndex">
- <number>1</number>
- </property>
- <widget class="QWidget" name="LocalTab">
- <attribute name="title">
- <string>Local/Server</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QTreeWidget" name="localTreeWidget">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="selectionMode">
- <enum>QAbstractItemView::ExtendedSelection</enum>
- </property>
- <column>
- <property name="text">
- <string>Device</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Status</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Mode</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Version</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Port</string>
- </property>
- </column>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="serverLogBox">
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>180</height>
- </size>
- </property>
- <property name="title">
- <string>Server Log</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <widget class="QTextEdit" name="serverLogText">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>16777215</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string>Mode</string>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- <layout class="QHBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="leftMargin">
- <number>9</number>
- </property>
- <property name="topMargin">
- <number>9</number>
- </property>
- <property name="rightMargin">
- <number>9</number>
- </property>
- <property name="bottomMargin">
- <number>9</number>
- </property>
- <item>
- <widget class="QRadioButton" name="localR">
- <property name="text">
- <string>Local</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="serverR">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Server</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <widget class="QPushButton" name="runServiceB">
- <property name="text">
- <string>Run Service</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="stopServiceB">
- <property name="text">
- <string>Stop Service</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>61</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="clientTab">
- <attribute name="title">
- <string>Client</string>
- </attribute>
- <layout class="QGridLayout">
- <property name="leftMargin">
- <number>9</number>
- </property>
- <property name="topMargin">
- <number>9</number>
- </property>
- <property name="rightMargin">
- <number>9</number>
- </property>
- <property name="bottomMargin">
- <number>9</number>
- </property>
- <property name="spacing">
- <number>6</number>
- </property>
- <item row="2" column="1">
- <spacer>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="1">
- <widget class="QGroupBox" name="h">
- <property name="title">
- <string>Hosts</string>
- </property>
- <layout class="QVBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="leftMargin">
- <number>9</number>
- </property>
- <property name="topMargin">
- <number>9</number>
- </property>
- <property name="rightMargin">
- <number>9</number>
- </property>
- <property name="bottomMargin">
- <number>9</number>
- </property>
- <item>
- <widget class="QPushButton" name="addB">
- <property name="text">
- <string>Add</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="modifyB">
- <property name="text">
- <string>Modify...</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="removeB">
- <property name="text">
- <string>Remove</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="0" column="0" rowspan="3">
- <widget class="QTreeWidget" name="clientTreeWidget">
- <column>
- <property name="text">
- <string>Status</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Name</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Port</string>
- </property>
- </column>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QGroupBox" name="groupBox_3">
- <property name="title">
- <string>Connection</string>
- </property>
- <layout class="QVBoxLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="leftMargin">
- <number>9</number>
- </property>
- <property name="topMargin">
- <number>9</number>
- </property>
- <property name="rightMargin">
- <number>9</number>
- </property>
- <property name="bottomMargin">
- <number>9</number>
- </property>
- <item>
- <widget class="QPushButton" name="connectHostB">
- <property name="text">
- <string>Connect</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="disconnectHostB">
- <property name="text">
- <string>Disconnect</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/kstars/indi/indilistener.cpp b/kstars/indi/indilistener.cpp
index 8f0c6d4..523918a 100644
--- a/kstars/indi/indilistener.cpp
+++ b/kstars/indi/indilistener.cpp
@@ -38,11 +38,11 @@
/* INDI standard property used across all clients to enable interoperability. */
const char * indi_std[NINDI_STD] =
-{"CONNECTION", "DEVICE_PORT", "TIME_UTC", "TIME_LST", "GEOGRAPHIC_COORD", "EQUATORIAL_COORD",
- "EQUATORIAL_EOD_COORD", "EQUATORIAL_EOD_COORD_REQUEST", "HORIZONTAL_COORD", "TELESCOPE_ABORT_MOTION", "ON_COORD_SET",
- "SOLAR_SYSTEM", "TELESCOPE_MOTION_NS", "TELESCOPE_MOTION_WE", "TELESCOPE_PARK", "DOME_PARK", "GPS_REFRESH", "WEATHER_STATUS", "CCD_EXPOSURE",
- "CCD_TEMPERATURE", "CCD_FRAME", "CCD_FRAME_TYPE", "CCD_BINNING", "CCD_INFO", "CCD_VIDEO_STREAM",
- "RAW_STREAM", "IMAGE_STREAM", "FOCUS_SPEED", "FOCUS_MOTION", "FOCUS_TIMER", "FILTER_SLOT", "WATCHDOG_HEARTBEAT", "CAP_PARK", "FLAT_LIGHT_CONTROL", "FLAT_LIGHT_INTENSITY"};
+ {"CONNECTION", "DEVICE_PORT", "TIME_UTC", "TIME_LST", "GEOGRAPHIC_COORD", "EQUATORIAL_COORD",
+ "EQUATORIAL_EOD_COORD", "EQUATORIAL_EOD_COORD_REQUEST", "HORIZONTAL_COORD", "TELESCOPE_ABORT_MOTION", "ON_COORD_SET",
+ "SOLAR_SYSTEM", "TELESCOPE_MOTION_NS", "TELESCOPE_MOTION_WE", "TELESCOPE_PARK", "DOME_PARK", "GPS_REFRESH", "WEATHER_STATUS", "CCD_EXPOSURE",
+ "CCD_TEMPERATURE", "CCD_FRAME", "CCD_FRAME_TYPE", "CCD_BINNING", "CCD_INFO", "CCD_VIDEO_STREAM",
+ "RAW_STREAM", "IMAGE_STREAM", "FOCUS_SPEED", "FOCUS_MOTION", "FOCUS_TIMER", "FILTER_SLOT", "WATCHDOG_HEARTBEAT", "CAP_PARK", "FLAT_LIGHT_CONTROL", "FLAT_LIGHT_INTENSITY"};
INDIListener * INDIListener::_INDIListener = NULL;
@@ -72,7 +72,7 @@ ISD::GDInterface * INDIListener::getDevice(const QString &name)
{
foreach(ISD::GDInterface *gi, devices)
if (!strcmp(gi->getDeviceName(), name.toLatin1().constData()))
- return gi;
+ return gi;
return NULL;
}
@@ -118,7 +118,7 @@ void INDIListener::removeClient(ClientManager *cm)
if (hostSource)
return;
}
- else
+ else
++it;
}
@@ -137,7 +137,7 @@ void INDIListener::processDevice(DeviceInfo *dv)
}
void INDIListener::removeDevice(DeviceInfo *dv)
-{
+{
if (Options::iNDILogging())
qDebug() << "INDIListener: Removing device " << dv->getBaseDevice()->getDeviceName() << " with unique label " << dv->getDriverInfo()->getUniqueLabel();
@@ -184,7 +184,7 @@ void INDIListener::registerProperty(INDI::Property *prop)
gd = new ISD::Telescope(gd);
devices.append(gd);
emit newTelescope(gd);
- }
+ }
else if (gd->getType() == KSTARS_UNKNOWN && (!strcmp(prop->getName(), "CCD_EXPOSURE")))
{
devices.removeOne(gd);
@@ -213,7 +213,7 @@ void INDIListener::registerProperty(INDI::Property *prop)
devices.append(gd);
}
- emit newFocuser(gd);
+ emit newFocuser(gd);
}
else if (!strcmp(prop->getName(), "DOME_MOTION"))
@@ -225,7 +225,7 @@ void INDIListener::registerProperty(INDI::Property *prop)
devices.append(gd);
}
- emit newDome(gd);
+ emit newDome(gd);
}
else if (!strcmp(prop->getName(), "WEATHER_STATUS"))
{
@@ -236,7 +236,7 @@ void INDIListener::registerProperty(INDI::Property *prop)
devices.append(gd);
}
- emit newWeather(gd);
+ emit newWeather(gd);
}
else if (!strcmp(prop->getName(), "CAP_PARK"))
{
@@ -247,11 +247,11 @@ void INDIListener::registerProperty(INDI::Property *prop)
devices.append(gd);
}
- emit newDustCap(gd);
+ emit newDustCap(gd);
}
else if (!strcmp(prop->getName(), "FLAT_LIGHT_CONTROL"))
{
-#if (INDI_VERSION_MAJOR >= 1 && INDI_VERSION_MINOR >= 2)
+ #if (INDI_VERSION_MAJOR >= 1 && INDI_VERSION_MINOR >= 2)
// If light box part of dust cap
if (gd->getType() == KSTARS_UNKNOWN)
{
@@ -273,7 +273,7 @@ void INDIListener::registerProperty(INDI::Property *prop)
emit newLightBox(gd);
}
}
-#endif
+ #endif
}
if (!strcmp(prop->getName(), "TELESCOPE_TIMED_GUIDE_WE"))
diff --git a/kstars/indi/indilistener.h b/kstars/indi/indilistener.h
index ab0a084..b7ffe4a 100644
--- a/kstars/indi/indilistener.h
+++ b/kstars/indi/indilistener.h
@@ -46,7 +46,7 @@ public:
int size() { return devices.size(); }
- bool isStandardProperty(const QString &name);
+ bool isStandardProperty(const QString &name);
private:
INDIListener();
diff --git a/kstars/indi/inditelescope.cpp b/kstars/indi/inditelescope.cpp
index 25dfe39..adc8e71 100644
--- a/kstars/indi/inditelescope.cpp
+++ b/kstars/indi/inditelescope.cpp
@@ -26,7 +26,6 @@ Telescope::Telescope(GDInterface *iPtr) : DeviceDecorator(iPtr)
minAlt=-1;
maxAlt=-1;
IsParked=false;
- dType = KSTARS_UNKNOWN;
}
Telescope::~Telescope()
@@ -380,7 +379,7 @@ bool Telescope::sendCoords(SkyPoint *ScopeTarget)
ScopeTarget->apparentCoord(KStars::Instance()->data()->ut().djd(), (long double) J2000);
currentRA = RAEle->value;
- currentDEC = DecEle->value;
+ currentDEC = DecEle->value;
ScopeTarget->EquatorialToHorizontal(KStarsData::Instance()->lst(), KStarsData::Instance()->geo()->lat());
}
@@ -393,7 +392,7 @@ bool Telescope::sendCoords(SkyPoint *ScopeTarget)
if (!AltEle) return false;
currentAz = AzEle->value;
- currentAlt = AltEle->value;
+ currentAlt = AltEle->value;
}
/* Could not find either properties! */
@@ -501,7 +500,7 @@ bool Telescope::Sync(double ra, double dec)
SkyPoint target;
target.setRA(ra);
- target.setDec(dec);
+ target.setDec(dec);
return Sync(&target);
}
diff --git a/kstars/indi/inditelescope.h b/kstars/indi/inditelescope.h
index 4aa923c..dd6daf6 100644
--- a/kstars/indi/inditelescope.h
+++ b/kstars/indi/inditelescope.h
@@ -22,7 +22,7 @@ namespace ISD
*
* @author Jasem Mutlaq
*/
-class Telescope : public QObject
+class Telescope : public DeviceDecorator
{
Q_OBJECT
@@ -46,7 +46,7 @@ public:
bool Slew(SkyPoint *ScopeTarget);
bool Slew(double ra, double dec);
bool Sync(SkyPoint *ScopeTarget);
- bool Sync(double ra, double dec);
+ bool Sync(double ra, double dec);
bool MoveNS(TelescopeMotionNS dir, TelescopeMotionCommand cmd);
bool MoveWE(TelescopeMotionWE dir, TelescopeMotionCommand cmd);
bool canGuide();
@@ -77,7 +77,6 @@ private:
SkyPoint currentCoord;
double minAlt,maxAlt;
bool IsParked;
- DeviceFamily dType;
};
diff --git a/kstars/kstars.kcfg b/kstars/kstars.kcfg
index 1c2a966..d85f949 100644
--- a/kstars/kstars.kcfg
+++ b/kstars/kstars.kcfg
@@ -650,8 +650,8 @@
<entry name="ZoomFactor" type="Double">
<label>Zoom Factor, in pixels per radian</label>
<whatsthis>The zoom level, measured in pixels per radian.</whatsthis>
- <default>100.</default>
- <min>100.</min><max>5000000.</max>
+ <default>250.</default>
+ <min>250.</min><max>5000000.</max>
</entry>
<entry name="MagLimitAsteroid" type="Double">
<label>Faint limit for asteroids</label>
diff --git a/kstars/kstarslite.cpp b/kstars/kstarslite.cpp
index 5178595..fae863a 100644
--- a/kstars/kstarslite.cpp
+++ b/kstars/kstarslite.cpp
@@ -160,6 +160,9 @@ KStarsLite::KStarsLite( bool doSplash, bool startClock, const QString &startDate
if( !m_KStarsData->initialize() ) return;
datainitFinished();
+ //Set default options
+
+
#if ( __GLIBC__ >= 2 &&__GLIBC_MINOR__ >= 1 && !defined(__UCLIBC__) )
qDebug() << "glibc >= 2.1 detected. Using GNU extension sincos()";
#else
diff --git a/kstars/kstarslite/dialogs/finddialoglite.cpp b/kstars/kstarslite/dialogs/finddialoglite.cpp
index 3313bff..2e8362b 100644
--- a/kstars/kstarslite/dialogs/finddialoglite.cpp
+++ b/kstars/kstarslite/dialogs/finddialoglite.cpp
@@ -25,6 +25,9 @@
#include "kstarslite.h"
#include "solarsystemcomposite.h"
+//Resolver
+#include "tools/nameresolver.h"
+#include "skycomponents/syncedcatalogcomponent.h"
#include <QSortFilterProxyModel>
#include "skyobjectlistmodel.h"
@@ -69,33 +72,33 @@ void FindDialogLite::filterByType(uint typeIndex) {
switch ( typeIndex ) {
case 0: // All object types
- {
- QVector<QPair<QString, const SkyObject *>> allObjects;
- foreach( int type, data->skyComposite()->objectLists().keys() ) {
- allObjects.append(data->skyComposite()->objectLists(SkyObject::TYPE(type)));
- }
- fModel->setSkyObjectsList( allObjects );
- break;
+ {
+ QVector<QPair<QString, const SkyObject *>> allObjects;
+ foreach( int type, data->skyComposite()->objectLists().keys() ) {
+ allObjects.append(data->skyComposite()->objectLists(SkyObject::TYPE(type)));
}
+ fModel->setSkyObjectsList( allObjects );
+ break;
+ }
case 1: //Stars
- {
- QVector<QPair<QString, const SkyObject *>> starObjects;
- starObjects.append(data->skyComposite()->objectLists(SkyObject::STAR));
- starObjects.append(data->skyComposite()->objectLists(SkyObject::CATALOG_STAR));
- fModel->setSkyObjectsList( starObjects );
- break;
- }
+ {
+ QVector<QPair<QString, const SkyObject *>> starObjects;
+ starObjects.append(data->skyComposite()->objectLists(SkyObject::STAR));
+ starObjects.append(data->skyComposite()->objectLists(SkyObject::CATALOG_STAR));
+ fModel->setSkyObjectsList( starObjects );
+ break;
+ }
case 2: //Solar system
- {
- QVector<QPair<QString, const SkyObject *>> ssObjects;
- ssObjects.append(data->skyComposite()->objectLists(SkyObject::PLANET));
- ssObjects.append(data->skyComposite()->objectLists(SkyObject::COMET));
- ssObjects.append(data->skyComposite()->objectLists(SkyObject::ASTEROID));
- ssObjects.append(data->skyComposite()->objectLists(SkyObject::MOON));
-
- fModel->setSkyObjectsList(ssObjects);
- break;
- }
+ {
+ QVector<QPair<QString, const SkyObject *>> ssObjects;
+ ssObjects.append(data->skyComposite()->objectLists(SkyObject::PLANET));
+ ssObjects.append(data->skyComposite()->objectLists(SkyObject::COMET));
+ ssObjects.append(data->skyComposite()->objectLists(SkyObject::ASTEROID));
+ ssObjects.append(data->skyComposite()->objectLists(SkyObject::MOON));
+
+ fModel->setSkyObjectsList(ssObjects);
+ break;
+ }
case 3: //Open Clusters
fModel->setSkyObjectsList( data->skyComposite()->objectLists( SkyObject::OPEN_CLUSTER ) );
break;
@@ -165,3 +168,20 @@ QString FindDialogLite::processSearchText(QString text) {
return searchtext;
}
+
+void FindDialogLite::resolveInInternet(QString searchQuery) {
+ SkyObject *selObj = 0;
+ CatalogEntryData cedata;
+ cedata = NameResolver::resolveName( processSearchText(searchQuery) );
+ DeepSkyObject *dso = 0;
+ if( ! std::isnan( cedata.ra ) && ! std::isnan( cedata.dec ) ) {
+ dso = KStarsData::Instance()->skyComposite()->internetResolvedComponent()->addObject( cedata );
+ if( dso )
+ qDebug() << dso->ra0().toHMSString() << ";" << dso->dec0().toDMSString();
+ selObj = dso;
+ }
+ if ( selObj == 0 ) {
+ /*QString message = i18n( "No object named %1 found.", ui->SearchBox->text() );
+ KMessageBox::sorry( 0, message, i18n( "Bad object name" ) );*/
+ }
+}
diff --git a/kstars/kstarslite/dialogs/finddialoglite.h b/kstars/kstarslite/dialogs/finddialoglite.h
index feaf617..7af1124 100644
--- a/kstars/kstarslite/dialogs/finddialoglite.h
+++ b/kstars/kstarslite/dialogs/finddialoglite.h
@@ -51,6 +51,11 @@ public:
* selected object type.
*/
Q_INVOKABLE void filterByType(uint typeIndex);
+
+ /**
+ * @short searches for the object in internet (adopted to KStars Lite FindDialog::finishProcessing()
+ */
+ Q_INVOKABLE void resolveInInternet(QString searchQuery);
signals:
void filterModelChanged();
@@ -61,7 +66,6 @@ public slots:
Q_INVOKABLE void filterList(QString searchQuery);
private:
-
/** @short Do some post processing on the search text to interpret what the user meant
* This could include replacing text like "m93" with "m 93"
*/
diff --git a/kstars/kstarslite/qml/dialogs/FindDialog.qml b/kstars/kstarslite/qml/dialogs/FindDialog.qml
index fdd96ad..9a2a63e 100644
--- a/kstars/kstarslite/qml/dialogs/FindDialog.qml
+++ b/kstars/kstarslite/qml/dialogs/FindDialog.qml
@@ -89,15 +89,19 @@ KSPage {
}
}
- Button {
- text: "Cancel"
- onClicked: {
- stackView.pop()
+ RowLayout {
+ Button {
+ text: "Search in internet"
+ onClicked: {
+ FindDialogLite.resolveInInternet(searchQuery.text)
+ }
}
- anchors {
- bottom: parent.bottom
- right: parent.right
+ Button {
+ text: "Cancel"
+ onClicked: {
+ stackView.pop()
+ }
}
}
}
diff --git a/kstars/kstarslite/qml/dialogs/helpers/DetailsAddLink.qml b/kstars/kstarslite/qml/dialogs/helpers/DetailsAddLink.qml
index 415ea87..44af6f6 100644
--- a/kstars/kstarslite/qml/dialogs/helpers/DetailsAddLink.qml
+++ b/kstars/kstarslite/qml/dialogs/helpers/DetailsAddLink.qml
@@ -20,7 +20,6 @@ KSPage {
function openEdit(index, isImage) {
editMode = true
- linkPopup.isImage = isImage
if(!isImage) {
descField.text = DetailDialogLite.infoTitleList[index]
urlField.text = DetailDialogLite.getInfoURL(index)
diff --git a/kstars/kstarslite/qml/dialogs/helpers/LocationEdit.qml b/kstars/kstarslite/qml/dialogs/helpers/LocationEdit.qml
index 409d6b2..aaf2fa5 100644
--- a/kstars/kstarslite/qml/dialogs/helpers/LocationEdit.qml
+++ b/kstars/kstarslite/qml/dialogs/helpers/LocationEdit.qml
@@ -64,6 +64,7 @@ KSPage {
onUpdateTimeout: {
notification.showNotification(xi18n("Timeout occured. Try again."))
+ locationLoading.close()
}
onActiveChanged: {
@@ -238,6 +239,7 @@ KSPage {
text: "Set from GPS"
enabled: isAvailable
onClicked: {
+ positionSource.stop()
positionSource.update()
if(!positionSource.valid) {
positionSource.stop()
diff --git a/kstars/kstarslite/qml/dialogs/helpers/LocationLoading.qml b/kstars/kstarslite/qml/dialogs/helpers/LocationLoading.qml
index fe00b62..e070714 100644
--- a/kstars/kstarslite/qml/dialogs/helpers/LocationLoading.qml
+++ b/kstars/kstarslite/qml/dialogs/helpers/LocationLoading.qml
@@ -22,7 +22,6 @@ Popup {
BusyIndicator {
anchors.horizontalCenter: parent.horizontalCenter
- running: image.status === Image.Loading
}
Label {
diff --git a/kstars/kstarslite/qml/dialogs/menus/LocationsGeoMenu.qml b/kstars/kstarslite/qml/dialogs/menus/LocationsGeoMenu.qml
index 7d6e7b9..5a25986 100644
--- a/kstars/kstarslite/qml/dialogs/menus/LocationsGeoMenu.qml
+++ b/kstars/kstarslite/qml/dialogs/menus/LocationsGeoMenu.qml
@@ -16,7 +16,6 @@ Menu {
function openMenu(name) {
locName = name
isReadOnly = LocationDialogLite.isReadOnly(name)
- console.log(name + " " + isReadOnly)
open()
}
diff --git a/kstars/kstarslite/qml/main.qml b/kstars/kstarslite/qml/main.qml
index 8651cf9..b5d84d0 100644
--- a/kstars/kstarslite/qml/main.qml
+++ b/kstars/kstarslite/qml/main.qml
@@ -120,8 +120,6 @@ ApplicationWindow {
DetailsAddLink {
id: detailsAddLink
- x: (window.width - width)/2
- y: (window.height - height)/2
}
DetailsLinkMenu {
diff --git a/kstars/kstarslite/qml/modules/helpers/PassiveNotification.qml b/kstars/kstarslite/qml/modules/helpers/PassiveNotification.qml
index 7377f7b..0a3ecf6 100644
--- a/kstars/kstarslite/qml/modules/helpers/PassiveNotification.qml
+++ b/kstars/kstarslite/qml/modules/helpers/PassiveNotification.qml
@@ -125,8 +125,6 @@ MouseArea {
Controls.Label {
id: messageLabel
width: Math.min(root.parent.width - units.largeSpacing*2, implicitWidth)
- anchors.centerIn: parent
- wrapMode: Controls.Label.WrapAtWordBoundaryOrAnywhere
color: num.sysPalette.window
}
diff --git a/kstars/kstarslite/res/CMakeLists.txt b/kstars/kstarslite/res/CMakeLists.txt
index 8ff4632..fb0ba81 100644
--- a/kstars/kstarslite/res/CMakeLists.txt
+++ b/kstars/kstarslite/res/CMakeLists.txt
@@ -1,3 +1,5 @@
-#install_files
install( DIRECTORY dso/
+ DESTINATION ${KDE_INSTALL_DATADIR}/kstars )
+
+install( FILES supernovae.dat
DESTINATION ${KDE_INSTALL_DATADIR}/kstars ) \ No newline at end of file
diff --git a/kstars/kstarslite/res/supernovae.dat b/kstars/kstarslite/res/supernovae.dat
new file mode 100644
index 0000000..4a9ee26
--- /dev/null
+++ b/kstars/kstarslite/res/supernovae.dat
@@ -0,0 +1,62 @@
+#SN ,Host Galaxy ,Date , R.A. , Decl., Offset ,Mag., Disc. Ref. , SN Position , Posn. Ref. ,Typ, SN ,Discoverer(s)
+
+2015bh ,NGC 2770 ,2015 02 07 ,09 09.6,+33 07, 16E 4S ,19.1, CBET 4229 ,09 09 35.06 +33 07 22.1, CBET 4229 ,IIn, 2015bh ,Howerton, Drake et al. (Catalina Real-time Transient Survey)
+2015bg ,Anon. ,2015 12 16 ,02 47.6,+34 55, 13E 4N ,17.8, CBET 4226 ,02 47 34.51 +34 54 33.6, CBET 4226 ,Ia , 2015bg ,Maticic (PIKA)
+2015bf ,NGC 7653 ,2015 12 12 ,23 24.8,+15 17, 4W 20N ,17.3, CBET 4219 ,23 24 49.03 +15 16 52.0, CBET 4219 ,IIn, 2015bf ,Itagaki
+2015be ,NGC 1843 ,2015 12 06 ,05 14.1,-10 38, 1E 6N ,18.0, CBET 4218 ,05 14 06.24 -10 37 30.0, CBET 4218 ,IIP, 2015be ,Stegman, Zheng, Filippenko (LOSS)
+2015bd ,NGC 3662 ,2015 12 07 ,11 23.8,-01 06, 8W 3S ,15.9, CBET 4217 ,11 23 45.88 -01 06 21.2, CBET 4217 ,Ia , 2015bd ,Itagaki
+2015bc ,UGC 3301 ,2015 12 02 ,05 23.0,-00 08, 12E 9N ,18.1, CBET 4214 ,05 22 59.91 -00 08 17.4, CBET 4214 ,II , 2015bc ,Gagliano, Post, Newton, Puckett
+2015bb ,NGC 5772 ,2015 11 16 ,14 51.6,+40 36, 12W 6S ,17.0, CBET 4211 ,14 51 37.83 +40 35 51.4, CBET 4211 ,Ib/, 2015bb ,Shima
+2015ba ,IC 1029 ,2015 11 28 ,14 32.5,+49 54, 19E 42S ,16.7, CBET 4209 ,14 32 29.19 +49 53 34.5, CBET 4209 ,II , 2015ba ,Itagaki
+2015az ,IC 290 ,2015 11 30 ,03 09.7,+40 58, 1W 1N ,17.6, CBET 4208 ,03 09 42.51 +40 58 29.3, CBET 4208 ,Ia , 2015az ,Gagliano, Post, Newton, Puckett
+2015ay ,UGC 722 ,2015 10 03 ,01 09.8,+13 18, 12E 3S ,16.8, CBET 4204 ,01 09 46.77 +13 18 28.9, CBET 4204 ,II , 2015ay ,Liao, Chen, Xu, Sun, Gao
+2015ax ,Anon. ,2015 10 30 ,01 18.3,+15 06, 12E 2N ,17.2, CBET 4203 ,01 18 15.60 +15 05 58.8, CBET 4203 ,Ia , 2015ax ,Kugel
+2015aw ,ESO 197-G24 ,2015 07 12 ,02 06.4,-52 01, 16E 14N ,15.9, CBET 4202 ,02 06 22.53 -52 01 26.7, CBET 4202 ,Ia , 2015aw ,Parker
+2015av ,ESO 285-G20 ,2015 11 16 ,20 29.6,-43 50, 13W 1N ,17.6, CBET 4199 ,20 29 36.45 -43 50 27.7, CBET 4199 ,Ic , 2015av ,Parker
+2015au ,NGC 7300 ,2015 11 10 ,22 31.0,-14 00, 7W 18N ,17.7, CBET 4198 ,22 30 59.42 -13 59 56.1, CBET 4198 ,IIb, 2015au ,Bock
+2015at ,IC 900 ,2015 07 11 ,13 34.7,+09 20, 2E 6N ,16.6, CBET 4197 ,13 34 43.16 +09 20 19.4, CBET 4197 ,II , 2015at ,Bock
+2015as ,UGC 5460 ,2015 11 15 ,10 08.2,+51 51, ,16.0, CBET 4194 ,10 08 11.37 +51 50 40.9, CBET 4194 ,II , 2015as ,K. Nishimura
+2015ar ,NGC 383 ,2015 11 11 ,01 07.3,+32 24, 58W 46S ,18.8, CBET 4193 ,01 07 20.38 +32 23 59.8, CBET 4193 ,Ia , 2015ar ,Conseil, Arlic
+2015aq ,UGC 5015 ,2015 09 21 ,09 25.7,+34 17, 43W 2S ,15.6, CBET 4192 ,09 25 44.53 +34 16 36.1, CBET 4192 ,IIP, 2015aq ,Lipunov, Shumkov (MASTER)
+2015ap ,IC 1776 ,2015 09 08 ,02 05.2,+06 06, 29W 16S ,17.3, CBET 4190 ,02 05 13.32 +06 06 08.4, CBET 4190 ,Ib , 2015ap ,Ross, Zheng, Filippenko (LOSS)
+2015ao ,ESO 354-G3 ,2015 10 06 ,01 50.9,-36 01, 12E 15N ,17.7, CBET 4189 ,01 50 53.56 -36 00 30.8, CBET 4189 ,Ia-, 2015ao ,Bock
+2015an ,IC 2367 ,2015 09 13 ,08 24.3,-18 46, 71E 4N ,15.2, CBET 4188 ,08 24 15.02 -18 46 28.1, CBET 4188 ,II-, 2015an ,Monard
+2015am ,UGC 1641 ,2015 08 13 ,02 09.2,+32 00, 3W 12N ,18.7, CBET 4187 ,02 09 09.90 +31 59 51.5, CBET 4187 ,IIP, 2015am ,Campaner
+2015al ,Anon. ,2015 08 10 ,19 25.2,-53 36, 4E 5S ,18.5, CBET 4185 ,19 25 12.69 -53 36 02.8, CBET 4185 ,Ia , 2015al ,Parker
+2015ak ,ESO 108-21 ,2015 08 18 ,22 15.3,-65 33, 18E 6N ,16.0, CBET 4184 ,22 15 19.67 -65 32 53.4, CBET 4184 ,Ia , 2015ak ,Marples
+2015aj ,UGC 3460 ,2015 09 02 ,06 28.1,+74 19, 18E 28N ,18.3, CBET 4183 ,06 28 03.68 +74 18 33.8, CBET 4183 ,II , 2015aj ,Campaner
+2015ai ,UGC 8734 ,2015 07 02 ,13 48.1,+61 49, 7W 20S ,16.3, CBET 4182 ,13 48 04.90 +61 49 15.3, CBET 4182 ,Ia , 2015ai ,Briggs, Post, Puckett, Newton
+2015ah ,UGC 12295 ,2015 08 06 ,23 00.4,+01 38, 14E 1N ,15.9, CBET 4181 ,23 00 24.63 +01 37 36.8, CBET 4181 ,Ib-, 2015ah ,Lipunov, Gress (MASTER)
+2015ag ,IC 43 ,2015 08 06 ,00 42.4,+29 39, 1W 12N ,19.1, CBET 4180 ,00 42 21.86 +29 38 41.5, CBET 4180 ,Ic , 2015ag ,Campaner
+2015af ,NGC 6801 ,2015 08 09 ,19 27.6,+54 23, 17E 12N ,18.4, CBET 4179 ,19 27 37.70 +54 22 34.0, CBET 4179 ,II , 2015af ,Campaner
+2015ae ,NGC 7753 ,2015 08 06 ,23 47.1,+29 29, 18E 7N ,17.3, CBET 4178 ,23 47 06.15 +29 29 07.4, CBET 4178 ,II , 2015ae ,Itagaki
+2015ad ,UGC 2282 ,2015 07 29 ,02 48.7,+14 19, 3E 9S ,17.5, CBET 4176 ,02 48 42.34 +14 18 45.4, CBET 4176 ,Ia , 2015ad ,Leonini et al.
+2015ac ,UGC 12474 ,2015 07 28 ,23 16.7,+34 00, 1W 3N ,17.5, CBET 4175 ,23 16 43.32 +33 59 47.6, CBET 4175 ,Ia , 2015ac ,Emmanouilidi, Koukioglou
+2015ab ,NGC 938 ,2015 07 10 ,02 28.5,+20 17, 9W 6N ,17.3, CBET 4173 ,02 28 32.86 +20 17 07.7, CBET 4173 ,Ia , 2015ab ,Itagaki
+2015aa ,Anon. ,2015 05 19 ,13 12.9,+28 48, 2E 0S ,20.6, CBET 4172 ,13 12 53.70 +28 47 55.3, CBET 4172 ,Ia , 2015aa ,Morokuma et al. (Kiso Supernova Survey)
+2015Z ,NGC 5837 ,2015 06 16 ,15 04.7,+12 38, 3E 16S ,17.5, CBET 4171 ,15 04 40.78 +12 37 43.6, CBET 4171 ,IIn, 2015Z ,Arbour
+2015Y ,NGC 2735 ,2015 04 11 ,09 02.6,+25 56, 10W 0S ,17.9, CBET 4170 ,09 02 37.87 +25 56 04.2, CBET 4170 ,Ib , 2015Y ,Halevi, Hughes, Zheng, Filippenko (LOSS)
+2015X ,UGC 3777 ,2015 02 23 ,07 16.7,+29 51, 4W 5S ,17.2, CBET 4169 ,07 16 42.58 +29 51 22.7, CBET 4169 ,II , 2015X ,Hughes, Zheng, Filippenko (LOSS)
+2015W ,UGC 3617 ,2015 01 12 ,06 57.7,+13 35, 32W 15N ,16.8, CBET 4168 ,06 57 43.03 +13 34 45.7, CBET 4168 ,IIP, 2015W ,Kim, Zheng, Filippenko (LOSS)
+2015V ,UGC 11000 ,2015 04 04 ,17 49.5,+36 09, 5E 7S ,15.9, CBET 4167 ,17 49 27.05 +36 08 36.0, CBET 4167 ,IIP, 2015V ,Halevi, Zheng, Filippenko (LOSS)
+2015U ,NGC 2388 ,2015 02 13 ,07 28.9,+33 49, 6E 2N ,16.4, CBET 4164 ,07 28 53.87 +33 49 10.6, CBET 4164 ,Ibn, 2015U ,Kumar, Yuk, Zheng, Filippenko (LOSS)
+2015T ,ESO 147-G20A ,2015 06 16 ,23 07.4,-61 29, 6E 5S ,17.3, CBET 4133 ,23 07 24.07 -61 29 21.2, CBET 4133 ,II , 2015T ,Parker
+2015S ,Anon. ,2015 07 22 ,00 31.4,-49 36, 8E 10S ,17.1, CBET 4130 ,00 31 26.07 -49 35 34.6, CBET 4130 ,IIP, 2015S ,Marples, Parker
+2015R ,UGC 8690 ,2015 04 09 ,13 44.6,+04 47, 5W 22N ,17.8, CBET 4129 ,13 44 33.67 +04 46 53.5, CBET 4129 ,II , 2015R ,Ciabattari, Mazzoni, Donati
+2015Q ,NGC 3888 ,2015 06 17 ,11 47.6,+55 58, 6E 13N ,16.0, CBET 4128 ,11 47 35.08 +55 58 14.7, CBET 4128 ,Ib , 2015Q ,Wiggins
+2015P ,MCG -02-33-20 ,2015 06 07 ,12 50.5,-10 53, 19E 84S ,18.2, CBET 4126 ,12 50 30.72 -10 52 40.5, CBET 4126 ,IIP, 2015P ,Parker
+2015O ,Anon. ,2015 06 22 ,18 13.8,+13 14, 5E 6S ,18.3, CBET 4125 ,18 13 49.23 +13 14 15.9, CBET 4125 ,IIP, 2015O ,Ross, Zheng, Filippenko (LOSS)
+2015N ,UGC 11797 ,2015 07 06 ,21 43.3,+43 35, 36W 13N ,17.6, CBET 4124 ,21 43 16.89 +43 34 47.6, CBET 4124 ,Ia , 2015N ,Stegman, Zheng, Filippenko (LOSS)
+2015M ,Anon. ,2015 05 13 ,13 00.5,+27 59, ,17.2, CBET 4123 ,13 00 32.30 +27 58 41.1, CBET 4123 ,Ia , 2015M ,Itagaki
+2015L ,Anon. ,2015 06 14 ,22 02.3,-61 40, 0E 0S ,17.0, CBET 4120 ,22 02 15.45 -61 39 34.6, CBET 4120 ,I-p, 2015L ,Dong et al. (All Sky Automated Survey for SuperNovae)
+2015K ,NGC 7712 ,2015 04 25 ,23 35.9,+23 37, 8E 15S ,16.3, CBET 4116 ,23 35 52.26 +23 36 52.1, CBET 4116 ,Ic , 2015K ,Itagaki
+2015J ,Anon. ,2015 04 27 ,07 35.1,-69 08, ,19.3, CBET 4115 ,07 35 05.18 -69 07 53.1, CBET 4115 ,IIn, 2015J ,Scalzo, Childress et al.
+2015I ,NGC 2357 ,2015 05 02 ,07 17.8,+23 21, 66E 43S ,15.7, CBET 4106 ,07 17 45.70 +23 20 40.6, CBET 4106 ,Ia , 2015I ,Noguchi
+2015H ,NGC 3464 ,2015 02 10 ,10 54.7,-21 04, 30E 14S ,16.9, CBET 4093 ,10 54 42.16 -21 04 13.8, CBET 4093 ,Ia , 2015H ,Parker
+2015G ,NGC 6951 ,2015 03 23 ,20 37.4,+66 07, 69E 51N ,15.5, CBET 4087 ,20 37 25.58 +66 07 11.5, CBET 4087 ,Ibn, 2015G ,Shima
+2015F ,NGC 2442 ,2015 03 09 ,07 36.3,-69 30, 40W 84N ,16.8, CBET 4081 ,07 36 15.76 -69 30 23.0, CBET 4081 ,Ia , 2015F ,Monard
+2015E ,Anon. ,2015 01 13 ,03 13.6,+00 15, 1W 1N ,17.0, CBET 4053 ,03 13 35.31 +00 15 03.1, CBET 4053 ,Ia , 2015E ,Morokuma et al. (Kiso Supernova Survey)
+2015D ,NGC 5020 ,2015 01 18 ,13 12.7,+12 36, 14E 3N ,17.5, CBET 4051 ,13 12 41.16 +12 36 01.8, CBET 4051 ,IIP, 2015D ,Jin, Gao (Xingming Sky Survey)
+2015C ,IC 4221 ,2015 01 07 ,13 18.5,-14 37, 2E 12S ,16.4, CBET 4049 ,13 18 30.47 -14 36 44.6, CBET 4049 ,IIP, 2015C ,Pina, Zheng, Filippenko (LOSS)
+2015B ,NGC 4782 ,2015 01 05 ,12 54.6,-12 34, 2W 10S ,15.0, CBET 4046 ,12 54 35.53 -12 34 18.6, CBET 4046 ,Ia , 2015B ,Leonini et al.
+2015A ,NGC 2955 ,2015 01 09 ,09 41.3,+35 53, 12W 21N ,16.6, CBET 4045 ,09 41 15.55 +35 53 17.4, CBET 4045 ,Ia , 2015A ,Itagaki
diff --git a/kstars/kstarsliteinit.cpp b/kstars/kstarsliteinit.cpp
index e8f8d3b..fc12543 100644
--- a/kstars/kstarsliteinit.cpp
+++ b/kstars/kstarsliteinit.cpp
@@ -46,6 +46,15 @@ void KStarsLite::datainitFinished() {
//Notify Splash in QML and LocationDialogLite that loading of data is finished
dataLoadFinished();
map()->forceUpdate();
+
+ //Default options
+ Options::setShowEquator(true);
+ Options::setShowHorizon(true);
+ Options::setShowEcliptic(true);
+ Options::setAutoSelectGrid(false);
+// Options::setHideGrids(false);
+// Options::setShowEquatorialGrid(true);
+// Options::setShowHorizontalGrid(true);
}
void KStarsLite::initFocus() {
diff --git a/kstars/main.cpp b/kstars/main.cpp
index 550f6cc..cc91631 100644
--- a/kstars/main.cpp
+++ b/kstars/main.cpp
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
QByteArray data = "1";
//qputenv("QSG_RENDER_TIMING", data);
- KLocalizedString::setApplicationDomain("kstars");
+ KLocalizedString::setApplicationDomain("kstars");
#ifndef KSTARS_LITE
KCrash::initialize();
diff --git a/kstars/skycomponents/skymapcomposite.cpp b/kstars/skycomponents/skymapcomposite.cpp
index 91955a4..c4967f7 100644
--- a/kstars/skycomponents/skymapcomposite.cpp
+++ b/kstars/skycomponents/skymapcomposite.cpp
@@ -100,12 +100,16 @@ SkyMapComposite::SkyMapComposite(SkyComposite *parent ) :
addComponent( m_ArtificialHorizon = new ArtificialHorizonComponent(this), 110);
+ m_internetResolvedCat = "_Internet_Resolved";
+ m_manualAdditionsCat = "_Manual_Additions";
+ addComponent( m_internetResolvedComponent = new SyncedCatalogComponent( this, m_internetResolvedCat, true, 0 ), 6 );
+ addComponent( m_manualAdditionsComponent = new SyncedCatalogComponent( this, m_manualAdditionsCat, true, 0 ), 6 );
m_CustomCatalogs = new SkyComposite( this );
QStringList allcatalogs = Options::showCatalogNames();
for ( int i=0; i < allcatalogs.size(); ++ i ) {
- m_CustomCatalogs->addComponent(
- new CatalogComponent( this, allcatalogs.at(i), false, i ), 6
- );
+ if( allcatalogs.at(i) == m_internetResolvedCat || allcatalogs.at(i) == m_manualAdditionsCat ) // This is a special catalog
+ continue;
+ m_CustomCatalogs->addComponent(new CatalogComponent( this, allcatalogs.at(i), false, i ), 6 ); // FIXME: Should this be 6 or 5? See SkyMapComposite::reloadDeepSky()
}
addComponent( m_SolarSystem = new SolarSystemComposite( this ), 2);
diff --git a/kstars/skymaplite.h b/kstars/skymaplite.h
index 492ea73..6a54af5 100644
--- a/kstars/skymaplite.h
+++ b/kstars/skymaplite.h
@@ -740,6 +740,8 @@ private:
QVector<QVector<QSGTexture*>> textureCache;
bool clearTextures;
+ bool tapBegan;
+
#ifdef HAVE_INDI
QList<INDI::BaseDevice *> m_newTelescopes;
QList<INDI::BaseDevice *> m_delTelescopes;
diff --git a/kstars/skymapliteevents.cpp b/kstars/skymapliteevents.cpp
index e83c077..31909db 100644
--- a/kstars/skymapliteevents.cpp
+++ b/kstars/skymapliteevents.cpp
@@ -317,16 +317,24 @@ void SkyMapLite::touchEvent( QTouchEvent *e) {
}
mouseMoveEvent(event);
+ if( e->touchPointStates() & Qt::TouchPointReleased ) {
+ slewing = false;
+ if(pinch) {
+ pinch = false;
+ mouseButtonDown = false;
+ }
+ }
+
delete event;
- } else {
- if(pinch) {
- pinch = false;
- mouseButtonDown = false;
- } else {
- //If only pan is needed we just use the first touch point
- if(e->touchPointStates() & Qt::TouchPointMoved || slewing) {
+ } else if (points.length() == 1 && !pinch) {
+ if ( !projector()->unusablePoint( points[0].screenPos() ) ) {
+ if( !tapBegan && (e->touchPointStates() & Qt::TouchPointPressed) ) {
+ tapBegan = true;
+ } else if(e->touchPointStates() & Qt::TouchPointMoved || slewing) {
QPointF newFocus = points[0].screenPos();
+ tapBegan = false;
+
QMouseEvent *event = new QMouseEvent(QEvent::MouseButtonPress, newFocus,
Qt::LeftButton, Qt::LeftButton, Qt::ControlModifier);
if(e->type() == QEvent::TouchBegin) {
@@ -349,8 +357,9 @@ void SkyMapLite::touchEvent( QTouchEvent *e) {
}
}
delete event;
- } else if((e->touchPointStates() & (Qt::TouchPointReleased))) { //&& !slewing && points.length() == 1) {
+ } else if((e->touchPointStates() & Qt::TouchPointReleased) && tapBegan ) { //&& !slewing && points.length() == 1) {
if(slewing) slewing = false;
+ tapBegan = false;
//Show tap animation
emit posClicked(points[0].screenPos());
//determine RA, Dec of touch
@@ -376,6 +385,7 @@ void SkyMapLite::touchEvent( QTouchEvent *e) {
}
}
+
double SkyMapLite::zoomFactor( const int modifier ) {
double factor = ( modifier & Qt::ControlModifier) ? DZOOM : 2.0;
if ( modifier & Qt::ShiftModifier )
diff --git a/kstars/time/simclock.cpp b/kstars/time/simclock.cpp
index ef63c31..64bc893 100644
--- a/kstars/time/simclock.cpp
+++ b/kstars/time/simclock.cpp
@@ -153,14 +153,14 @@ void SimClock::setUTC(const KStarsDateTime &newtime) {
qDebug() << "Cannot set SimClock: Invalid Date/Time.";
}
}
-
+#ifdef KSTARS_LITE
void SimClock::setFromQDateTime(const QDateTime &dateTime) {
KStarsDateTime dt;
dt.setDate(dateTime.date());
dt.setTime(dateTime.time());
setUTC(dt);
}
-
+#endif
void SimClock::setClockScale(float s) {
if (Scale != s ) {
qDebug() << "New clock scale: " << s << " sec";
diff --git a/kstars/tools/nameresolver.cpp b/kstars/tools/nameresolver.cpp
index c517959..af3eca0 100644
--- a/kstars/tools/nameresolver.cpp
+++ b/kstars/tools/nameresolver.cpp
@@ -21,7 +21,9 @@
#include "../../datahandlers/catalogentrydata.h"
/* KDE Includes */
+#ifndef KSTARS_LITE
#include <kio/filecopyjob.h>
+#endif
/* Qt Includes */
#include <QUrl>