[Kstars-devel] KDE/kdeedu/kstars/kstars

[Jasem Mutlaq]

SVN commit 522208 by mutlaqja:

Removing TelescopeComponent. The telescope markers are now drawn in overlays where they belong.

CCMAIL: kstars-devel at kde.org



 M  +1 -2      indistd.cpp  
 M  +1 -1      skycomponents/Makefile.am  
 M  +0 -17     skycomponents/skymapcomposite.cpp  
 M  +0 -6      skycomponents/skymapcomposite.h  
 D             skycomponents/telescopecomponent.cpp  
 D             skycomponents/telescopecomponent.h  
 M  +2 -5      skymapdraw.cpp  


--- trunk/KDE/kdeedu/kstars/kstars/indistd.cpp #522207:522208
@@ -74,7 +74,6 @@
    seqLister		= new KDirLister();
    
    telescopeSkyObject   = new SkyObject(0, 0, 0, 0, i18n("Telescope"));
-   ksw->data()->skyComposite()->addTelescopeMarker(telescopeSkyObject);
 	
    connect( devTimer, SIGNAL(timeout()), this, SLOT(timerDone()) );
    connect( seqLister, SIGNAL(newItems (const KFileItemList & )), this, SLOT(checkSeqBoundary(const KFileItemList &)));
@@ -87,7 +86,7 @@
  
  INDIStdDevice::~INDIStdDevice()
  {
-   ksw->data()->skyComposite()->removeTelescopeMarker(telescopeSkyObject);
+   //ksw->data()->skyComposite()->removeTelescopeMarker(telescopeSkyObject);
    streamWindow->enableStream(false);
    streamWindow->close();
    CCDPreviewWindow->enableStream(false);
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/Makefile.am #522207:522208
@@ -9,7 +9,7 @@
 			constellationnamescomponent.cpp constellationboundarycomponent.cpp \
 			coordinategridcomposite.cpp coordinategridcomponent.cpp \
 			eclipticcomponent.cpp equatorcomponent.cpp horizoncomponent.cpp \
-			milkywaycomposite.cpp milkywaycomponent.cpp telescopecomponent.cpp \
+			milkywaycomposite.cpp milkywaycomponent.cpp \
 			skycomponent.cpp skycomposite.cpp skymapcomposite.cpp 
 
 INCLUDES = -I.. -I../tools -I$(srcdir)/.. -I$(top_srcdir) $(all_includes)
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/skymapcomposite.cpp #522207:522208
@@ -77,8 +77,6 @@
 	
 	m_SolarSystem = new SolarSystemComposite( this, data );
 	addComponent( m_SolarSystem );
-	m_Telescopes = new TelescopeComponent(this, &Options::indiCrosshairs);
-	addComponent(m_Telescopes);
 
 	connect( this, SIGNAL( progressText( const QString & ) ), 
 					data, SIGNAL( progressText( const QString & ) ) );
@@ -131,8 +129,6 @@
 
 	//13. Horizon (and ground)
 	m_Horizon->draw( ks, psky, scale );
-	//14. Telescopes
-	m_Telescopes->draw( ks, psky, scale );
 
 }
 
@@ -230,19 +226,6 @@
 	}
 }
 
-void SkyMapComposite::addTelescopeMarker( SkyObject *o)
-{
-       /* FIXME Does this function belong here?? */
-	m_Telescopes->addTelescopeMarker(o);
-}
-
-void SkyMapComposite::removeTelescopeMarker( SkyObject *o)
-{
-  /* FIXME Does this function belong here?? */
-	m_Telescopes->removeTelescopeMarker(o);
-}
-
-
 void SkyMapComposite::setFaintStarMagnitude( float newMag ) {
 	m_Stars->setFaintMagnitude( newMag );
 }
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/skymapcomposite.h #522207:522208
@@ -38,7 +38,6 @@
 // #include "milkywaycomposite.h"
 #include "solarsystemcomposite.h"
 #include "starcomponent.h"
-#include "telescopecomponent.h"
 
 
 class ConstellationBoundaryComponent;
@@ -53,7 +52,6 @@
 class MilkyWayComposite;
 //class SolarSystemComposite;
 //class StarComponent;
-//class TelescopeComponent;
 
 
 class KStarsData;
@@ -134,8 +132,6 @@
 		virtual bool hasTrail( SkyObject *o, bool &found );
 		virtual bool removeTrail( SkyObject *o );
 		virtual void clearTrailsExcept( SkyObject *o );
-		virtual void addTelescopeMarker( SkyObject *o);
-		virtual void removeTelescopeMarker( SkyObject *o);
 
 		void addCustomCatalog( const QString &filename, bool (*visibleMethod)() );
 		void removeCustomCatalog( const QString &name );
@@ -168,7 +164,6 @@
 		QList<SkyObject*>& stars() { return m_Stars->objectList(); }
 		QList<SkyObject*>& asteroids() { return m_SolarSystem->asteroids(); }
 		QList<SkyObject*>& comets() { return m_SolarSystem->comets(); }
-		QList<SkyObject*>& telescopes() { return m_Telescopes->objectList(); }
 		KSPlanet* earth() { return m_SolarSystem->earth(); }
 
 		QList<SkyComponent*> customCatalogs() { 
@@ -191,7 +186,6 @@
 		SolarSystemComposite *m_SolarSystem;
 		SkyComposite *m_CustomCatalogs;
 		StarComponent *m_Stars;
-		TelescopeComponent *m_Telescopes;
 		QStringList m_ObjectNames;
 		QList<SkyObject*> m_LabeledObjects;
 };
--- trunk/KDE/kdeedu/kstars/kstars/skymapdraw.cpp #522207:522208
@@ -193,10 +193,8 @@
 	}
 }
 
-void SkyMap::drawTelescopeSymbols(QPainter &psky) {
- 
-/* NOTE We're using TelescopeComponent now. Remove this later on
-
+void SkyMap::drawTelescopeSymbols(QPainter &psky)
+{
 	if ( ks ) { //ks doesn't exist in non-GUI mode!
 		INDI_P *eqNum;
 		INDI_P *portConnect;
@@ -331,7 +329,6 @@
 			}
 		}
 	}
-*/
 }
 
 void SkyMap::exportSkyImage( QPaintDevice *pd ) {