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

Add warning when using Observer table Horizons data

Browse Source
This commit is contained in:
Malin E
2022-02-28 15:51:36 +01:00
parent a8158a3f1e
commit ab371c0f6a
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
View File

@@ -845,7 +845,7 @@ bool HorizonsDialog::handleResult(openspace::HorizonsFile::ResultCode& result) {
// Format: ID#, Name, Designation, IAU/aliases/other
// Line after data: Number of matches = X. Use ID# to make unique selection.
appendLog("Multiple matches was found for target '" + _targetName + "'",
appendLog("Multiple matches were found for target '" + _targetName + "'",
HorizonsDialog::LogLevel::Warning
);

32
modules/space/horizonsfile.cpp
View File

@@ -397,8 +397,8 @@ void HorizonsFile::displayErrorMessage(const ResultCode code) const {
break;
case ResultCode::ErrorNoData:
LERROR("There is not enough data to compute the state of target in relation "
"to the observer for the selected time range.");
LERROR("There is not enough data to compute the state of the target in "
"relation to the observer for the selected time range.");
break;
case ResultCode::MultipleObserverStations: {
@@ -454,7 +454,7 @@ void HorizonsFile::displayErrorMessage(const ResultCode code) const {
// Format: ID#, Name, Designation, IAU/aliases/other
// Line after data: Number of matches = X. Use ID# to make unique selection.
LWARNING("Multiple matches was found for the target");
LWARNING("Multiple matches were found for the target");
std::vector<std::string> matchingTargets =
parseMatches("Name", "matches");
@@ -482,11 +482,19 @@ void HorizonsFile::displayErrorMessage(const ResultCode code) const {
}
HorizonsFile::HorizonsResult HorizonsFile::readFile() const {
// Check if valid first
ResultCode code = isValidHorizonsFile();
if (code != ResultCode::Valid) {
HorizonsResult result;
result.errorCode = code;
return result;
}
std::ifstream fileStream(_file);
if (!fileStream.good()) {
LERROR(fmt::format(
"Failed to open Horizons text file '{}'", _file
"Failed to open Horizons file '{}'", _file
));
return HorizonsResult();
}
@@ -514,13 +522,9 @@ HorizonsFile::HorizonsResult HorizonsFile::readFile() const {
HorizonsFile::HorizonsResult HorizonsFile::readVectorFile() const {
HorizonsResult result;
result.type = HorizonsFile::Type::Vector;
result.errorCode = isValidHorizonsFile();
result.errorCode = ResultCode::Valid;
std::vector<HorizonsKeyframe> data;
if (result.errorCode != ResultCode::Valid) {
return result;
}
std::ifstream fileStream(_file);
if (!fileStream.good()) {
LERROR(fmt::format(
@@ -592,13 +596,9 @@ HorizonsFile::HorizonsResult HorizonsFile::readVectorFile() const {
HorizonsFile::HorizonsResult HorizonsFile::readObserverFile() const {
HorizonsResult result;
result.type = HorizonsFile::Type::Observer;
result.errorCode = isValidHorizonsFile();
result.errorCode = ResultCode::Valid;
std::vector<HorizonsKeyframe> data;
if (result.errorCode != ResultCode::Valid) {
return result;
}
std::ifstream fileStream(_file);
if (!fileStream.good()) {
LERROR(fmt::format(
@@ -656,6 +656,10 @@ HorizonsFile::HorizonsResult HorizonsFile::readObserverFile() const {
fileStream.close();
LWARNING("Observer table data from Horizons might not align with SPICE data well. "
"We recommend using Vector table data from Horizons instead"
);
result.data = data;
return result;
}