1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-12 10:48:42 -04:00

Merge pull request #762 from srcejon/star_tracker_separate_resources

Star tracker separate resources
This commit is contained in:
Edouard Griffiths
2021-02-01 11:32:51 +01:00
committed by GitHub
6 changed files with 26 additions and 11 deletions
@@ -29,6 +29,9 @@ if(NOT SERVER_MODE)
startrackersettingsdialog.cpp
startrackersettingsdialog.ui
startracker.qrc
startracker150mhz.qrc
startracker408mhz.qrc
startracker1420mhz.qrc
)
set(startracker_HEADERS
${startracker_HEADERS}
@@ -14,15 +14,5 @@
<file>startracker/pulsar-32.png</file>
<file>startracker/sun-40.png</file>
<file>startracker/sun-button-24.png</file>
<file>startracker/150mhz_ra_dec.png</file>
<file>startracker/408mhz_ra_dec.png</file>
<file>startracker/1420mhz_ra_dec.png</file>
<file>startracker/150mhz_galactic.png</file>
<file>startracker/408mhz_galactic.png</file>
<file>startracker/1420mhz_galactic.png</file>
<file>startracker/150mhz_ra_dec.fits</file>
<file>startracker/408mhz_ra_dec.fits</file>
<file>startracker/1420mhz_ra_dec.fits</file>
<file>startracker/408mhz_ra_dec_spectral_index.fits</file>
</qresource>
</RCC>
@@ -0,0 +1,7 @@
<RCC>
<qresource prefix="/startracker/">
<file>startracker/1420mhz_ra_dec.png</file>
<file>startracker/1420mhz_galactic.png</file>
<file>startracker/1420mhz_ra_dec.fits</file>
</qresource>
</RCC>
@@ -0,0 +1,7 @@
<RCC>
<qresource prefix="/startracker/">
<file>startracker/150mhz_ra_dec.png</file>
<file>startracker/150mhz_galactic.png</file>
<file>startracker/150mhz_ra_dec.fits</file>
</qresource>
</RCC>
@@ -0,0 +1,8 @@
<RCC>
<qresource prefix="/startracker/">
<file>startracker/408mhz_ra_dec.png</file>
<file>startracker/408mhz_galactic.png</file>
<file>startracker/408mhz_ra_dec.fits</file>
<file>startracker/408mhz_ra_dec_spectral_index.fits</file>
</qresource>
</RCC>
@@ -1206,7 +1206,7 @@ void StarTrackerGUI::updateSolarFlux(bool all)
{
QDate today = QDateTime::currentDateTimeUtc().date();
QString solarFluxFile = getSolarFluxFilename();
if (m_dlm.confirmDownload(solarFluxFile))
if (m_dlm.confirmDownload(solarFluxFile, nullptr, 1))
{
QString urlString = QString("http://www.sws.bom.gov.au/Category/World Data Centre/Data Display and Download/Solar Radio/station/learmonth/SRD/%1/L%2.SRD")
.arg(today.year()).arg(today.toString("yyMMdd"));