[Kstars-devel] Conjunctions tool backends, a few bugfixes
Akarsh Simha
akarshsimha at gmail.com
Fri Apr 18 08:22:43 CEST 2008
Hi Jason
> Your patch contains the ksconjunct sources, along with a file named
> 20080417_docfix_dms. However, this file seems to be a gzipped
> tarfile, which itself also contains the ksconjunct sources.
I'm sorry, I noticed just now. Must be an incorrect tar command.
> Can you send the docfixes again?
Please find the patch attached.
Regards
Akarsh.
-------------- next part --------------
Index: kstars/tools/scriptbuilder.cpp
===================================================================
--- kstars/tools/scriptbuilder.cpp (revision 798188)
+++ kstars/tools/scriptbuilder.cpp (working copy)
@@ -207,7 +207,7 @@
setINDITargetNameFunc->setINDIProperty("EQUATORIAL_EOD_COORD");
INDIFunctionList.append( setINDITargetNameFunc);
- setINDIGeoLocationFunc = new ScriptFunction ( "setINDIGeoLocation", i18n("Set the telescope longitude and latitude. The longitude is E of N."), false, "double", "long", "double", "lat");
+ setINDIGeoLocationFunc = new ScriptFunction ( "setINDIGeoLocation", i18n("Set the telescope longitude and latitude. The longitude is measured East of the Greenwich meridian."), false, "double", "long", "double", "lat");
setINDIGeoLocationFunc->setINDIProperty("GEOGRAPHIC_COORD");
INDIFunctionList.append( setINDIGeoLocationFunc);
Index: kstars/dms.h
===================================================================
--- kstars/dms.h (revision 798188)
+++ kstars/dms.h (working copy)
@@ -230,19 +230,18 @@
*/
bool setFromString( const QString &s, bool isDeg=true );
- //TODO: Either implement these operators, or delete the commented declarations
/**
*Addition operator. Add two dms objects.
*@param d add to current angle
*@return sum of two angles, in a dms object
*/
- // dms operator+ ( dms d );
+ dms operator+ ( dms d );
/**
*Subtraction operator. Subtract two dms objects.
*@param d subtract from current angle
*@return difference of two angles, in a dms object
*/
- // dms operator- ( dms d );
+ dms operator- ( dms d );
/**
*Assignment operator. Assign value of argument to current angle.
*I wanted to pass the argument by reference, but I couldn't figure
@@ -256,7 +255,7 @@
*@param d floating-point number to get angle value from
*@return dms object, same value as argument.
*/
- // dms operator= ( const double &d ) { return (dms( d )); }
+ dms operator= ( const double &d ) { return (dms( d )); }
/**@short Compute Sine and Cosine of the angle simultaneously.
*On machines using glibc >= 2.1, calling SinCos() is somewhat faster
Index: kstars/dms.cpp
===================================================================
--- kstars/dms.cpp (revision 798188)
+++ kstars/dms.cpp (working copy)
@@ -313,3 +313,18 @@
// M_PI is defined in math.h
const double dms::PI = M_PI;
const double dms::DegToRad = PI/180.0;
+
+
+// Operators
+
+dms dms::operator+ (dms d) {
+ dms c;
+ c.setRadians(this -> radians() + d.radians());
+ return c;
+}
+
+dms dms::operator- (dms d) {
+ dms c;
+ c.setRadians(this -> radians() - d.radians());
+ return c;
+}
Index: kstars/skycomponents/README.indexing
===================================================================
--- kstars/skycomponents/README.indexing (revision 798188)
+++ kstars/skycomponents/README.indexing (working copy)
@@ -87,7 +87,7 @@
instead of:
- HTMesh->index( p->ra()-Degrees(), p->dec()->Degrees() );
+ HTMesh->index( p->ra()->Degrees(), p->dec()->Degrees() );
SkyMesh also has some real code in it that is used to find all of the
trixels that cover a polygon with an arbitrary number of vertices and
@@ -275,7 +275,7 @@
Data Container Classes
----------------------
- + ListList
+ + LineList
- SkipList
+ PolyList
@@ -346,7 +346,7 @@
don't have to do if you use preDraw().
The other two virtual callback methods are overridden by the
-"abstract" SkipListIndex subclass. The method getIndexHash() and is
+"abstract" SkipListIndex subclass. The method getIndexHash() is
used to modify the line indexing routine. getIndexHash() is
overridden by SkipListIndex so line segments that should be skipped
from drawing are also skipped from the indexing.
Index: kstars/skycomponents/linelistindex.h
===================================================================
--- kstars/skycomponents/linelistindex.h (revision 798188)
+++ kstars/skycomponents/linelistindex.h (working copy)
@@ -58,7 +58,7 @@
SkyMesh* skyMesh() { return m_skyMesh; }
/* @short Returns the Hash of QLists of LineLists that
- * is used for doing the indexing line segments.
+ * is used for doing the indexing of line segments.
*/
LineListHash* lineIndex() { return m_lineIndex; }
Index: kstars/ksnumbers.h
===================================================================
--- kstars/ksnumbers.h (revision 798188)
+++ kstars/ksnumbers.h (working copy)
@@ -42,8 +42,13 @@
class KSNumbers {
public:
- /**Constructor. */
+
+ /**
+ * Constructor.
+ *@param jd Julian Day for which the new instance is initialized
+ */
KSNumbers( long double jd );
+
/**Destructor (empty). */
~KSNumbers();
Index: kstars/data/Cities.dat
===================================================================
--- kstars/data/Cities.dat (revision 798188)
+++ kstars/data/Cities.dat (working copy)
@@ -350,7 +350,7 @@
Bolgatanga : : Ghana : 10 : 47 : 8 : N : 0 : 51 : 5 : W : 0.0 : --
Bologna : : Italy : 44 : 32 : 16 : N : 11 : 17 : 23 : E : 1.0 : EU
Bolzano : : Italy : 46 : 29 : 49 : N : 11 : 21 : 16 : E : 1.0 : EU
-Bombay : : India : 18 : 58 : 0 : N : 72 : 49 : 59 : E : 5.5 : --
+Mumbai : : India : 18 : 58 : 0 : N : 72 : 49 : 59 : E : 5.5 : --
Bonavista : Newfoundland : Canada : 48 : 39 : 00 : N : 53 : 07 : 00 : W : -3.5 : US
Bonn : : Germany : 50 : 43 : 11 : N : 7 : 4 : 48 : E : 1.0 : EU
Bonnyville : Alberta : Canada : 54 : 16 : 00 : N : 110 : 44 : 00 : W : -7.0 : US
@@ -464,7 +464,7 @@
Cairo : : Egypt : 30 : 0 : 0 : N : 31 : 16 : 59 : E : 2.0 : EG
Calais/Dunkirk : Pas-de-Calais : France : 50 : 57 : 36 : N : 1 : 57 : 0 : E : 1.0 : EU
Calar Alto : : Spain : 37 : 13 : 8 : N : 2 : 32 : 15 : W : 1.0 : EU
-Calcutta : : India : 22 : 31 : 59 : N : 88 : 22 : 0 : E : 5.5 : --
+Kolkata : : India : 22 : 31 : 59 : N : 88 : 22 : 0 : E : 5.5 : --
Caldwell : Idaho : USA : 43 : 39 : 53 : N : 116 : 41 : 13 : W : -7.0 : US
Caledonia : Nova Scotia : Canada : 44 : 22 : 00 : N : 65 : 02 : 00 : W : -4.0 : US
Calgary : Alberta : Canada : 51 : 2 : 59 : N : 114 : 4 : 58 : W : -7.0 : US
@@ -1749,7 +1749,7 @@
Madison : Alabama : USA : 34 : 41 : 30 : N : 86 : 45 : 41 : W : -6.0 : US
Madison : South Dakota : USA : 44 : 0 : 24 : N : 97 : 6 : 47 : W : -6.0 : US
Madison : Wisconsin : USA : 43 : 4 : 22 : N : 89 : 22 : 54 : W : -6.0 : US
-Madras : : India : 13 : 0 : 0 : N : 80 : 10 : 58 : E : 5.5 : --
+Chennai : : India : 13 : 0 : 0 : N : 80 : 10 : 58 : E : 5.5 : --
Madrid : : Spain : 40 : 24 : 31 : N : 03 : 41 : 11 : W : 1.0 : EU
Magadan : Far East : Russia : 59 : 34 : 0 : N : 150 : 48 : 0 : E : 11.0 : RU
Magdalena : New Mexico : USA : 34 : 10 : 1 : N : 107 : 45 : 0 : W : -7.0 : US
Index: kstars/CMakeLists.txt
===================================================================
--- kstars/CMakeLists.txt (revision 798188)
+++ kstars/CMakeLists.txt (working copy)
@@ -45,6 +45,7 @@
tools/avtplotwidget.cpp
tools/eqplotwidget.cpp
tools/jmoontool.cpp
+ tools/ksconjunct.cpp
tools/lcgenerator.cpp
tools/modcalcangdist.cpp
tools/modcalcapcoord.cpp
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://mail.kde.org/pipermail/kstars-devel/attachments/20080418/84db13b9/attachment.pgp
More information about the Kstars-devel
mailing list