mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-27 06:19:51 -05:00
reduced data struct, clean up
This commit is contained in:
@@ -191,10 +191,7 @@ namespace openspace {
|
||||
|
||||
//loop through all signals in the data
|
||||
for (const auto& signalsInJson : j["Signals"]) {
|
||||
|
||||
structSignal.signalId = signalsInJson["activityid"].get<int>();
|
||||
structSignal.dishName = signalsInJson["facility"].get<std::string>();
|
||||
structSignal.year = signalsInJson["year"].get<int>();
|
||||
structSignal.spacecraft = signalsInJson["projuser"].get<std::string>();
|
||||
structSignal.endTime = signalsInJson["eot"].get<std::string>();
|
||||
structSignal.startTime = signalsInJson["bot"].get<std::string>();
|
||||
@@ -202,7 +199,6 @@ namespace openspace {
|
||||
|
||||
//Add signals to vector of signals
|
||||
_signalData.signals.push_back(structSignal);
|
||||
//_dsnData.signalStartTimes.push_back(Time::convertTime(structSignal.startTime));
|
||||
}
|
||||
|
||||
_signalData.isLoaded = true;
|
||||
|
||||
@@ -46,15 +46,11 @@ namespace openspace {
|
||||
public:
|
||||
|
||||
static struct Signal {
|
||||
int signalId;
|
||||
std::string dishName;
|
||||
int year;
|
||||
std::string spacecraft;
|
||||
std::string direction;
|
||||
std::string startTime;
|
||||
std::string endTime;
|
||||
glm::vec3 color;
|
||||
|
||||
};
|
||||
|
||||
static struct SignalData {
|
||||
|
||||
Reference in New Issue
Block a user