mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-23 20:49:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA

Browse Source
This commit is contained in:
Michael Nilsson
2016-05-17 13:04:11 -04:00
parent 7549beb5f2 068643d38f
commit 5ff67104de
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -440,28 +440,27 @@ void IswaManager::fillCygnetInfo(std::string jsonString){
if(jsonString != ""){
json j = json::parse(jsonString);
fillFromJSONArray(j["listOfPriorityCygnets"]);
fillFromJSONArray(j["listOfOKCygnets"]);
// fillFromJSONArray(j["listOfStaleCygnets"]);
// fillFromJSONArray(j["listOfInactiveCygnets"]);
}
}
std::set<std::string> lists = {"listOfPriorityCygnets", "listOfOKCygnets"
// ,"listOfStaleCygnets", "listOfInactiveCygnets",
};
void IswaManager::fillFromJSONArray(json jsonList){
for(int i=0; i<jsonList.size(); i++){
json jCygnet = jsonList.at(i);
for(auto list : lists){
json jsonList = j[list];
for(int i=0; i<jsonList.size(); i++){
json jCygnet = jsonList.at(i);
std::string name = jCygnet["cygnetDisplayTitle"];
std::replace(name.begin(), name.end(),'.', ',');
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);
CygnetInfo info = {
name,
jCygnet["cygnetDescription"],
jCygnet["cygnetUpdateInterval"],
false
};
_cygnetInformation[jCygnet["cygnetID"]] = std::make_shared<CygnetInfo>(info);
}
}
}
}

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

@@ -104,7 +104,6 @@ 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;