mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-12 00:08:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

More Cygnets

Browse Source
This commit is contained in:
Sebastian Piwell
2016-05-16 17:00:51 -04:00
parent 4f9c969e4e
commit 9efc40eadb
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
modules/iswa/util/iswamanager.cpp
View File

@@ -36,7 +36,6 @@
#include <ghoul/filesystem/filesystem>
#include <modules/kameleon/include/kameleonwrapper.h>
#include <openspace/util/time.h>
#include <modules/iswa/ext/json/json.hpp>
#include <openspace/scripting/scriptengine.h>
#include <openspace/scripting/script_helper.h>
#include <ghoul/lua/ghoul_lua.h>
@@ -438,21 +437,28 @@ void IswaManager::fillCygnetInfo(std::string jsonString){
if(jsonString != ""){
json j = json::parse(jsonString);
json jCygnets = j["listOfPriorityCygnets"];
for(int i=0; i<jCygnets.size(); i++){
json jCygnet = jCygnets.at(i);
fillFromJSONArray(j["listOfPriorityCygnets"]);
fillFromJSONArray(j["listOfOKCygnets"]);
// fillFromJSONArray(j["listOfStaleCygnets"]);
// fillFromJSONArray(j["listOfInactiveCygnets"]);
}
}
std::string name = jCygnet["cygnetDisplayTitle"];
std::replace(name.begin(), name.end(),'.', ',');
void IswaManager::fillFromJSONArray(json jsonList){
for(int i=0; i<jsonList.size(); i++){
json jCygnet = jsonList.at(i);
CygnetInfo info = {
name,
jCygnet["cygnetDescription"],
jCygnet["cygnetUpdateInterval"],
false
};
_cygnetInformation[jCygnet["cygnetID"]] = std::make_shared<CygnetInfo>(info);
}
std::string name = jCygnet["cygnetDisplayTitle"];
std::replace(name.begin(), name.end(),'.', ',');
CygnetInfo info = {
name,
jCygnet["cygnetDescription"],
jCygnet["cygnetUpdateInterval"],
false
};
_cygnetInformation[jCygnet["cygnetID"]] = std::make_shared<CygnetInfo>(info);
}
}

2
modules/iswa/util/iswamanager.h
View File

@@ -38,6 +38,7 @@
#include <openspace/scripting/scriptengine.h>
#include <openspace/util/spicemanager.h>
#include <openspace/properties/selectionproperty.h>
#include <modules/iswa/ext/json/json.hpp>
// #include <modules/iswa/rendering/iswacygnet.h>
// #include <modules/iswa/rendering/iswagroup.h>
@@ -103,6 +104,7 @@ private:
void createSphere(std::shared_ptr<MetadataFuture> data);
void fillCygnetInfo(std::string jsonString);
void fillFromJSONArray(nlohmann::json jsonList);
std::map<std::string, std::string> _month;
std::map<int, std::string> _type;