mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-28 14:59:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Some improvements

Browse Source
This commit is contained in:
Malin E
2022-03-09 14:01:47 +01:00
parent fde3b42b93
commit eb087c643f
4 changed files with 128 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/space/horizonsfile.cpp
+19 -1
View File
@@ -96,6 +96,10 @@ const std::filesystem::path& HorizonsFile::file() const {
return _file;
}
std::filesystem::path& HorizonsFile::file() {
return _file;
}
std::string HorizonsFile::constructUrl(HorizonsFile::Type type, const std::string& target,
const std::string& observer, const std::string& startTime,
const std::string& stopTime, const std::string& stepSize, const std::string& unit)
@@ -364,6 +368,13 @@ void HorizonsFile::displayErrorMessage(const ResultCode code) const {
LERROR("The horizons file is empty");
break;
case ResultCode::InvalidFormat:
LERROR(fmt::format(
"Format of file '{}' is invalid. Horizons files must have extension '.dat'",
_file)
);
break;
case ResultCode::ErrorSize:
LERROR("The selected time range with the selected step size is too big, "
"try to increase the step size and/or decrease the time range");
@@ -482,7 +493,14 @@ void HorizonsFile::displayErrorMessage(const ResultCode code) const {
}
HorizonsFile::HorizonsResult HorizonsFile::readFile() const {
// Check if valid first
// Check if extension is correct first
if (_file.extension() != ".dat") {
HorizonsResult result;
result.errorCode = ResultCode::InvalidFormat;
return result;
}
// Check if valid
ResultCode code = isValidHorizonsFile();
if (code != ResultCode::Valid) {
HorizonsResult result;