Merge branch 'NewHorizonsMerge' of openspace.itn.liu.se:/openspace into NewHorizonsMerge

Conflicts:
	src/rendering/renderengine.cpp

include/openspace/rendering/renderabletrail.h

@@ -63,6 +63,7 @@ private:
     properties::Vec3Property _lineColor;
     properties::FloatProperty _lineFade;
     properties::FloatProperty _lineWidth;
+	properties::BoolProperty _showTimestamps;
 
     ghoul::opengl::ProgramObject* _programObject;
     bool _programIsDirty;

include/openspace/util/labelparser.h

@@ -56,6 +56,7 @@ private:
 			            std::string path);
 
 	std::string decode(std::string line);
+	std::string encode(std::string line);
 
 	bool augmentWithSpice(Image& image, 
 			                std::string spacecraft, 

include/openspace/util/spicemanager.h

@@ -630,6 +630,22 @@ public:
 	 */
 	bool getFieldOfView(int instrument, std::string& fovShape, std::string& frameName,
 		glm::dvec3& boresightVector, std::vector<glm::dvec3>& bounds) const;
+
+	/**
+	* This function adds a frame to a body 
+	* \param body - the name of the body
+	* \param frame - the name of the frame
+	* \return false if the arguments are empty
+	*/
+	bool addFrame(const std::string body, const std::string frame);
+
+	/**
+	* This function returns the frame of a body if defined, otherwise it returns 
+	* IAU_ + body (most frames are known by the International Astronomical Union)
+	* \param body - the name of the body
+	* \return  the frame of the body
+	*/
+	std::string frameFromBody(const std::string body) const;
     
     /**
      * This method checks if one of the previous SPICE methods has failed. If it has, the
@@ -673,6 +689,8 @@ private:
 	std::map<int, std::vector< std::pair<double, double> > > _spkIntervals;
 	std::map<int, std::set<double> > _ckCoverageTimes;
 	std::map<int, std::set<double> > _spkCoverageTimes;
+	// Vector of pairs: Body, Frame
+	std::vector< std::pair<std::string, std::string> > _frameByBody;
 	
 	const static bool _showErrors = false;