[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeedu/kstars/kstars
From: Akarsh Simha <akarshsimha () gmail ! com>
Date: 2011-01-03 10:16:13
Message-ID: 20110103101613.4E366AC8B2 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1211223 by asimha:
Show star hop results using a TargetListComponent. Terribly hackish
code, just to test the idea! Will clean this nauseating mess up before
commiting into trunk.
M +1 -0 colorscheme.cpp
M +5 -0 skycomponents/skymapcomposite.cpp
M +2 -0 skycomponents/skymapcomposite.h
M +14 -1 skymap.cpp
--- trunk/KDE/kdeedu/kstars/kstars/colorscheme.cpp #1211222:1211223
@@ -72,6 +72,7 @@
appendItem("PlanetTrailColor", i18n("Planet Trails"), "#993311");
appendItem("AngularRuler", i18n("Angular Distance Ruler"), "#445566");
appendItem("ObsListColor", i18n("Observing List Label"), "#FF0000");
+ appendItem("StarHopRouteColor", i18n("Star-Hop Route"), "#00FFFF");
appendItem("SatColor", i18n("Satellite Track"), "#007777");
//Load colors from config object
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/skymapcomposite.cpp #1211222:1211223
@@ -96,6 +96,8 @@
addComponent( m_ObservingList = new TargetListComponent( this , 0, QPen(),
\
&Options::obsListSymbol, &Options::obsListText ) ); + addComponent( \
m_StarHopRouteList = new TargetListComponent( this , 0, QPen() ) ); +
connect( this, SIGNAL( progressText( const QString & ) ),
KStarsData::Instance(), SIGNAL( progressText( const QString & ) ) );
}
@@ -257,6 +259,9 @@
m_Flags->draw( skyp );
+ m_StarHopRouteList->pen = QPen( QColor(data->colorScheme()->colorNamed( \
"StarHopRouteColor" )), int(SkyMap::Instance()->scale()) ); + \
m_StarHopRouteList->draw( psky ); +
m_skyMesh->inDraw( false );
//kDebug() << QString("draw took %1 ms").arg( t.elapsed() );
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/skymapcomposite.h #1211222:1211223
@@ -187,6 +187,7 @@
QList<SkyComponent*> customCatalogs();
ConstellationBoundaryLines* getConstellationBoundary() { return m_CBoundLines; }
+ inline TargetListComponent *getStarHopRouteList() { return m_StarHopRouteList; }
signals:
void progressText( const QString &message );
@@ -210,6 +211,7 @@
//SatelliteComposite *m_Satellites;
FlagComponent *m_Flags;
TargetListComponent *m_ObservingList;
+ TargetListComponent *m_StarHopRouteList;
SkyMesh* m_skyMesh;
SkyLabeler* m_skyLabeler;
--- trunk/KDE/kdeedu/kstars/kstars/skymap.cpp #1211222:1211223
@@ -58,6 +58,7 @@
#include "projections/orthographicprojector.h"
#include "projections/azimuthalequidistantprojector.h"
#include "projections/equirectangularprojector.h"
+
#include "texturemanager.h"
#include "skymapqdraw.h"
@@ -66,6 +67,9 @@
#include "skymapgldraw.h"
#endif
+// DEBUG TODO: Remove later -- required to display starhop results for debug.
+#include "skycomponents/targetlistcomponent.h"
+
#include "starhopper.h"
#ifdef HAVE_XPLANET
@@ -625,10 +629,19 @@
else { // Star Hop
StarHopper hopper;
QList<const StarObject *> path = hopper.computePath( *AngularRuler.point( 0 \
), *AngularRuler.points().last(), 1.0, 9.0 ); // FIXME: Hardcoded FOV and magnitude \
limits for testing +
+ QList<SkyObject *> *mutablestarlist = new QList<SkyObject *>(); // FIXME: \
Memory leak kDebug() << "path count: " << path.count();
foreach( const StarObject *conststar, path ) {
+ StarObject *mutablestar = const_cast<StarObject *>(conststar); // FIXME: \
Ugly const_cast + mutablestarlist->append( mutablestar );
+ kDebug() << "Added star!";
+ }
- }
+ TargetListComponent *t = \
KStarsData::Instance()->skyComposite()->getStarHopRouteList(); + delete \
t->list; + t->list = mutablestarlist;
+
rulerMode = false;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic