Commit 647d01ab authored by Akarsh Simha's avatar Akarsh Simha

Remove Jupiter's Moons

Jupiter Moons are anyway incorrect. No point even showing them when
the calculations are not correct.
parent 59805778
......@@ -215,7 +215,7 @@ if(NOT BUILD_KSTARS_LITE)
tools/avtplotwidget.cpp
tools/calendarwidget.cpp
tools/conjunctions.cpp
tools/jmoontool.cpp
# tools/jmoontool.cpp
tools/ksconjunct.cpp
tools/eqplotwidget.cpp
tools/astrocalc.cpp
......@@ -564,8 +564,8 @@ endif(NOT BUILD_KSTARS_LITE)
set(kstars_skyobjects_SRCS
skyobjects/constellationsart.cpp
skyobjects/deepskyobject.cpp
skyobjects/jupitermoons.cpp
skyobjects/planetmoons.cpp
# skyobjects/jupitermoons.cpp
# skyobjects/planetmoons.cpp
skyobjects/ksasteroid.cpp
skyobjects/kscomet.cpp
skyobjects/ksmoon.cpp
......
......@@ -75,7 +75,7 @@
<Action name="scriptbuilder" />
<Action name="solarsystem" />
<Action name="ekos" />
<Action name="jmoontool" />
<!-- <Action name="jmoontool" /> -->
<Action name="flagmanager" />
</Menu>
......
......@@ -70,7 +70,7 @@ KStars *KStars::pinstance = 0;
KStars::KStars( bool doSplash, bool clockrun, const QString &startdate )
: KXmlGuiWindow(), colorActionMenu(0), fovActionMenu(0), m_KStarsData(0), m_SkyMap(0), m_TimeStepBox(0),
m_ExportImageDialog(0), m_PrintingWizard(0), m_FindDialog(0), m_AstroCalc(0), m_AltVsTime(0), m_SkyCalendar(0), m_ScriptBuilder(0),
m_PlanetViewer(0), m_WUTDialog(0), m_JMoonTool(0), m_MoonPhaseTool(0), m_FlagManager(0), m_HorizonManager(0), m_EyepieceView(0),
m_PlanetViewer(0), m_WUTDialog(0), /*m_JMoonTool(0),*/ m_MoonPhaseTool(0), m_FlagManager(0), m_HorizonManager(0), m_EyepieceView(0),
m_addDSODialog(0), m_WIView(0), m_ObsConditions(0), m_wiDock(0), DialogIsObsolete(false), StartClockRunning( clockrun ), StartDateString( startdate )
{
setWindowTitle(i18n("KStars"));
......
......@@ -47,7 +47,7 @@ class AstroCalc;
class SkyCalendar;
class ScriptBuilder;
class PlanetViewer;
class JMoonTool;
//class JMoonTool;
class MoonPhaseTool;
class FlagManager;
class EquipmentWriter;
......@@ -527,7 +527,7 @@ private slots:
void slotSolarSystem();
/** action slot: open Jupiter Moons tool */
void slotJMoonTool();
// void slotJMoonTool();
/** action slot: open Moon Phase Calendar tool */
void slotMoonPhaseTool();
......@@ -674,7 +674,7 @@ private:
ScriptBuilder *m_ScriptBuilder;
PlanetViewer *m_PlanetViewer;
WUTDialog *m_WUTDialog;
JMoonTool *m_JMoonTool;
// JMoonTool *m_JMoonTool;
MoonPhaseTool *m_MoonPhaseTool;
FlagManager *m_FlagManager;
HorizonManager *m_HorizonManager;
......
......@@ -91,7 +91,7 @@
#include "tools/skycalendar.h"
#include "tools/scriptbuilder.h"
#include "tools/planetviewer.h"
#include "tools/jmoontool.h"
//#include "tools/jmoontool.h"
//FIXME Port to KF5
//#include "tools/moonphasetool.h"
#include "tools/flagmanager.h"
......@@ -508,11 +508,12 @@ void KStars::slotSolarSystem() {
if ( ! m_PlanetViewer ) m_PlanetViewer = new PlanetViewer(this);
m_PlanetViewer->show();
}
/*
void KStars::slotJMoonTool() {
if ( ! m_JMoonTool ) m_JMoonTool = new JMoonTool(this);
m_JMoonTool->show();
}
*/
void KStars::slotMoonPhaseTool() {
//FIXME Port to KF5
......
......@@ -56,7 +56,7 @@ PlanetMoonsComponent::PlanetMoonsComponent( SkyComposite *p,
*/
Q_ASSERT( planet == KSPlanetBase::JUPITER );
delete pmoons;
pmoons = new JupiterMoons();
// pmoons = new JupiterMoons();
int nmoons = pmoons->nMoons();
for ( int i=0; i<nmoons; ++i ) {
objectNames(SkyObject::MOON).append( pmoons->name(i) );
......
......@@ -228,10 +228,12 @@ void SkyMapComposite::updateSolarSystemBodies(KSNumbers *num )
m_SolarSystem->updateSolarSystemBodies( num );
}
/*
void SkyMapComposite::updateMoons(KSNumbers *num )
{
m_SolarSystem->updateMoons( num );
}
*/
//Reimplement draw function so that we have control over the order of
//elements, and we can add object labels
......@@ -742,6 +744,7 @@ QList<SkyObject*> SkyMapComposite::planets()
}
//Store it permanently
/*
QList<SkyObject*> SkyMapComposite::moons()
{
QList<SkyObject*> skyObjects;
......@@ -753,6 +756,7 @@ QList<SkyObject*> SkyMapComposite::moons()
}
return skyObjects;
}
*/
const QList<SkyObject*> *SkyMapComposite::getSkyObjectsList(SkyObject::TYPE t) {
switch(t) {
......
......@@ -111,7 +111,7 @@ public:
*@sa updatePlanets()
*@sa SolarSystemComposite::updateMoons()
*/
virtual void updateMoons( KSNumbers *num );
// virtual void updateMoons( KSNumbers *num );
/**
*@short Delegate draw requests to all sub components
......@@ -213,7 +213,7 @@ public:
const QList<SkyObject*>& comets() const;
const QList<SkyObject*>& supernovae() const;
QList<SkyObject*> planets();
QList<SkyObject*> moons();
// QList<SkyObject*> moons();
const QList<SkyObject*> *getSkyObjectsList(SkyObject::TYPE t);
......
......@@ -56,8 +56,10 @@ SolarSystemComposite::SolarSystemComposite(SkyComposite *parent ) :
addComponent( mars, 4 );
SolarSystemSingleComponent *jup = new SolarSystemSingleComponent( this, new KSPlanet( KSPlanetBase::JUPITER ), Options::showJupiter );
addComponent( jup, 4 );
/*
m_JupiterMoons = new PlanetMoonsComponent( this, jup, KSPlanetBase::JUPITER);
addComponent( m_JupiterMoons, 5 );
*/
SolarSystemSingleComponent *sat = new SolarSystemSingleComponent( this, new KSPlanet( KSPlanetBase::SATURN ), Options::showSaturn );
addComponent( sat, 4 );
SolarSystemSingleComponent *uranus = new SolarSystemSingleComponent( this, new KSPlanet( KSPlanetBase::URANUS ), Options::showUranus );
......@@ -118,10 +120,10 @@ void SolarSystemComposite::update( KSNumbers *num )
{
// if ( ! selected() ) return;
KStarsData *data = KStarsData::Instance();
KStarsData *data = KStarsData::Instance();
m_Sun->EquatorialToHorizontal( data->lst(), data->geo()->lat() );
m_Moon->EquatorialToHorizontal( data->lst(), data->geo()->lat() );
m_JupiterMoons->update( num );
// m_JupiterMoons->update( num );
foreach ( SkyComponent *comp, components() ) {
comp->update( num );
......@@ -143,7 +145,7 @@ void SolarSystemComposite::updateMoons( KSNumbers *num )
m_Sun->findPosition( num );
m_Moon->findPosition( num, data->geo()->lat(), data->lst() );
m_Moon->findPhase(0);
m_JupiterMoons->updateMoons( num );
// m_JupiterMoons->updateMoons( num );
}
void SolarSystemComposite::drawTrails( SkyPainter* skyp )
......@@ -184,7 +186,9 @@ const QList<SolarSystemSingleComponent *>& SolarSystemComposite::planets() const
return m_planets;
}
/*
QList<PlanetMoonsComponent *> SolarSystemComposite::planetMoonsComponent() const
{
return QList <PlanetMoonsComponent *>({m_JupiterMoons});
}
*/
......@@ -24,7 +24,7 @@
class KSPlanet;
class KSSun;
class KSMoon;
class JupiterMoonsComponent;
//class JupiterMoonsComponent;
class AsteroidsComponent;
class CometsComponent;
class SkyLabeler;
......@@ -71,7 +71,7 @@ private:
KSPlanet *m_Earth;
KSSun *m_Sun;
KSMoon *m_Moon;
PlanetMoonsComponent *m_JupiterMoons;
// PlanetMoonsComponent *m_JupiterMoons;
AsteroidsComponent *m_AsteroidsComponent;
CometsComponent *m_CometsComponent;
QList<SolarSystemSingleComponent *> m_planets;
......
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