mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 04:30:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup New Horizons module

Browse Source
This commit is contained in:
Alexander Bock
2016-12-06 18:48:07 +01:00
parent 04c6398d6a
commit c937203dc3
32 changed files with 312 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/newhorizons/CMakeLists.txt
-1
View File
@@ -31,7 +31,6 @@ set(HEADER_FILES
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanetprojection.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableshadowcylinder.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemodelprojection.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/writeToTexture.h
${CMAKE_CURRENT_SOURCE_DIR}/util/decoder.h
${CMAKE_CURRENT_SOURCE_DIR}/util/hongkangparser.h
${CMAKE_CURRENT_SOURCE_DIR}/util/instrumenttimesparser.h
modules/newhorizons/rendering/renderablecrawlingline.h
+3 -3
View File
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __RENDERABLECRAWLINGLINE_H__
#define __RENDERABLECRAWLINGLINE_H__
#ifndef __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLECRAWLINGLINE___H__
#define __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLECRAWLINGLINE___H__
#include <openspace/rendering/renderable.h>
@@ -62,4 +62,4 @@ private:
} // namespace openspace
#endif // __RENDERABLECRAWLINGLINE_H__
#endif // __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLECRAWLINGLINE___H__
modules/newhorizons/rendering/renderablefov.cpp
+1 -1
View File
@@ -159,7 +159,7 @@ bool RenderableFov::deinitialize() {
}
bool RenderableFov::isReady() const {
return _programObject != nullptr;
return _programObject != nullptr && !_bounds.empty();
}
void RenderableFov::sendToGPU() {
modules/newhorizons/rendering/renderablefov.h
+3 -3
View File
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __RENDERABLEFOV_H__
#define __RENDERABLEFOV_H__
#ifndef __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEFOV___H__
#define __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEFOV___H__
#include <openspace/rendering/renderable.h>
@@ -132,4 +132,4 @@ public:
} // namespace openspace
#endif // __RENDERABLEFOV_H__
#endif // __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEFOV___H__
modules/newhorizons/rendering/renderablemodelprojection.cpp
+11
View File
@@ -24,15 +24,20 @@
#include <modules/newhorizons/rendering/renderablemodelprojection.h>
#include <modules/base/rendering/modelgeometry.h>
#include <openspace/documentation/verifier.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/scene/scenegraphnode.h>
#include <openspace/util/spicemanager.h>
#include <openspace/util/time.h>
#include <openspace/util/updatestructures.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/io/texture/texturereader.h>
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/texture.h>
#include <ghoul/opengl/textureunit.h>
namespace {
@@ -143,6 +148,12 @@ RenderableModelProjection::RenderableModelProjection(const ghoul::Dictionary& di
Renderable::addProperty(_rotation);
}
RenderableModelProjection::~RenderableModelProjection() {
// This empty method needs to be here in order to use forward declaration with
// std::unique_ptr
}
bool RenderableModelProjection::isReady() const {
bool ready = true;
ready &= (_programObject != nullptr);
modules/newhorizons/rendering/renderablemodelprojection.h
+15 -9
View File
@@ -22,26 +22,31 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __RENDERABLEMODELPROJECTION_H__
#define __RENDERABLEMODELPROJECTION_H__
#ifndef __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEMODELPROJECTION___H__
#define __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEMODELPROJECTION___H__
#include <openspace/rendering/renderable.h>
#include <modules/newhorizons/util/projectioncomponent.h>
#include <openspace/documentation/documentation.h>
#include <modules/base/rendering/modelgeometry.h>
#include <modules/newhorizons/util/imagesequencer.h>
#include <openspace/properties/numericalproperty.h>
#include <openspace/properties/stringproperty.h>
#include <openspace/properties/vector/vec3property.h>
#include <openspace/util/updatestructures.h>
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/texture.h>
namespace ghoul {
namespace opengl {
class ProgramObject;
class Texture;
}
}
namespace openspace {
struct RenderData;
struct UpdateData;
namespace modelgeometry {
class ModelGeometry;
}
@@ -49,6 +54,7 @@ namespace modelgeometry {
class RenderableModelProjection : public Renderable {
public:
RenderableModelProjection(const ghoul::Dictionary& dictionary);
~RenderableModelProjection();
bool initialize() override;
bool deinitialize() override;
@@ -102,6 +108,6 @@ private:
properties::BoolProperty _performShading;
};
} // namespace openspace
} // namespace openspace
#endif // __RENDERABLEMODELPROJECTION_H__
#endif // __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEMODELPROJECTION___H__
modules/newhorizons/rendering/renderableplaneprojection.cpp
+4 -1
View File
@@ -24,11 +24,14 @@
#include <modules/newhorizons/rendering/renderableplaneprojection.h>
#include <modules/newhorizons/util/imagesequencer.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/configurationmanager.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/scene/scenegraphnode.h>
#include <openspace/util/spicemanager.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/util/updatestructures.h>
#include <ghoul/filesystem/filesystem>
#include <ghoul/io/texture/texturereader.h>
modules/newhorizons/rendering/renderableplaneprojection.h
+30 -29
View File
@@ -1,36 +1,32 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef _RENDERABLEPLANEPROJECTION_H_
#define _RENDERABLEPLANEPROJECTION_H_
#ifndef __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEPLANEPROJECTION___H__
#define __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEPLANEPROJECTION___H__
#include <openspace/rendering/renderable.h>
#include <openspace/properties/stringproperty.h>
#include <modules/newhorizons/util/imagesequencer.h>
#include <openspace/util/updatestructures.h>
#include <memory>
namespace ghoul {
@@ -44,7 +40,11 @@ namespace ghoul {
}
namespace openspace {
struct Image;
struct LinePoint;
struct RenderData;
struct UpdateData;
struct target {
std::string body;
@@ -97,4 +97,5 @@ private:
};
} // namespace openspace
#endif
#endif // __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEPLANEPROJECTION___H__
modules/newhorizons/rendering/renderableplanetprojection.cpp
+8
View File
@@ -38,6 +38,14 @@
#include <ghoul/opengl/textureconversion.h>
#include <ghoul/opengl/textureunit.h>
#include <modules/newhorizons/util/imagesequencer.h>
#include <openspace/documentation/documentation.h>
#include <openspace/properties/triggerproperty.h>
#include <openspace/util/updatestructures.h>
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/texture.h>
#ifdef WIN32
#define _USE_MATH_DEFINES
#include <math.h>
modules/newhorizons/rendering/renderableplanetprojection.h
+6 -11
View File
@@ -22,24 +22,19 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __RENDERABLEPLANETPROJECTION_H__
#define __RENDERABLEPLANETPROJECTION_H__
#ifndef __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEPLANETPROJECTION___H__
#define __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEPLANETPROJECTION___H__
#include <openspace/rendering/renderable.h>
#include <modules/newhorizons/util/imagesequencer.h>
#include <modules/newhorizons/util/projectioncomponent.h>
#include <openspace/documentation/documentation.h>
#include <openspace/properties/stringproperty.h>
#include <openspace/properties/triggerproperty.h>
#include <openspace/util/updatestructures.h>
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/texture.h>
namespace openspace {
struct Image;
namespace planetgeometry {
class PlanetGeometry;
}
@@ -104,8 +99,8 @@ private:
GLuint _quad;
GLuint _vertexPositionBuffer;
};
} // namespace openspace
#endif // __RENDERABLEPLANETPROJECTION_H__
#endif // __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLEPLANETPROJECTION___H__
modules/newhorizons/rendering/renderableshadowcylinder.cpp
+1
View File
@@ -28,6 +28,7 @@
#include <openspace/rendering/renderengine.h>
#include <openspace/util/powerscaledcoordinate.h>
#include <openspace/util/spicemanager.h>
#include <openspace/util/updatestructures.h>
#include <ghoul/opengl/programobject.h>
modules/newhorizons/rendering/renderableshadowcylinder.h
+8 -6
View File
@@ -22,16 +22,15 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __RENDERABLESHADOWCYLINDER_H__
#define __RENDERABLESHADOWCYLINDER_H__
#ifndef __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLESHADOWCYLINDER___H__
#define __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLESHADOWCYLINDER___H__
#include <openspace/rendering/renderable.h>
#include <openspace/properties/stringproperty.h>
#include <openspace/properties/scalar/intproperty.h>
#include <openspace/properties/scalar/floatproperty.h>
#include <openspace/properties/vector/vec4property.h>
#include <openspace/util/updatestructures.h>
#include <openspace/util/spicemanager.h>
namespace ghoul {
@@ -41,7 +40,10 @@ class ProgramObject;
}
namespace openspace {
struct RenderData;
struct UpdateData;
class RenderableShadowCylinder : public Renderable {
public:
RenderableShadowCylinder(const ghoul::Dictionary& dictionary);
@@ -83,4 +85,4 @@ private:
} // namespace openspace
#endif // __RENDERABLESHADOWCYLINDER_H__
#endif // __OPENSPACE_MODULE_NEWHORIZONS___RENDERABLESHADOWCYLINDER___H__
modules/newhorizons/util/decoder.cpp
+3 -8
View File
@@ -26,20 +26,15 @@
#include <openspace/util/factorymanager.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/misc/dictionary.h>
#include <ghoul/misc/exception.h>
namespace {
const std::string _loggerCat = "Decoder";
}
namespace openspace {
std::unique_ptr<Decoder> Decoder::createFromDictionary(
const ghoul::Dictionary& dictionary, const std::string& type)
{
ghoul::TemplateFactory<Decoder>* factory
= FactoryManager::ref().factory<Decoder>();
ghoul::TemplateFactory<Decoder>* factory = FactoryManager::ref().factory<Decoder>();
Decoder* result = factory->create(type, dictionary);
if (result == nullptr) {
@@ -53,4 +48,4 @@ std::unique_ptr<Decoder> Decoder::createFromDictionary(
Decoder::~Decoder() {}
} // namespace openspace
} // namespace openspace
modules/newhorizons/util/decoder.h
+9 -5
View File
@@ -22,12 +22,16 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __DECODER_H__
#define __DECODER_H__
#include <ghoul/misc/dictionary.h>
#ifndef __OPENSPACE_MODULE_NEWHORIZONS___DECODER___H__
#define __OPENSPACE_MODULE_NEWHORIZONS___DECODER___H__
#include <memory>
#include <string>
#include <vector>
namespace ghoul {
class Dictionary;
}
namespace openspace {
@@ -47,4 +51,4 @@ protected:
} // namespace openspace
#endif // __DECODER_H__
#endif // __OPENSPACE_MODULE_NEWHORIZONS___DECODER___H__
modules/newhorizons/util/hongkangparser.cpp
+25 -15
View File
@@ -39,9 +39,16 @@
#include <iomanip>
#include <limits>
#include <modules/newhorizons/util/imagesequencer.h>
#include <ghoul/misc/dictionary.h>
#include <map>
#include <string>
#include <vector>
namespace {
const std::string _loggerCat = "HongKangParser";
const char* keyTranslation = "DataInputTranslation";
const std::string PlaybookIdentifierName = "HongKang";
@@ -105,15 +112,17 @@ void HongKangParser::findPlaybookSpecifiedTarget(std::string line, std::string&
bool HongKangParser::create() {
//check input for errors.
bool hasObserver = SpiceManager::ref().hasNaifId(_spacecraft);
if (!hasObserver){
LERROR("SPICE navigation system has no pooled observer: '" << _spacecraft << "' in kernel" <<
"Please check that all necessary kernels are loaded"<<
"along with correct modfile definition.");
return hasObserver;
if (!hasObserver) {
throw ghoul::RuntimeError(
"SPICE has no observer: '" + _spacecraft + "' in kernel pool",
"HongKangParser"
);
}
if (_potentialTargets.size() == 0){
LERROR("In order to find targeting from event file user has to provide list of potential targets "
<< "please check modfile");
if (_potentialTargets.size() == 0) {
throw ghoul::RuntimeError(
"List of potential target is missing in order to parse the event file",
"HongKangParser"
);
}
if (size_t position = _fileName.find_last_of(".") + 1){
@@ -121,12 +130,13 @@ bool HongKangParser::create() {
std::string extension = ghoul::filesystem::File(_fileName).fileExtension();
if (extension == "txt") {// Hong Kang. pre-parsed playbook
LINFO("Using Preparsed Playbook V9H");
std::ifstream file(_fileName , std::ios::binary);
if (!file.good()){
LERROR("Failed to open event file '" << _fileName << "'");
return false;
}
std::ifstream file;
file.exceptions(std::ofstream::failbit | std::ofstream::badbit);
//std::ifstream file(_fileName , std::ios::binary);
//if (!file.good()){
// LERROR("Failed to open event file '" << _fileName << "'");
// return false;
//}
std::string line = "";
double shutter = 0.01;
modules/newhorizons/util/hongkangparser.h
+31 -47
View File
@@ -1,48 +1,39 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __HONGKANGPARSER_H__
#define __HONGKANGPARSER_H__
#ifndef __OPENSPACE_MODULE_NEWHORIZONS___HONGKANGPARSER___H__
#define __OPENSPACE_MODULE_NEWHORIZONS___HONGKANGPARSER___H__
#include <modules/newhorizons/util/imagesequencer.h>
#include <modules/newhorizons/util/sequenceparser.h>
#include <ghoul/misc/dictionary.h>
#include <map>
#include <string>
#include <vector>
namespace openspace {
class HongKangParser : public SequenceParser {
public:
HongKangParser();
HongKangParser(std::string name, std::string fileName,
std::string spacecraft,
ghoul::Dictionary dictionary,
std::vector<std::string> potentialTargets);
HongKangParser(std::string name, std::string fileName, std::string spacecraft,
ghoul::Dictionary dictionary, std::vector<std::string> potentialTargets);
bool create() override;
void findPlaybookSpecifiedTarget(std::string line, std::string& target);
@@ -52,16 +43,8 @@ private:
double getETfromMet(std::string timestr);
double getETfromMet(double met);
//Image createImage(double startTime,
// double stopTime,
// std::vector<std::string> instr,
// std::string targ,
// std::string pot);
bool augmentWithSpice(Image& image,
std::string spacecraft,
std::vector<std::string> payload,
std::vector<std::string> potentialTargets);
bool augmentWithSpice(Image& image, std::string spacecraft,
std::vector<std::string> payload, std::vector<std::string> potentialTargets);
std::string _defaultCaptureImage;
double _metRef = 299180517;
@@ -73,5 +56,6 @@ private:
std::vector<std::string> _potentialTargets;
};
}
#endif //__HONGKANGPARSER_H__
} // namespace openspace
#endif //__OPENSPACE_MODULE_NEWHORIZONS___HONGKANGPARSER___H__
modules/newhorizons/util/imagesequencer.cpp
+12
View File
@@ -36,6 +36,18 @@
#include <iomanip>
#include <limits>
#include <ghoul/opengl/ghoul_gl.h>
#include <openspace/util/powerscaledcoordinate.h>
#include <openspace/util/powerscaledscalar.h>
#include <openspace/util/timerange.h>
#include <unordered_map>
#include <map>
#include <vector>
namespace {
const std::string _loggerCat = "ImageSequencer";
}
modules/newhorizons/util/imagesequencer.h
+23 -28
View File
@@ -22,36 +22,33 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __IMAGESEQUENCER_H__
#define __IMAGESEQUENCER_H__
// open space includes
#include <ghoul/opengl/ghoul_gl.h>
#include <openspace/util/powerscaledcoordinate.h>
#include <openspace/util/powerscaledscalar.h>
#include <openspace/util/timerange.h>
#include <unordered_map>
#include <map>
#include <vector>
#ifndef __OPENSPACE_MODULE_NEWHORIZONS___IMAGESEQUENCER___H__
#define __OPENSPACE_MODULE_NEWHORIZONS___IMAGESEQUENCER___H__
#include <modules/newhorizons/util/sequenceparser.h>
#include <map>
#include <string>
#include <utility>
#include <vector>
namespace openspace {
/**
* The ImageSequencer singleton main function is to manage the timekeeping and
* distribution of large image data-sets across all openspace renderable instances,
* both for past and future unmanned-spacecraft missions. To load the instance with
* data the client must provide a parser inherited from the abstract base class
* SequenceParser. Hence, there is no restriction imposed on data input, whether its
* data in the form of existing images or in the form of a planned observation schedule.
* Notably, in order for the sequencer to function the client must provide or write a
* parser that fills the ImageSequencers private members.
* \see SequenceParser
* \see ImageSequencer::runSequenceParser(SequenceParser* parser)
* std::map<std::string, bool>
*/
class SequenceParser;
/**
* The ImageSequencer singleton main function is to manage the timekeeping and
* distribution of large image data-sets across all openspace renderable instances,
* both for past and future unmanned-spacecraft missions. To load the instance with
* data the client must provide a parser inherited from the abstract base class
* SequenceParser. Hence, there is no restriction imposed on data input, whether its
* data in the form of existing images or in the form of a planned observation schedule.
* Notably, in order for the sequencer to function the client must provide or write a
* parser that fills the ImageSequencers private members.
* \see SequenceParser
* \see ImageSequencer::runSequenceParser(SequenceParser* parser)
* std::map<std::string, bool>
*/
class ImageSequencer {
public:
ImageSequencer();
@@ -204,6 +201,4 @@ private:
} // namespace openspace
#endif // __IMAGESEQUENCER_H__
#endif // __OPENSPACE_MODULE_NEWHORIZONS___IMAGESEQUENCER___H__
modules/newhorizons/util/instrumentdecoder.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include <ghoul/misc/assert.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/misc/dictionary.h>
namespace {
const std::string _loggerCat = "InstrumentDecoder";
const char* keyDetector = "DetectorType";
modules/newhorizons/util/instrumentdecoder.h
+3 -5
View File
@@ -22,13 +22,11 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __INSTRUMENTDECODER_H__
#define __INSTRUMENTDECODER_H__
#ifndef __OPENSPACE_MODULE_NEWHORIZONS___INSTRUMENTDECODER___H__
#define __OPENSPACE_MODULE_NEWHORIZONS___INSTRUMENTDECODER___H__
#include <modules/newhorizons/util/decoder.h>
#include <openspace/util/powerscaledcoordinate.h>
namespace openspace {
class InstrumentDecoder : public Decoder {
@@ -45,4 +43,4 @@ private:
} // namespace openspace
#endif // __INSTRUMENTDECODER_H__
#endif // __OPENSPACE_MODULE_NEWHORIZONS___INSTRUMENTDECODER___H__
modules/newhorizons/util/instrumenttimesparser.cpp
+8
View File
@@ -36,6 +36,14 @@
#include <sstream>
#include <modules/newhorizons/util/instrumenttimesparser.h>
#include <modules/newhorizons/util/imagesequencer.h>
#include <ghoul/misc/dictionary.h>
#include <map>
#include <string>
#include <vector>
namespace {
const std::string _loggerCat = "InstrumentTimesParser";
modules/newhorizons/util/instrumenttimesparser.h
+30 -33
View File
@@ -1,42 +1,37 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __INSTRUMENTTIMESPARSER_H__
#define __INSTRUMENTTIMESPARSER_H__
#ifndef __OPENSPACE_MODULE_NEWHORIZONS___INSTRUMENTTIMESPARSER___H__
#define __OPENSPACE_MODULE_NEWHORIZONS___INSTRUMENTTIMESPARSER___H__
#include <modules/newhorizons/util/imagesequencer.h>
#include <modules/newhorizons/util/sequenceparser.h>
#include <ghoul/misc/dictionary.h>
#include <map>
#include <string>
#include <vector>
#include <regex>
namespace openspace {
class InstrumentTimesParser : public SequenceParser{
class InstrumentTimesParser : public SequenceParser {
public:
InstrumentTimesParser(
const std::string& name,
@@ -61,5 +56,7 @@ private:
std::string _sequenceID;
bool _badDecoding;
};
}
#endif //__INSTRUMENTTIMESPARSER_H__
} // namespace openspace
#endif //__OPENSPACE_MODULE_NEWHORIZONS___INSTRUMENTTIMESPARSER___H__
modules/newhorizons/util/labelparser.cpp
+6
View File
@@ -39,6 +39,12 @@
#include <iomanip>
#include <limits>
#include <modules/newhorizons/util/imagesequencer.h>
#include <map>
#include <string>
#include <vector>
namespace {
const std::string _loggerCat = "LabelParser";
const char* keySpecs = "Read";
modules/newhorizons/util/labelparser.h
+28 -30
View File
@@ -1,36 +1,32 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __LABELPARSER_H__
#define __LABELPARSER_H__
#ifndef __OPENSPACE_MODULE_NEWHORIZONS___LABELPARSER___H__
#define __OPENSPACE_MODULE_NEWHORIZONS___LABELPARSER___H__
#include <modules/newhorizons/util/imagesequencer.h>
#include <modules/newhorizons/util/sequenceparser.h>
#include <map>
#include <string>
#include <vector>
namespace openspace {
class LabelParser : public SequenceParser{
@@ -73,5 +69,7 @@ private:
std::string _sequenceID;
bool _badDecoding;
};
}
#endif //__LABELPARSER_H__
} // namespace openspace
#endif //__OPENSPACE_MODULE_NEWHORIZONS___LABELPARSER___H__
modules/newhorizons/util/projectioncomponent.cpp
+1
View File
@@ -34,6 +34,7 @@
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/io/texture/texturereader.h>
#include <ghoul/misc/dictionary.h>
#include <ghoul/opengl/framebufferobject.h>
#include <ghoul/opengl/textureconversion.h>
#include <ghoul/opengl/textureunit.h>
modules/newhorizons/util/projectioncomponent.h
+6 -4
View File
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __PROJECTIONCOMPONENT_H__
#define __PROJECTIONCOMPONENT_H__
#ifndef __OPENSPACE_MODULE_NEWHORIZONS___PROJECTIONCOMPONENT___H__
#define __OPENSPACE_MODULE_NEWHORIZONS___PROJECTIONCOMPONENT___H__
#include <openspace/properties/propertyowner.h>
@@ -35,10 +35,12 @@
#include <openspace/properties/vector/ivec2property.h>
#include <openspace/util/spicemanager.h>
#include <ghoul/misc/dictionary.h>
#include <ghoul/opengl/texture.h>
namespace ghoul {
class Dictionary;
namespace opengl {
class ProgramObject;
@@ -155,4 +157,4 @@ protected:
} // namespace openspace
#endif // __PROJECTIONCOMPONENT_H__
#endif // __OPENSPACE_MODULE_NEWHORIZONS___PROJECTIONCOMPONENT___H__
modules/newhorizons/util/scannerdecoder.cpp
+2
View File
@@ -24,6 +24,8 @@
#include <modules/newhorizons/util/scannerdecoder.h>
#include <ghoul/misc/dictionary.h>
namespace {
const std::string _loggerCat = "ScannerDecoder";
}
modules/newhorizons/util/scannerdecoder.h
+3 -4
View File
@@ -22,11 +22,10 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __SCANNERDECODER_H__
#define __SCANNERDECODER_H__
#ifndef __OPENSPACE_MODULE_NEWHORIZONS___SCANNERDECODER___H__
#define __OPENSPACE_MODULE_NEWHORIZONS___SCANNERDECODER___H__
#include <modules/newhorizons/util/decoder.h>
#include <openspace/util/powerscaledcoordinate.h>
namespace openspace {
@@ -45,4 +44,4 @@ private:
} // namespace openspace
#endif // __SCANNERDECODER_H__
#endif // __OPENSPACE_MODULE_NEWHORIZONS___SCANNERDECODER___H__
modules/newhorizons/util/sequenceparser.cpp
-1
View File
@@ -26,7 +26,6 @@
#include <openspace/engine/openspaceengine.h>
#include <openspace/util/spicemanager.h>
#include <modules/newhorizons/util/decoder.h>
#include <ghoul/logging/logmanager.h>
modules/newhorizons/util/sequenceparser.h
+26 -27
View File
@@ -1,34 +1,33 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __SEQUENCEPARSER_H__
#define __SEQUENCEPARSER_H__
#ifndef __OPENSPACE_MODULE_NEWHORIZONS___SEQUENCEPARSER___H__
#define __OPENSPACE_MODULE_NEWHORIZONS___SEQUENCEPARSER___H__
#include <openspace/network/networkengine.h>
#include <openspace/util/timerange.h>
#include <modules/newhorizons/util/decoder.h>
#include <openspace/util/timerange.h>
#include <map>
#include <memory>
@@ -75,4 +74,4 @@ protected:
} // namespace openspace
#endif //__SEQUENCEPARSER_H__
#endif //__OPENSPACE_MODULE_NEWHORIZONS___SEQUENCEPARSER___H__
modules/newhorizons/util/targetdecoder.cpp
+2
View File
@@ -24,6 +24,8 @@
#include <modules/newhorizons/util/targetdecoder.h>
#include <ghoul/misc/dictionary.h>
namespace {
const std::string _loggerCat = "TargetDecoder";
}
modules/newhorizons/util/targetdecoder.h
+3 -5
View File
@@ -22,13 +22,11 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __TARGETDECODER_H__
#define __TARGETDECODER_H__
#ifndef __OPENSPACE_MODULE_NEWHORIZONS___TARGETDECODER___H__
#define __OPENSPACE_MODULE_NEWHORIZONS___TARGETDECODER___H__
#include <modules/newhorizons/util/decoder.h>
#include <openspace/util/powerscaledcoordinate.h>
namespace openspace {
class TargetDecoder : public Decoder {
@@ -43,4 +41,4 @@ private:
} // namespace openspace
#endif // __TARGETDECODER_H__
#endif // __OPENSPACE_MODULE_NEWHORIZONS___TARGETDECODER___H__