VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-05-14 13:22:16 -04:00
Code Issues Projects Releases Wiki Activity

Fix server compilation.

Browse Source
This commit is contained in:
Jon Beniston 2026-04-04 13:18:44 +01:00
parent 447a679419
commit 3c3371cf2c
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/feature/startracker/spice.cpp
View File

@ -396,9 +396,9 @@ bool calculateJupiterMoonPhase(const QString& moon, double et, double latitude,
SpiceDouble xform[3][3];
pxform_c("J2000", "IAU_JUPITER", te, xform);
SpiceDouble io_bf[3], obs_bf[3];
mxv_c(xform, moonPosJupiterJ2000, io_bf);
mxv_c(xform, obsPosJupiterJ2000, obs_bf);
SpiceDouble moonBodyFixed[3], obsBodyFixed[3];
mxv_c(xform, moonPosJupiterJ2000, moonBodyFixed);
mxv_c(xform, obsPosJupiterJ2000, obsBodyFixed);
// Jupiter radii
SpiceInt nrad;
@ -415,17 +415,14 @@ bool calculateJupiterMoonPhase(const QString& moon, double et, double latitude,
// Moon planetographic longitude using the same convention as CML
SpiceDouble moonLonRad, moonLatRad, moonAltKm;
recpgr_c("JUPITER", io_bf, re_j, f_j, &moonLonRad, &moonLatRad, &moonAltKm);
recpgr_c("JUPITER", moonBodyFixed, re_j, f_j, &moonLonRad, &moonLatRad, &moonAltKm);
SpiceDouble moonLonDeg = normalize360(Units::radiansToDegrees(moonLonRad));
// CML (sub-observer planetographic longitude)
SpiceDouble subObsLonRad, subObsLatRad, subObsAltKm;
recpgr_c("JUPITER", obs_bf, re_j, f_j, &subObsLonRad, &subObsLatRad, &subObsAltKm);
recpgr_c("JUPITER", obsBodyFixed, re_j, f_j, &subObsLonRad, &subObsLatRad, &subObsAltKm);
cml = normalize360(Units::radiansToDegrees(subObsLonRad));
// Moon offset from CML
SpiceDouble delta_deg = normalize180(moonLonDeg - cml);
// Moon phase (0 deg on far side)
phase = normalize360(cml - moonLonDeg + 180);

8
plugins/feature/startracker/spiceephemerides.cpp
View File

@ -22,7 +22,7 @@
#include "spiceephemerides.h"
#include "spice.h"
SpiceEphemerides::SpiceEphemerides(QWidget *parentWidget) :
SpiceEphemerides::SpiceEphemerides(QObject *parentWidget) :
m_parentWidget(parentWidget)
{
connect(&m_dlm, &HttpDownloadManager::downloadComplete, this, &SpiceEphemerides::downloadComplete);
@ -55,7 +55,11 @@ bool SpiceEphemerides::download(const QStringList &emphemerides)
{
qDebug() << "Downloading ephemeris from" << ephemerisURL << "to" << ephemerisFilename;
m_pendingDownloads.append(ephemerisFilename);
m_dlm.download(ephemerisURL, ephemerisFilename, m_parentWidget);
#ifdef SERVER_MODE
m_dlm.download(ephemerisURL, ephemerisFilename);
#else
m_dlm.download(ephemerisURL, ephemerisFilename, (QWidget *) m_parentWidget);
#endif
downloadRequired = true;
}
else

14
plugins/feature/startracker/spiceephemerides.h
View File

@ -19,9 +19,13 @@
#define INCLUDE_SPICE_EPHEMERIDES_H_
#include <QObject>
#include <QWidget>
#ifdef SERVER_MODE
#include "util/httpdownloadmanager.h"
#else
#include <QWidget>
#include "gui/httpdownloadmanagergui.h"
#endif
class SpiceEphemerides : public QObject
{
@ -29,7 +33,7 @@ class SpiceEphemerides : public QObject
public:
explicit SpiceEphemerides(QWidget *parentWidget = nullptr);
explicit SpiceEphemerides(QObject *parentWidget = nullptr);
bool download(const QStringList &emphemerides);
bool checkDownloaded(const QStringList &emphemerides) const;
QStringList getTargets(const QStringList &ephemerisURL);
@ -39,8 +43,12 @@ private:
static QString urlToFilename(const QString &ephemerisURL);
QWidget *m_parentWidget;
QObject *m_parentWidget;
#ifdef SERVER_MODE
HttpDownloadManager m_dlm;
#else
HttpDownloadManagerGUI m_dlm;
#endif
QStringList m_pendingDownloads;
QStringList m_completedDownloads;