mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 11:18:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Load images from url automatically if the folder WWTimagedata doesn't exist in module

Browse Source
This commit is contained in:
Ylva Selling
2021-05-12 15:10:43 +02:00
parent d8d8cbf2fd
commit b95fa7a701
7 changed files with 68 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/skybrowser/skybrowsermodule.cpp
+8 -15
View File
@@ -88,14 +88,6 @@ namespace openspace {
"Add one or multiple exoplanet systems to the scene, as specified by the "
"input. An input string should be the name of the system host star"
},
{
"move",
&skybrowser::luascriptfunctions::moveBrowser,
{},
"string or list of strings",
"Add one or multiple exoplanet systems to the scene, as specified by the "
"input. An input string should be the name of the system host star"
},
{
"loadImagesToWWT",
&skybrowser::luascriptfunctions::loadImagesToWWT,
@@ -459,7 +451,7 @@ int SkyBrowserModule::getSelectedBrowserIndex() {
return selectedBrowser;
}
int SkyBrowserModule::loadImages(const std::string& root, int readingMode) {
int SkyBrowserModule::loadImages(const std::string& root, const std::string& directory) {
// Load speck files for 3D positions
std::filesystem::path globularClusters = absPath("${BASE}/sync/http/digitaluniverse_globularclusters_speck/2/gc.speck");
@@ -473,16 +465,17 @@ int SkyBrowserModule::loadImages(const std::string& root, int readingMode) {
int nLoadedImages;
// Read from disc
if (readingMode == FROM_DIRECTORY) {
bool loadedImages = dataHandler->loadWTMLCollectionsFromDirectory(directory);
// Reading from url if there is no directory
if (loadedImages) {
LINFO("Loading images from directory");
dataHandler->loadWTMLCollectionsFromDirectory(absPath("${MODULE_SKYBROWSER}/WWTimagedata/"));
}
// Reading from url
else if (readingMode == FROM_URL) {
else {
LINFO("Loading images from url");
dataHandler->loadWTMLCollectionsFromURL(root, "root");
dataHandler->loadWTMLCollectionsFromURL(directory, root, "root");
}
nLoadedImages = dataHandler->loadImagesFromLoadedXMLs();
LINFO("Loaded " + std::to_string(nLoadedImages) + " WorldWide Telescope images.");