diff --git a/EinsteinS5R3Adapter.cpp b/EinsteinS5R3Adapter.cpp index 5df4e36bfeb31c2722bb4419591a9725f235e206..03a2baddaa0981042f27ac44bf2c62e89952ff45 100644 --- a/EinsteinS5R3Adapter.cpp +++ b/EinsteinS5R3Adapter.cpp @@ -42,6 +42,11 @@ void EinsteinS5R3Adapter::parseApplicationInformation() { cerr << "Incompatible shared memory data encountered!" << endl; } + else { + // convert radians to degrees + m_WUSkyPosRightAscension *= 180/PI; + m_WUSkyPosDeclination *= 180/PI; + } } } diff --git a/EinsteinS5R3Adapter.h b/EinsteinS5R3Adapter.h index 0b838649afad88cf8b4fa272dd51740f9128049f..8f5d9a72ee80134aebcb24252e592bb8ad939f3d 100644 --- a/EinsteinS5R3Adapter.h +++ b/EinsteinS5R3Adapter.h @@ -7,6 +7,8 @@ using namespace std; +#define PI 3.14159265 + /** * \brief Adapter class which facilitates communications with the \b Einstein\@Home S5R3 application * @@ -42,14 +44,14 @@ public: /** * \brief Retrieves the right ascension of the currently searched sky position * - * \return The right ascension (in radians) + * \return The right ascension (in degrees) */ double wuSkyPosRightAscension() const; /** * \brief Retrieves the declination of the currently searched sky position * - * \return The right ascension (in radians) + * \return The right ascension (in degrees) */ double wuSkyPosDeclination() const; @@ -83,10 +85,10 @@ private: /// Pointer to the (parent) BOINC client adapter BOINCClientAdapter *boincClient; - /// Right ascension of the currently searched sky position + /// Right ascension of the currently searched sky position (in degrees) double m_WUSkyPosRightAscension; - /// Declination of the currently searched sky position + /// Declination of the currently searched sky position (in degrees) double m_WUSkyPosDeclination; /// The completion fraction of the active work unit diff --git a/Starsphere.cpp b/Starsphere.cpp index 52745c1f39f29916f51d6c94dfa39bc8e89128dc..18a1e92324925cd8742e7341e2f13abf75096e84 100644 --- a/Starsphere.cpp +++ b/Starsphere.cpp @@ -474,13 +474,13 @@ void Starsphere::make_search_marker(GLfloat RAdeg, GLfloat DEdeg, GLfloat size) glPopMatrix(); // searchlight line out to marker (OFF!) - if (false) { + if(false) { glBegin(GL_LINES); sphVertex3D(RAdeg, DEdeg, 0.50*sphRadius); sphVertex3D(RAdeg, DEdeg, 0.95*sphRadius); glEnd(); } - + glEndList(); } diff --git a/StarsphereS5R3.cpp b/StarsphereS5R3.cpp index b84d9fc540a3deb1facc9d1ccc9067164882a8d4..7203f2b8cda6050ebd0b6140f7f852dcd60c68e9 100644 --- a/StarsphereS5R3.cpp +++ b/StarsphereS5R3.cpp @@ -54,7 +54,7 @@ void StarsphereS5R3::refreshBOINCInformation() // we've got a new position, update search marker and HUD m_CurrentRightAscension = m_EinsteinAdapter.wuSkyPosRightAscension(); m_RefreshSearchMarker = true; - buffer << "Ascension: " << fixed << m_CurrentRightAscension * 360/PI2 << " deg" << ends; + buffer << "Ascension: " << fixed << m_CurrentRightAscension << " deg" << ends; m_WUSkyPosRightAscension = buffer.str(); buffer.str(""); } @@ -63,7 +63,7 @@ void StarsphereS5R3::refreshBOINCInformation() // we've got a new position, update search marker and HUD m_CurrentDeclination = m_EinsteinAdapter.wuSkyPosDeclination(); m_RefreshSearchMarker = true; - buffer << "Declination: " << fixed << m_CurrentDeclination * 360/PI2 << " deg" << ends; + buffer << "Declination: " << fixed << m_CurrentDeclination << " deg" << ends; m_WUSkyPosDeclination = buffer.str(); buffer.str(""); } diff --git a/StarsphereS5R3.h b/StarsphereS5R3.h index d10388c3f1bde1831caa5c99bc0a1f6568b72b8d..80fa9952f17cad35049312e54eb3a51d9cec2bc3 100644 --- a/StarsphereS5R3.h +++ b/StarsphereS5R3.h @@ -79,10 +79,10 @@ private: /// Specialized BOINC client adapter instance for information retrieval EinsteinS5R3Adapter m_EinsteinAdapter; - /// Local copy of the current WU's search parameter "Right-Ascension" + /// Local copy of the current WU's search parameter "Right-Ascension" (degrees) string m_WUSkyPosRightAscension; - /// Local copy of the current WU's search parameter "Declination" + /// Local copy of the current WU's search parameter "Declination" (degrees) string m_WUSkyPosDeclination; /// Local copy of the current WU's search parameter "Percent done"