mirror of https://github.com/f4exb/sdrangel.git
SkyMap: Add Moon map.
This commit is contained in:
parent
5e15edcbcf
commit
a0b21221ae
|
@ -13,6 +13,10 @@ With the ESASky map, a host of astronomical data is available from JWST, Hubble,
|
||||||
|
|
||||||
![Sky Map feature ESASky](../../../doc/img/SkyMap_ESASky.png)
|
![Sky Map feature ESASky](../../../doc/img/SkyMap_ESASky.png)
|
||||||
|
|
||||||
|
Additionally, a map of the Moon can be viewed in 2D or 3D, that supports a variety of data layers from various Lunar missions, such as LRO (Lunar Reconnaissance Orbiter).
|
||||||
|
|
||||||
|
![Moon map](../../../doc/img/SkyMap_Moon.png)
|
||||||
|
|
||||||
<h2>Interface</h2>
|
<h2>Interface</h2>
|
||||||
|
|
||||||
![Sky Map feature plugin GUI](../../../doc/img/SkyMap_settings.png)
|
![Sky Map feature plugin GUI](../../../doc/img/SkyMap_settings.png)
|
||||||
|
@ -38,6 +42,7 @@ Allows you to select the sky map:
|
||||||
* WWT - World Wide Telescope
|
* WWT - World Wide Telescope
|
||||||
* ESASky
|
* ESASky
|
||||||
* Aladin
|
* Aladin
|
||||||
|
* Moon - Map of the Moon
|
||||||
|
|
||||||
Each map provides different features, image and data sets.
|
Each map provides different features, image and data sets.
|
||||||
|
|
||||||
|
@ -128,6 +133,14 @@ ESASky and Aladin are able to overlay catalog data:
|
||||||
|
|
||||||
<h2>Attribution</h2>
|
<h2>Attribution</h2>
|
||||||
|
|
||||||
|
WWT is from [NumFOCUS](https://worldwidetelescope.org/about/).
|
||||||
|
|
||||||
|
ESASky is from [ESAC | ESA](https://www.cosmos.esa.int/web/esdc/esasky-credits).
|
||||||
|
|
||||||
|
Aladin Sky Atlas is from [Centre de Données astronomiques de Strasbourg | CDS](https://aladin.cds.unistra.fr/).
|
||||||
|
|
||||||
|
Moon map is from [Applied Coherent Technology | ACT](https://www.actgate.com/).
|
||||||
|
|
||||||
Constellation icons created by Freepik - https://www.flaticon.com
|
Constellation icons created by Freepik - https://www.flaticon.com
|
||||||
|
|
||||||
<h2>API</h2>
|
<h2>API</h2>
|
||||||
|
|
|
@ -302,6 +302,10 @@ void SkyMapGUI::on_map_currentIndexChanged(int index)
|
||||||
ui->web->load(QUrl(QString("http://127.0.0.1:%1/skymap/html/esasky.html").arg(m_webPort)));
|
ui->web->load(QUrl(QString("http://127.0.0.1:%1/skymap/html/esasky.html").arg(m_webPort)));
|
||||||
} else if (m_settings.m_map == "Aladin") {
|
} else if (m_settings.m_map == "Aladin") {
|
||||||
ui->web->load(QUrl(QString("http://127.0.0.1:%1/skymap/html/aladin.html").arg(m_webPort)));
|
ui->web->load(QUrl(QString("http://127.0.0.1:%1/skymap/html/aladin.html").arg(m_webPort)));
|
||||||
|
} else if (m_settings.m_map == "Moon") {
|
||||||
|
ui->web->load(QUrl(QString("http://quickmap.lroc.asu.edu/"))); // Jumping straight to 3D view doesn't seem to work
|
||||||
|
setStatusText("");
|
||||||
|
m_ready = true;
|
||||||
}
|
}
|
||||||
updateToolbar();
|
updateToolbar();
|
||||||
updateBackgrounds();
|
updateBackgrounds();
|
||||||
|
@ -499,7 +503,6 @@ void SkyMapGUI::applyAllSettings()
|
||||||
|
|
||||||
void SkyMapGUI::find(const QString& text)
|
void SkyMapGUI::find(const QString& text)
|
||||||
{
|
{
|
||||||
qDebug() << "**********find" << text << m_ready;
|
|
||||||
if (!m_ready)
|
if (!m_ready)
|
||||||
{
|
{
|
||||||
// Save for when ready
|
// Save for when ready
|
||||||
|
@ -984,6 +987,7 @@ void SkyMapGUI::updateToolbar()
|
||||||
bool namesVisible = false;
|
bool namesVisible = false;
|
||||||
bool projectionVisible = true;
|
bool projectionVisible = true;
|
||||||
bool backgroundVisible = true;
|
bool backgroundVisible = true;
|
||||||
|
bool basicVisible = true;
|
||||||
|
|
||||||
if (m_settings.m_map == "WWT")
|
if (m_settings.m_map == "WWT")
|
||||||
{
|
{
|
||||||
|
@ -996,6 +1000,13 @@ void SkyMapGUI::updateToolbar()
|
||||||
backgroundVisible = false;
|
backgroundVisible = false;
|
||||||
reticleVisible = false;
|
reticleVisible = false;
|
||||||
}
|
}
|
||||||
|
else if (m_settings.m_map == "Moon")
|
||||||
|
{
|
||||||
|
projectionVisible = false;
|
||||||
|
backgroundVisible = false;
|
||||||
|
reticleVisible = false;
|
||||||
|
basicVisible = false;
|
||||||
|
}
|
||||||
|
|
||||||
ui->background->setVisible(backgroundVisible);
|
ui->background->setVisible(backgroundVisible);
|
||||||
ui->projection->setVisible(projectionVisible);
|
ui->projection->setVisible(projectionVisible);
|
||||||
|
@ -1004,6 +1015,14 @@ void SkyMapGUI::updateToolbar()
|
||||||
ui->displayConstellations->setVisible(constellationsVisible);
|
ui->displayConstellations->setVisible(constellationsVisible);
|
||||||
ui->displayReticle->setVisible(reticleVisible);
|
ui->displayReticle->setVisible(reticleVisible);
|
||||||
|
|
||||||
|
ui->find->setVisible(basicVisible);
|
||||||
|
ui->findLabel->setVisible(basicVisible);
|
||||||
|
ui->displayGrid->setVisible(basicVisible);
|
||||||
|
ui->displayReticle->setVisible(basicVisible);
|
||||||
|
ui->displayAntennaFoV->setVisible(basicVisible);
|
||||||
|
ui->track->setVisible(basicVisible);
|
||||||
|
ui->source->setVisible(basicVisible);
|
||||||
|
|
||||||
updateProjection();
|
updateProjection();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -116,6 +116,11 @@
|
||||||
<string>Aladin</string>
|
<string>Aladin</string>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>Moon</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
|
@ -394,17 +399,17 @@
|
||||||
</widget>
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
<customwidgets>
|
<customwidgets>
|
||||||
|
<customwidget>
|
||||||
|
<class>ButtonSwitch</class>
|
||||||
|
<extends>QToolButton</extends>
|
||||||
|
<header>gui/buttonswitch.h</header>
|
||||||
|
</customwidget>
|
||||||
<customwidget>
|
<customwidget>
|
||||||
<class>RollupContents</class>
|
<class>RollupContents</class>
|
||||||
<extends>QWidget</extends>
|
<extends>QWidget</extends>
|
||||||
<header>gui/rollupcontents.h</header>
|
<header>gui/rollupcontents.h</header>
|
||||||
<container>1</container>
|
<container>1</container>
|
||||||
</customwidget>
|
</customwidget>
|
||||||
<customwidget>
|
|
||||||
<class>ButtonSwitch</class>
|
|
||||||
<extends>QToolButton</extends>
|
|
||||||
<header>gui/buttonswitch.h</header>
|
|
||||||
</customwidget>
|
|
||||||
<customwidget>
|
<customwidget>
|
||||||
<class>QWebEngineView</class>
|
<class>QWebEngineView</class>
|
||||||
<extends>QWidget</extends>
|
<extends>QWidget</extends>
|
||||||
|
|
Loading…
Reference in New Issue