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

[Jason Harris]

SVN commit 799041 by harris:

First commit of the UI portion of Akarsh's Conjunctions predictor.  Congratulations, 
Akarsh!  Thanks for this great contribution.

For now, the tool is implemented as a calculator module (and maybe it makes sense to 
keep it there).

TODO:
+ Allow the user to set the maximum angular separation for considering a conjunction
+ (Bug) Remove "Earth" from the list of solar system bodies
+ Friendlier string formatting of Date/Time in results
+ Allow for selection of comets and asteroids
+ (my wishlist item) Allow second body to be any SkyObject, not just solar system 
bodies.

CCMAIL: kstars-devel at kde.org



 M  +2 -0      CMakeLists.txt  
 M  +6 -0      tools/astrocalc.cpp  
 M  +2 -0      tools/astrocalc.h  
 A             tools/conjunctions.cpp   [License: GPL (v2+)]
 A             tools/conjunctions.h   [License: GPL (v2+)]
 A             tools/conjunctions.ui  


--- trunk/KDE/kdeedu/kstars/kstars/CMakeLists.txt #799040:799041
@@ -43,6 +43,7 @@
 	tools/altvstime.cpp
 	tools/astrocalc.cpp
 	tools/avtplotwidget.cpp
+	tools/conjunctions.cpp
 	tools/eqplotwidget.cpp
 	tools/jmoontool.cpp
 	tools/ksconjunct.cpp
@@ -105,6 +106,7 @@
 	tools/argwaitfor.ui
 	tools/argwaitforkey.ui
 	tools/argzoom.ui
+	tools/conjunctions.ui
 	tools/lcgenerator.ui
 	tools/modcalcangdist.ui
 	tools/modcalcapcoord.ui
--- trunk/KDE/kdeedu/kstars/kstars/tools/astrocalc.cpp #799040:799041
@@ -36,6 +36,7 @@
 #include "modcalcangdist.h"
 #include "modcalcvizequinox.h"
 #include "modcalcvlsr.h"
+#include "conjunctions.h"
 
 AstroCalc::AstroCalc( QWidget* parent ) :
         KDialog( parent ), JDFrame(0), GeodCoordFrame(0),
@@ -83,6 +84,7 @@
     QTreeWidgetItem * solarItem = new QTreeWidgetItem(navigationPanel,QStringList(i18n("Solar System")) );
     solarItem->setIcon(0,solarIcon);
     new QTreeWidgetItem(solarItem,QStringList(i18n("Planets Coordinates")) );
+    new QTreeWidgetItem(solarItem,QStringList(i18n("Conjunctions")) );
 
     //FIXME: Would be better to make the navigationPanel fit its contents,
     //but I wasn't able to make it work
@@ -137,6 +139,8 @@
     acStack->addWidget( AngDistFrame );
     VlsrFrame = new modCalcVlsr( acStack );
     acStack->addWidget( VlsrFrame );
+    ConjunctFrame = new ConjunctionsTool( acStack );
+    acStack->addWidget( ConjunctFrame );
 
     acStack->setCurrentWidget( splashScreen );
 
@@ -188,6 +192,8 @@
         acStack->setCurrentWidget( EquinoxFrame );
     if(!(s.compare(i18n("Planets Coordinates"))))
         acStack->setCurrentWidget( PlanetsFrame );
+    if(!(s.compare(i18n("Conjunctions"))))
+        acStack->setCurrentWidget( ConjunctFrame );
     if(!(s.compare(i18n("Angular Distance"))))
         acStack->setCurrentWidget( AngDistFrame );
     if(!(s.compare(i18n("LSR Velocity"))))
--- trunk/KDE/kdeedu/kstars/kstars/tools/astrocalc.h #799040:799041
@@ -39,6 +39,7 @@
 class modCalcEclCoords;
 class modCalcAngDist;
 class modCalcVlsr;
+class ConjunctionsTool;
 
 /** Astrocalc is the base class for the KStars astronomical calculator
  * @author: Pablo de Vicente
@@ -101,6 +102,7 @@
     modCalcEclCoords *EclFrame;
     modCalcAngDist *AngDistFrame;
     modCalcVlsr *VlsrFrame;
+    ConjunctionsTool *ConjunctFrame;
 };
 
 #endif