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

fix for new ionosphere data

Browse Source
This commit is contained in:
Michael Nilsson
2016-06-03 16:26:51 -04:00
parent dbe9066829
commit 11245c9ead
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/iswa/util/dataprocessorjson.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ std::vector<std::string> DataProcessorJson::readMetadata(std::string data){
for(json::iterator it = variables.begin(); it != variables.end(); ++it){
std::string option = it.key();
if(option == "x"){
if(option == "ep"){
json row = it.value();
json col = row.at(0);
modules/iswa/util/iswamanager.cpp
+2 -2
View File
@@ -393,7 +393,7 @@ std::string IswaManager::jsonSphereToLuaTable(std::shared_ptr<MetadataFuture> da
parent[0] = toupper(parent[0]);
std::string frame = j["standard_grid_target"];
std::string coordinateType = j["grid_1_type"];
std::string updateTime = j["output_time_interval"];
float updateTime = j["output_time_interval"];
float radius = j["radius"];
glm::vec4 spatialScale(6.371f, 6.371f, 6.371f, 6);
@@ -419,7 +419,7 @@ std::string IswaManager::jsonSphereToLuaTable(std::shared_ptr<MetadataFuture> da
"Frame = '" + frame + "' , "
"GridMin = " + std::to_string(min) + ", "
"GridMax = " + std::to_string(max) + ", "
"UpdateTime = " + updateTime + ", "
"UpdateTime = " + std::to_string(updateTime) + ", "
"Radius = " + std::to_string(radius) + ", "
"CoordinateType = '" + coordinateType + "', "
"Group = '"+ data->group + "',"