[Kstars-devel] [kstars] kstars: Removing Pluto as special case minor planet since it is covered by asteroid component. The reason size was not calculated is that its diameter is not available in the JPL data
Jasem Mutlaq
mutlaqja at ikarustech.com
Fri Feb 13 00:17:07 UTC 2015
Git commit 3df7564565c7728c5c75fe00115bc7ba4377d70c by Jasem Mutlaq.
Committed on 13/02/2015 at 00:11.
Pushed by mutlaqja into branch 'master'.
Removing Pluto as special case minor planet since it is covered by asteroid component. The reason size was not calculated is that its diameter is not available in the JPL data
KStars uses to construct asteroid objects. I hard-coded the diameter now and emailed JPG to fix the issue. Removed most instances where there is a specific selection for pluto since
it should not be treated as such now. Would like to know your input and testing on this as some users might want Pluto to stay as a primary object still. If there is no major objections
then we can go ahead and clean the code for all these direct reference to Pluto include kspluto.h,cpp files. The only exception is in a few places where we need to identify Pluto among
others as a "Minor Planet"
CCMAIL:kstars-devel at kde.org
M +1 -1 kstars/CMakeLists.txt
M +1 -1 kstars/kstars.kcfg
M +2 -2 kstars/kstarsdata.cpp
M +1 -1 kstars/kstarsdbus.cpp
M +1 -1 kstars/options/opssolarsystem.cpp
M +6 -24 kstars/options/opssolarsystem.ui
M +8 -1 kstars/skycomponents/asteroidscomponent.cpp
M +1 -1 kstars/skycomponents/skymapcomposite.cpp
M +2 -2 kstars/skycomponents/solarsystemcomposite.cpp
M +1 -1 kstars/skymapdrawabstract.cpp
M +2 -2 kstars/skymapevents.cpp
M +2 -2 kstars/skyobjects/ksplanetbase.cpp
M +2 -1 kstars/skyobjects/ksplanetbase.h
M +1 -1 kstars/tools/conjunctions.cpp
M +9 -8 kstars/tools/modcalcplanets.cpp
M +190 -44 kstars/tools/modcalcplanets.ui
M +2 -2 kstars/tools/planetviewer.cpp
M +2 -2 kstars/tools/pvplotwidget.cpp
M +4 -4 kstars/tools/scriptbuilder.cpp
M +2 -2 kstars/tools/skycalendar.cpp
M +50 -74 kstars/tools/skycalendar.ui
http://commits.kde.org/kstars/3df7564565c7728c5c75fe00115bc7ba4377d70c
diff --git a/kstars/CMakeLists.txt b/kstars/CMakeLists.txt
index 369e5b9..bef8ca4 100644
--- a/kstars/CMakeLists.txt
+++ b/kstars/CMakeLists.txt
@@ -326,7 +326,7 @@ set(kstars_skyobjects_SRCS
skyobjects/ksmoon.cpp
skyobjects/ksplanetbase.cpp
skyobjects/ksplanet.cpp
- skyobjects/kspluto.cpp
+ #skyobjects/kspluto.cpp
skyobjects/kssun.cpp
skyobjects/skyline.cpp
skyobjects/skyobject.cpp
diff --git a/kstars/kstars.kcfg b/kstars/kstars.kcfg
index 97fd308..316479c 100644
--- a/kstars/kstars.kcfg
+++ b/kstars/kstars.kcfg
@@ -676,7 +676,7 @@
<entry name="MagLimitAsteroid" type="Double">
<label>Faint limit for asteroids</label>
<whatsthis>The faint magnitude limit for drawing asteroids.</whatsthis>
- <default>10.0</default>
+ <default>15.0</default>
</entry>
<entry name="AsteroidLabelDensity" type="Double">
<label>Label density for asteroid names</label>
diff --git a/kstars/kstarsdata.cpp b/kstars/kstarsdata.cpp
index 16ebc3d..cfc8ddd 100644
--- a/kstars/kstarsdata.cpp
+++ b/kstars/kstarsdata.cpp
@@ -573,7 +573,7 @@ bool KStarsData::readURLData( const QString &urlfile, int type, bool deepOnly )
// Dirty hack to fix things up for planets
SkyObject *o;
if( name == "Mercury" || name == "Venus" || name == "Mars" || name == "Jupiter"
- || name == "Saturn" || name == "Uranus" || name == "Neptune" || name == "Pluto" )
+ || name == "Saturn" || name == "Uranus" || name == "Neptune" /* || name == "Pluto" */)
o = skyComposite()->findByName( i18n( name.toLocal8Bit().data() ) );
else
o = skyComposite()->findByName( name );
@@ -922,7 +922,7 @@ bool KStarsData::executeScript( const QString &scriptname, SkyMap *map ) {
if ( fn[1] == "ShowSaturn" && bOk ) { Options::setShowSaturn( bVal ); cmdCount++; }
if ( fn[1] == "ShowUranus" && bOk ) { Options::setShowUranus( bVal ); cmdCount++; }
if ( fn[1] == "ShowNeptune" && bOk ) { Options::setShowNeptune( bVal ); cmdCount++; }
- if ( fn[1] == "ShowPluto" && bOk ) { Options::setShowPluto( bVal ); cmdCount++; }
+ //if ( fn[1] == "ShowPluto" && bOk ) { Options::setShowPluto( bVal ); cmdCount++; }
if ( fn[1] == "ShowAsteroids" && bOk ) { Options::setShowAsteroids( bVal ); cmdCount++; }
if ( fn[1] == "ShowComets" && bOk ) { Options::setShowComets( bVal ); cmdCount++; }
if ( fn[1] == "ShowSolarSystem" && bOk ) { Options::setShowSolarSystem( bVal ); cmdCount++; }
diff --git a/kstars/kstarsdbus.cpp b/kstars/kstarsdbus.cpp
index 38adf3e..649667a 100644
--- a/kstars/kstarsdbus.cpp
+++ b/kstars/kstarsdbus.cpp
@@ -317,7 +317,7 @@ void KStars::changeViewOption( const QString &op, const QString &val ) {
if ( op == "ShowSaturn" && bOk ) Options::setShowSaturn( bVal );
if ( op == "ShowUranus" && bOk ) Options::setShowUranus( bVal );
if ( op == "ShowNeptune" && bOk ) Options::setShowNeptune( bVal );
- if ( op == "ShowPluto" && bOk ) Options::setShowPluto( bVal );
+ //if ( op == "ShowPluto" && bOk ) Options::setShowPluto( bVal );
if ( op == "ShowAsteroids" && bOk ) Options::setShowAsteroids( bVal );
if ( op == "ShowComets" && bOk ) Options::setShowComets( bVal );
if ( op == "ShowSolarSystem" && bOk ) Options::setShowSolarSystem( bVal );
diff --git a/kstars/options/opssolarsystem.cpp b/kstars/options/opssolarsystem.cpp
index e9f1abf..92121ab 100644
--- a/kstars/options/opssolarsystem.cpp
+++ b/kstars/options/opssolarsystem.cpp
@@ -79,5 +79,5 @@ void OpsSolarSystem::slotSelectPlanets() {
kcfg_ShowSaturn->setChecked( b );
kcfg_ShowUranus->setChecked( b );
kcfg_ShowNeptune->setChecked( b );
- kcfg_ShowPluto->setChecked( b );
+ //kcfg_ShowPluto->setChecked( b );
}
diff --git a/kstars/options/opssolarsystem.ui b/kstars/options/opssolarsystem.ui
index 5c028d6..943b5da 100644
--- a/kstars/options/opssolarsystem.ui
+++ b/kstars/options/opssolarsystem.ui
@@ -78,19 +78,6 @@
</property>
</widget>
</item>
- <item row="4" column="1">
- <widget class="QCheckBox" name="kcfg_ShowPluto">
- <property name="toolTip">
- <string>Draw Pluto?</string>
- </property>
- <property name="whatsThis">
- <string>If checked, Pluto will be drawn on the map.</string>
- </property>
- <property name="text">
- <string>Pluto</string>
- </property>
- </widget>
- </item>
<item row="0" column="2">
<widget class="QPushButton" name="showAllPlanets">
<property name="toolTip">
@@ -286,6 +273,12 @@
<property name="whatsThis">
<string>Set the faintest magnitude for drawing asteroids</string>
</property>
+ <property name="minimum">
+ <double>-10.000000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>50.000000000000000</double>
+ </property>
</widget>
</item>
<item>
@@ -542,16 +535,6 @@
</widget>
<customwidgets>
<customwidget>
- <class>QDoubleSpinBox</class>
- <extends>QWidget</extends>
- <header>QDoubleSpinBox</header>
- </customwidget>
- <customwidget>
- <class>QPushButton</class>
- <extends>QPushButton</extends>
- <header>kpushbutton.h</header>
- </customwidget>
- <customwidget>
<class>MagnitudeSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>widgets/magnitudespinbox.h</header>
@@ -572,7 +555,6 @@
<tabstop>kcfg_ShowNeptune</tabstop>
<tabstop>kcfg_ShowPlanetImages</tabstop>
<tabstop>kcfg_ShowMars</tabstop>
- <tabstop>kcfg_ShowPluto</tabstop>
<tabstop>kcfg_ShowAsteroids</tabstop>
<tabstop>kcfg_MagLimitAsteroid</tabstop>
<tabstop>kcfg_ShowAsteroidNames</tabstop>
diff --git a/kstars/skycomponents/asteroidscomponent.cpp b/kstars/skycomponents/asteroidscomponent.cpp
index 4099735..a1bfd14 100644
--- a/kstars/skycomponents/asteroidscomponent.cpp
+++ b/kstars/skycomponents/asteroidscomponent.cpp
@@ -155,6 +155,11 @@ void AsteroidsComponent::loadData() {
JD = static_cast<double>(mJD) + 2400000.5;
+ // JM: Hack since asteroid file (Generated by JPL) is missing important Pluto data
+ // I emailed JPL and this hack will be removed once they update the data!
+ if (name == "Pluto")
+ diameter = 2368;
+
KSAsteroid *new_asteroid = new KSAsteroid( catN, name, QString(), JD,
a, e,
dms(dble_i), dms(dble_w),
@@ -170,7 +175,9 @@ void AsteroidsComponent::loadData() {
new_asteroid->setPeriod(period);
new_asteroid->setEarthMOID(earth_moid);
new_asteroid->setOrbitClass(orbit_class);
- new_asteroid->setAngularSize(0.005);
+ new_asteroid->setPhysicalSize(diameter);
+ //new_asteroid->setAngularSize(0.005);
+
m_ObjectList.append(new_asteroid);
// Add name to the list of object names
diff --git a/kstars/skycomponents/skymapcomposite.cpp b/kstars/skycomponents/skymapcomposite.cpp
index a720961..066f6dc 100644
--- a/kstars/skycomponents/skymapcomposite.cpp
+++ b/kstars/skycomponents/skymapcomposite.cpp
@@ -462,7 +462,7 @@ KSPlanetBase* SkyMapComposite::planet( int n ) {
if ( n == KSPlanetBase::SATURN ) return (KSPlanetBase*)(m_SolarSystem->findByName( xi18n( "Saturn" ) ) );
if ( n == KSPlanetBase::URANUS ) return (KSPlanetBase*)(m_SolarSystem->findByName( xi18n( "Uranus" ) ) );
if ( n == KSPlanetBase::NEPTUNE ) return (KSPlanetBase*)(m_SolarSystem->findByName( xi18n( "Neptune" ) ) );
- if ( n == KSPlanetBase::PLUTO ) return (KSPlanetBase*)(m_SolarSystem->findByName( xi18n( "Pluto" ) ) );
+ //if ( n == KSPlanetBase::PLUTO ) return (KSPlanetBase*)(m_SolarSystem->findByName( xi18n( "Pluto" ) ) );
return 0;
}
diff --git a/kstars/skycomponents/solarsystemcomposite.cpp b/kstars/skycomponents/solarsystemcomposite.cpp
index e517a10..fb07ea3 100644
--- a/kstars/skycomponents/solarsystemcomposite.cpp
+++ b/kstars/skycomponents/solarsystemcomposite.cpp
@@ -31,7 +31,7 @@
#include "skyobjects/ksplanet.h"
#include "skyobjects/kssun.h"
#include "skyobjects/ksmoon.h"
-#include "skyobjects/kspluto.h"
+//#include "skyobjects/kspluto.h"
#include "planetmoonscomponent.h"
SolarSystemComposite::SolarSystemComposite(SkyComposite *parent ) :
@@ -55,7 +55,7 @@ SolarSystemComposite::SolarSystemComposite(SkyComposite *parent ) :
addComponent( sat );
addComponent( new SolarSystemSingleComponent( this, new KSPlanet( KSPlanetBase::URANUS ), Options::showUranus ) );
addComponent( new SolarSystemSingleComponent( this, new KSPlanet( KSPlanetBase::NEPTUNE ), Options::showNeptune ) );
- addComponent( new SolarSystemSingleComponent( this, new KSPluto(), Options::showPluto ) );
+ //addComponent( new SolarSystemSingleComponent( this, new KSPluto(), Options::showPluto ) );
addComponent( m_AsteroidsComponent = new AsteroidsComponent( this ));
addComponent( m_CometsComponent = new CometsComponent( this ));
diff --git a/kstars/skymapdrawabstract.cpp b/kstars/skymapdrawabstract.cpp
index b5ea8d0..000fa01 100644
--- a/kstars/skymapdrawabstract.cpp
+++ b/kstars/skymapdrawabstract.cpp
@@ -157,7 +157,7 @@ void SkyMapDrawAbstract::drawObjectLabels( QList<SkyObject*>& labelObjects ) {
if ( obj->name() == xi18n( "Saturn" ) && ! Options::showSaturn() ) continue;
if ( obj->name() == xi18n( "Uranus" ) && ! Options::showUranus() ) continue;
if ( obj->name() == xi18n( "Neptune" ) && ! Options::showNeptune() ) continue;
- if ( obj->name() == xi18n( "Pluto" ) && ! Options::showPluto() ) continue;
+ //if ( obj->name() == xi18n( "Pluto" ) && ! Options::showPluto() ) continue;
}
if ( (obj->type() >= SkyObject::OPEN_CLUSTER && obj->type() <= SkyObject::GALAXY) ||
(obj->type() >= SkyObject::ASTERISM && obj->type() <= SkyObject::QUASAR) ||
diff --git a/kstars/skymapevents.cpp b/kstars/skymapevents.cpp
index 4061d2b..00a24a4 100644
--- a/kstars/skymapevents.cpp
+++ b/kstars/skymapevents.cpp
@@ -210,11 +210,11 @@ void SkyMap::keyPressEvent( QKeyEvent *e )
slotCenter();
break;
- case Qt::Key_9: //center on Pluto
+ /*case Qt::Key_9: //center on Pluto
setClickedObject( data->skyComposite()->planet( KSPlanetBase::PLUTO ) );
setClickedPoint( clickedObject() );
slotCenter();
- break;
+ break;*/
case Qt::Key_BracketLeft: // Begin measuring angular distance
if( !rulerMode )
diff --git a/kstars/skyobjects/ksplanetbase.cpp b/kstars/skyobjects/ksplanetbase.cpp
index 50bea45..32c02a3 100644
--- a/kstars/skyobjects/ksplanetbase.cpp
+++ b/kstars/skyobjects/ksplanetbase.cpp
@@ -82,9 +82,9 @@ KSPlanetBase* KSPlanetBase::createPlanet( int n ) {
case KSPlanetBase::NEPTUNE:
return new KSPlanet( n );
break;
- case KSPlanetBase::PLUTO:
+ /*case KSPlanetBase::PLUTO:
return new KSPluto();
- break;
+ break;*/
case KSPlanetBase::SUN:
return new KSSun();
break;
diff --git a/kstars/skyobjects/ksplanetbase.h b/kstars/skyobjects/ksplanetbase.h
index cb1dd28..488cb03 100644
--- a/kstars/skyobjects/ksplanetbase.h
+++ b/kstars/skyobjects/ksplanetbase.h
@@ -77,7 +77,8 @@ public:
void init(const QString &s, const QString &image_file, const QColor &c, double pSize );
- enum Planets { MERCURY=0, VENUS=1, MARS=2, JUPITER=3, SATURN=4, URANUS=5, NEPTUNE=6, PLUTO=7, SUN=8, MOON=9, UNKNOWN_PLANET };
+ //enum Planets { MERCURY=0, VENUS=1, MARS=2, JUPITER=3, SATURN=4, URANUS=5, NEPTUNE=6, PLUTO=7, SUN=8, MOON=9, UNKNOWN_PLANET };
+ enum Planets { MERCURY=0, VENUS=1, MARS=2, JUPITER=3, SATURN=4, URANUS=5, NEPTUNE=6, SUN=7, MOON=8, UNKNOWN_PLANET };
static KSPlanetBase* createPlanet( int n );
diff --git a/kstars/tools/conjunctions.cpp b/kstars/tools/conjunctions.cpp
index e6cc00e..cd0189b 100644
--- a/kstars/tools/conjunctions.cpp
+++ b/kstars/tools/conjunctions.cpp
@@ -92,7 +92,7 @@ ConjunctionsTool::ConjunctionsTool(QWidget *parentSplit)
pNames[KSPlanetBase::SATURN] = xi18n("Saturn");
pNames[KSPlanetBase::URANUS] = xi18n("Uranus");
pNames[KSPlanetBase::NEPTUNE] = xi18n("Neptune");
- pNames[KSPlanetBase::PLUTO] = xi18n("Pluto");
+ //pNames[KSPlanetBase::PLUTO] = xi18n("Pluto");
pNames[KSPlanetBase::SUN] = xi18n("Sun");
pNames[KSPlanetBase::MOON] = xi18n("Moon");
diff --git a/kstars/tools/modcalcplanets.cpp b/kstars/tools/modcalcplanets.cpp
index bb610ca..ffb5276 100644
--- a/kstars/tools/modcalcplanets.cpp
+++ b/kstars/tools/modcalcplanets.cpp
@@ -30,7 +30,7 @@
#include "skyobjects/kssun.h"
#include "skyobjects/ksplanet.h"
#include "skyobjects/ksmoon.h"
-#include "skyobjects/kspluto.h"
+//#include "skyobjects/kspluto.h"
#include "widgets/dmsbox.h"
modCalcPlanets::modCalcPlanets(QWidget *parentSplit) :
@@ -116,11 +116,11 @@ void modCalcPlanets::slotComputePosition (void)
p = new KSPlanet(KSPlanetBase::URANUS); break;
case 7:
p = new KSPlanet(KSPlanetBase::NEPTUNE); break;
+ /*case 8:
+ p = new KSPluto(); break;*/
case 8:
- p = new KSPluto(); break;
- case 9:
p = new KSMoon(); break;
- case 10:
+ case 9:
p = new KSSun();
p->setRsun(0.0);
break;
@@ -263,11 +263,11 @@ void modCalcPlanets::processLines( QTextStream &istream )
QString pn;
QStringList pNames, pNamesi18n;
pNames << "Mercury" << "Venus" << "Earth" << "Mars" << "Jupiter"
- << "Saturn" << "Uranus" << "Neptune" << "Pluto"
+ << "Saturn" << "Uranus" << "Neptune" /* << "Pluto" */
<< "Sun" << "Moon";
pNamesi18n << xi18n("Mercury") << xi18n("Venus") << xi18n("Earth")
<< xi18n("Mars") << xi18n("Jupiter") << xi18n("Saturn")
- << xi18n("Uranus") << xi18n("Neptune") << xi18n("Pluto")
+ << xi18n("Uranus") << xi18n("Neptune") /* << xi18n("Pluto") */
<< xi18n("Sun") << xi18n("Moon");
///Parse the input file
@@ -375,9 +375,10 @@ void modCalcPlanets::processLines( QTextStream &istream )
// FIXME: allocate new object for every iteration is probably not wisest idea.
KSPlanetBase *kspb = 0 ;
- if ( pn == "Pluto" ) {
+ /*if ( pn == "Pluto" ) {
kspb = new KSPluto();
- } else if ( pn == "Sun" ) {
+ } else*/
+ if ( pn == "Sun" ) {
kspb = new KSSun();
} else if ( pn == "Moon" ) {
kspb = new KSMoon();
diff --git a/kstars/tools/modcalcplanets.ui b/kstars/tools/modcalcplanets.ui
index cc4f4a3..54c1b5b 100644
--- a/kstars/tools/modcalcplanets.ui
+++ b/kstars/tools/modcalcplanets.ui
@@ -14,7 +14,16 @@
<property name="spacing">
<number>6</number>
</property>
- <property name="margin">
+ <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>
@@ -30,7 +39,16 @@
<property name="spacing">
<number>6</number>
</property>
- <property name="margin">
+ <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>
@@ -42,12 +60,30 @@
<property name="spacing">
<number>6</number>
</property>
- <property name="margin">
+ <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>
<layout class="QGridLayout">
- <property name="margin">
+ <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>
<property name="spacing">
@@ -146,11 +182,6 @@
</item>
<item>
<property name="text">
- <string>Pluto</string>
- </property>
- </item>
- <item>
- <property name="text">
<string>Moon</string>
</property>
</item>
@@ -174,7 +205,16 @@
<property name="spacing">
<number>6</number>
</property>
- <property name="margin">
+ <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>
@@ -183,7 +223,16 @@
<string>Equatorial Coordinates</string>
</property>
<layout class="QGridLayout">
- <property name="margin">
+ <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">
@@ -226,7 +275,16 @@
<string>Horizontal Coordinates</string>
</property>
<layout class="QGridLayout">
- <property name="margin">
+ <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">
@@ -270,7 +328,16 @@
<property name="spacing">
<number>6</number>
</property>
- <property name="margin">
+ <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>
@@ -279,7 +346,16 @@
<string>Heliocentric Ecliptic Coordinates</string>
</property>
<layout class="QGridLayout">
- <property name="margin">
+ <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">
@@ -336,7 +412,16 @@
<string>Geocentric Ecliptic Coordinates</string>
</property>
<layout class="QGridLayout">
- <property name="margin">
+ <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">
@@ -412,7 +497,16 @@
<property name="spacing">
<number>6</number>
</property>
- <property name="margin">
+ <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>
@@ -424,7 +518,16 @@
<property name="spacing">
<number>6</number>
</property>
- <property name="margin">
+ <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>
@@ -432,7 +535,16 @@
<property name="spacing">
<number>6</number>
</property>
- <property name="margin">
+ <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>
@@ -524,12 +636,30 @@
<property name="spacing">
<number>6</number>
</property>
- <property name="margin">
+ <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>
<layout class="QGridLayout">
- <property name="margin">
+ <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>
<property name="spacing">
@@ -578,7 +708,16 @@
</item>
<item>
<layout class="QGridLayout">
- <property name="margin">
+ <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>
<property name="spacing">
@@ -623,7 +762,16 @@
<string>Select Coordinate System for Output File</string>
</property>
<layout class="QGridLayout">
- <property name="margin">
+ <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">
@@ -681,7 +829,16 @@
<property name="spacing">
<number>6</number>
</property>
- <property name="margin">
+ <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>
@@ -710,7 +867,16 @@
<string>Select Filenames</string>
</property>
<layout class="QGridLayout">
- <property name="margin">
+ <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">
@@ -806,26 +972,6 @@
<class>KUrlRequester</class>
<extends>QFrame</extends>
<header>kurlrequester.h</header>
- </customwidget>
- <customwidget>
- <class>QPushButton</class>
- <extends>QPushButton</extends>
- <header>kpushbutton.h</header>
- </customwidget>
- <customwidget>
- <class>QLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- <customwidget>
- <class>QComboBox</class>
- <extends>QComboBox</extends>
- <header>QComboBox.h</header>
- </customwidget>
- <customwidget>
- <class>QTabWidget</class>
- <extends>QTabWidget</extends>
- <header>ktabwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
diff --git a/kstars/tools/planetviewer.cpp b/kstars/tools/planetviewer.cpp
index 8a5dacc..bce9f4d 100644
--- a/kstars/tools/planetviewer.cpp
+++ b/kstars/tools/planetviewer.cpp
@@ -88,12 +88,12 @@ PlanetViewer::PlanetViewer(QWidget *parent)
PlanetList.append( KSPlanetBase::createPlanet( KSPlanetBase::SATURN ) );
PlanetList.append( KSPlanetBase::createPlanet( KSPlanetBase::URANUS ) );
PlanetList.append( KSPlanetBase::createPlanet( KSPlanetBase::NEPTUNE ) );
- PlanetList.append( KSPlanetBase::createPlanet( KSPlanetBase::PLUTO ) );
+ //PlanetList.append( KSPlanetBase::createPlanet( KSPlanetBase::PLUTO ) );
ut = data->ut();
KSNumbers num( ut.djd() );
- for ( uint i=0; i<9; ++i ) {
+ for ( uint i=0; i< KSPlanetBase::UNKNOWN_PLANET; ++i ) {
PlanetList[i]->findPosition( &num, 0, 0 ); //NULL args: don't need geocent. coords.
LastUpdate[i] = int( ut.date().toJulianDay() );
}
diff --git a/kstars/tools/pvplotwidget.cpp b/kstars/tools/pvplotwidget.cpp
index 9b4d8fe..7f636fb 100644
--- a/kstars/tools/pvplotwidget.cpp
+++ b/kstars/tools/pvplotwidget.cpp
@@ -173,14 +173,14 @@ void PVPlotWidget::keyPressEvent( QKeyEvent *e ) {
break;
}
- case Qt::Key_9: //Pluto
+ /*case Qt::Key_9: //Pluto
{
KPlotPoint *p = plotObjects().at(18)->points().at(0);
setLimits( p->x() - dx, p->x() + dx, p->y() - dy, p->y() + dy );
pv->setCenterPlanet( "Pluto" );
update();
break;
- }
+ }*/
default:
e->ignore();
diff --git a/kstars/tools/scriptbuilder.cpp b/kstars/tools/scriptbuilder.cpp
index 2b54248..6084afc 100644
--- a/kstars/tools/scriptbuilder.cpp
+++ b/kstars/tools/scriptbuilder.cpp
@@ -441,9 +441,9 @@ void ScriptBuilder::initViewOptions() {
fields.clear();
fields << "ShowNeptune" << xi18n( "Toggle display of Neptune" ) << xi18n( "bool" );
new QTreeWidgetItem( opsShowObj, fields );
- fields.clear();
- fields << "ShowPluto" << xi18n( "Toggle display of Pluto" ) << xi18n( "bool" );
- new QTreeWidgetItem( opsShowObj, fields );
+ //fields.clear();
+ //fields << "ShowPluto" << xi18n( "Toggle display of Pluto" ) << xi18n( "bool" );
+ //new QTreeWidgetItem( opsShowObj, fields );
fields.clear();
fields << "ShowAsteroids" << xi18n( "Toggle display of Asteroids" ) << xi18n( "bool" );
new QTreeWidgetItem( opsShowObj, fields );
@@ -468,7 +468,7 @@ void ScriptBuilder::initViewOptions() {
argChangeViewOption->OptionName->addItem( "ShowSaturn" );
argChangeViewOption->OptionName->addItem( "ShowUranus" );
argChangeViewOption->OptionName->addItem( "ShowNeptune" );
- argChangeViewOption->OptionName->addItem( "ShowPluto" );
+ //argChangeViewOption->OptionName->addItem( "ShowPluto" );
argChangeViewOption->OptionName->addItem( "ShowAsteroids" );
argChangeViewOption->OptionName->addItem( "ShowComets" );
diff --git a/kstars/tools/skycalendar.cpp b/kstars/tools/skycalendar.cpp
index 0eed5c7..1975a1f 100644
--- a/kstars/tools/skycalendar.cpp
+++ b/kstars/tools/skycalendar.cpp
@@ -105,8 +105,8 @@ void SkyCalendar::slotFillCalendar() {
addPlanetEvents( KSPlanetBase::URANUS );
if ( scUI->checkBox_Neptune->isChecked() )
addPlanetEvents( KSPlanetBase::NEPTUNE );
- if ( scUI->checkBox_Pluto->isChecked() )
- addPlanetEvents( KSPlanetBase::PLUTO );
+ //if ( scUI->checkBox_Pluto->isChecked() )
+ //addPlanetEvents( KSPlanetBase::PLUTO );
scUI->CalendarView->update();
}
diff --git a/kstars/tools/skycalendar.ui b/kstars/tools/skycalendar.ui
index c4f2b9b..4251d43 100644
--- a/kstars/tools/skycalendar.ui
+++ b/kstars/tools/skycalendar.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>1118</width>
- <height>793</height>
+ <width>972</width>
+ <height>725</height>
</rect>
</property>
<property name="sizePolicy">
@@ -21,84 +21,61 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Planets</string>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <widget class="QCheckBox" name="checkBox_Mercury">
- <property name="text">
- <string>Mercury</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="checkBox_Saturn">
- <property name="text">
- <string>Saturn</string>
- </property>
- </widget>
- </item>
- </layout>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="checkBox_Mercury">
+ <property name="text">
+ <string>Mercury</string>
+ </property>
+ </widget>
</item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <widget class="QCheckBox" name="checkBox_Venus">
- <property name="text">
- <string>Venus</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="checkBox_Neptune">
- <property name="text">
- <string>Neptune</string>
- </property>
- </widget>
- </item>
- </layout>
+ <item row="0" column="1">
+ <widget class="QCheckBox" name="checkBox_Venus">
+ <property name="text">
+ <string>Venus</string>
+ </property>
+ </widget>
</item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
- <widget class="QCheckBox" name="checkBox_Mars">
- <property name="text">
- <string>Mars</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="checkBox_Uranus">
- <property name="text">
- <string>Uranus</string>
- </property>
- </widget>
- </item>
- </layout>
+ <item row="0" column="2">
+ <widget class="QCheckBox" name="checkBox_Mars">
+ <property name="text">
+ <string>Mars</string>
+ </property>
+ </widget>
</item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_5">
- <item>
- <widget class="QCheckBox" name="checkBox_Jupiter">
- <property name="text">
- <string>Jupiter</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="checkBox_Pluto">
- <property name="text">
- <string>Pluto</string>
- </property>
- </widget>
- </item>
- </layout>
+ <item row="0" column="3">
+ <widget class="QCheckBox" name="checkBox_Jupiter">
+ <property name="text">
+ <string>Jupiter</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="checkBox_Saturn">
+ <property name="text">
+ <string>Saturn</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QCheckBox" name="checkBox_Neptune">
+ <property name="text">
+ <string>Neptune</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QCheckBox" name="checkBox_Uranus">
+ <property name="text">
+ <string>Uranus</string>
+ </property>
+ </widget>
</item>
</layout>
</widget>
@@ -180,7 +157,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
@@ -335,7 +312,6 @@
<tabstop>checkBox_Saturn</tabstop>
<tabstop>checkBox_Neptune</tabstop>
<tabstop>checkBox_Uranus</tabstop>
- <tabstop>checkBox_Pluto</tabstop>
<tabstop>checkBox_GridMonths</tabstop>
<tabstop>checkBox_GridWeeks</tabstop>
<tabstop>checkBox_GridVertical</tabstop>
More information about the Kstars-devel
mailing list