summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Fedoskin <afedoskin3@gmail.com>2016-10-04 06:06:15 (GMT)
committerArtem Fedoskin <afedoskin3@gmail.com>2016-10-04 06:06:15 (GMT)
commitfe69ba4fdae4fbfdbe2671cddd204467097f82f2 (patch)
tree81d5bf4c99f65b1786b0054402918fa85d1e2b19
parent94b829b2497daee7c32a10ce7246ece74e027314 (diff)
Fix issue with lines not extended to horizon in KStars Lite
-rw-r--r--kstars/fitsviewer/fitsviewlite.cpp1
-rw-r--r--kstars/kstarslite/dialogs/detaildialoglite.cpp3
-rw-r--r--kstars/kstarslite/dialogs/finddialoglite.cpp1
-rw-r--r--kstars/kstarslite/skyitems/deepskyitem.cpp1
-rw-r--r--kstars/kstarslite/skyitems/skynodes/deepskynode.cpp2
-rw-r--r--kstars/kstarslite/skyitems/skynodes/deepskynode.h1
-rw-r--r--kstars/kstarslite/skyitems/skynodes/dsosymbolnode.cpp1
-rw-r--r--kstars/kstarslite/skyitems/skynodes/dsosymbolnode.h1
-rw-r--r--kstars/kstarslite/skyitems/skynodes/nodes/linenode.cpp10
-rw-r--r--kstars/kstarslite/skyitems/syncedcatalogitem.cpp3
10 files changed, 22 insertions, 2 deletions
diff --git a/kstars/fitsviewer/fitsviewlite.cpp b/kstars/fitsviewer/fitsviewlite.cpp
index 30d347f..dc5f556 100644
--- a/kstars/fitsviewer/fitsviewlite.cpp
+++ b/kstars/fitsviewer/fitsviewlite.cpp
@@ -35,6 +35,7 @@
#include "indi/indistd.h"
#include "indi/driverinfo.h"
#endif
+#include <QImage>
#define ZOOM_DEFAULT 100.0
#define ZOOM_MIN 10
diff --git a/kstars/kstarslite/dialogs/detaildialoglite.cpp b/kstars/kstarslite/dialogs/detaildialoglite.cpp
index c495ccf..142d413 100644
--- a/kstars/kstarslite/dialogs/detaildialoglite.cpp
+++ b/kstars/kstarslite/dialogs/detaildialoglite.cpp
@@ -26,6 +26,9 @@
#include "skyobjects/ksasteroid.h"
#include "skyobjects/supernova.h"
+#include "deepskyobject.h"
+#include "starobject.h"
+
#include <QTemporaryFile>
#include <QDesktopServices>
diff --git a/kstars/kstarslite/dialogs/finddialoglite.cpp b/kstars/kstarslite/dialogs/finddialoglite.cpp
index 8cd1522..3e37b16 100644
--- a/kstars/kstarslite/dialogs/finddialoglite.cpp
+++ b/kstars/kstarslite/dialogs/finddialoglite.cpp
@@ -23,6 +23,7 @@
#include "skycomponents/skymapcomposite.h"
#include "skymaplite.h"
#include "kstarslite.h"
+#include"deepskyobject.h"
#include "solarsystemcomposite.h"
//Resolver
diff --git a/kstars/kstarslite/skyitems/deepskyitem.cpp b/kstars/kstarslite/skyitems/deepskyitem.cpp
index ad93e17..47b2184 100644
--- a/kstars/kstarslite/skyitems/deepskyitem.cpp
+++ b/kstars/kstarslite/skyitems/deepskyitem.cpp
@@ -23,6 +23,7 @@
#include "deepstaritem.h"
#include "skynodes/dsosymbolnode.h"
+#include "deepskyobject.h"
#include "starcomponent.h"
#include "starblockfactory.h"
#include "skymesh.h"
diff --git a/kstars/kstarslite/skyitems/skynodes/deepskynode.cpp b/kstars/kstarslite/skyitems/skynodes/deepskynode.cpp
index b985cda..dd27eac 100644
--- a/kstars/kstarslite/skyitems/skynodes/deepskynode.cpp
+++ b/kstars/kstarslite/skyitems/skynodes/deepskynode.cpp
@@ -23,7 +23,7 @@
#include "nodes/pointnode.h"
#include "dsosymbolnode.h"
#include "trixelnode.h"
-
+#include "deepskyobject.h"
#include "../rootnode.h"
#include "../labelsitem.h"
#include "labelnode.h"
diff --git a/kstars/kstarslite/skyitems/skynodes/deepskynode.h b/kstars/kstarslite/skyitems/skynodes/deepskynode.h
index 6c9cee7..7a5b5f8 100644
--- a/kstars/kstarslite/skyitems/skynodes/deepskynode.h
+++ b/kstars/kstarslite/skyitems/skynodes/deepskynode.h
@@ -36,6 +36,7 @@ class DSOSymbolNode;
*/
class RootNode;
+class DeepSkyObject;
class DeepSkyNode : public SkyNode {
public:
diff --git a/kstars/kstarslite/skyitems/skynodes/dsosymbolnode.cpp b/kstars/kstarslite/skyitems/skynodes/dsosymbolnode.cpp
index 48a0ed2..9be770c 100644
--- a/kstars/kstarslite/skyitems/skynodes/dsosymbolnode.cpp
+++ b/kstars/kstarslite/skyitems/skynodes/dsosymbolnode.cpp
@@ -20,6 +20,7 @@
#include "dsosymbolnode.h"
#include "nodes/ellipsenode.h"
+#include "deepskyobject.h"
#include "../rootnode.h"
#include "../labelsitem.h"
diff --git a/kstars/kstarslite/skyitems/skynodes/dsosymbolnode.h b/kstars/kstarslite/skyitems/skynodes/dsosymbolnode.h
index 0144bce..80de7ce 100644
--- a/kstars/kstarslite/skyitems/skynodes/dsosymbolnode.h
+++ b/kstars/kstarslite/skyitems/skynodes/dsosymbolnode.h
@@ -25,6 +25,7 @@ class LabelNode;
class QSGSimpleTextureNode;
class EllipseNode;
class LineNode;
+class DeepSkyObject;
class RootNode;
diff --git a/kstars/kstarslite/skyitems/skynodes/nodes/linenode.cpp b/kstars/kstarslite/skyitems/skynodes/nodes/linenode.cpp
index 81b56ff..654de5f 100644
--- a/kstars/kstarslite/skyitems/skynodes/nodes/linenode.cpp
+++ b/kstars/kstarslite/skyitems/skynodes/nodes/linenode.cpp
@@ -96,8 +96,16 @@ void LineNode::updateGeometry() {
doSkip = m_skipList->skip(j);
}
+ bool pointsVisible = false;
+ //Temporary solution to avoid random lines in Gnomonic projection and draw lines up to horizon
+ if(SkyMapLite::Instance()->projector()->type() == Projector::Gnomonic) {
+ if ( isVisible && isVisibleLast ) pointsVisible = true;
+ } else {
+ if ( isVisible || isVisibleLast ) pointsVisible = true;
+ }
+
if ( !doSkip ) {
- if ( (isVisible ) ) {
+ if(pointsVisible) {
newPoints.append(oLast);
newPoints.append(oThis);
}
diff --git a/kstars/kstarslite/skyitems/syncedcatalogitem.cpp b/kstars/kstarslite/skyitems/syncedcatalogitem.cpp
index 7b5d957..a8573c7 100644
--- a/kstars/kstarslite/skyitems/syncedcatalogitem.cpp
+++ b/kstars/kstarslite/skyitems/syncedcatalogitem.cpp
@@ -5,6 +5,9 @@
#include "skynodes/deepskynode.h"
#include "skynodes/dsosymbolnode.h"
+#include "deepskyobject.h"
+#include "starobject.h"
+
SyncedCatalogItem::SyncedCatalogItem(SyncedCatalogComponent *parent, RootNode *rootNode)
:SkyItem(LabelsItem::label_t::NO_LABEL, rootNode), m_parent(parent), //It has NO_LABEL type because it handles two types of labels (CATALOG_STAR_LABEL and CATALOG_DSO_LABEL)
stars(new QSGNode), dsoSymbols(new QSGNode), dsoNodes(new QSGNode)