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

include/openspace/properties/property.h

@@ -200,6 +200,20 @@ public:
 	 */
 	std::string guiName() const;
 
+	/**
+	 * Returns the description for this Property that contains all necessary information
+	 * required for creating a GUI representation. The format of the description is a
+	 * valid Lua table, i.e., it is surrounded by a pair of <code>{</code> and
+	 * <code>}</code> with key,value pairs between. Each value can either be a number, a
+	 * string, a bool, or another table. The general values that every Property must set
+	 * are: <code>Identifier</code>, <code>Name</code>, <code>Type</code>. All other
+	 * values are specific to the type. If a Property does not override this method, an
+	 * empty string is returned.
+	 * \return The descriptive text for the Property that can be used for constructing a
+	 * GUI representation
+	 */
+	virtual std::string description() const;
+
 	/**
 	 * Sets the identifier of the group that this Property belongs to. Property groups can
 	 * be used, for example, by GUI application to visually group different properties,
@@ -274,6 +288,20 @@ public:
     const ghoul::Dictionary& metaData() const;
 
 protected:
+	static const std::string IdentifierKey;
+	static const std::string NameKey;
+	static const std::string TypeKey;
+	static const std::string MetaDataKey;
+
+	/**
+	 * Creates the information for the <code>MetaData</code> key-part of the Lua
+	 * description for the Property. The result can be included as one key-value pair in
+	 * the description text generated by subclasses. Only the metadata curated by the
+	 * Property class is used in this method.
+	 * \return The metadata information text for the property
+	 */
+	std::string generateMetaDataDescription() const;
+
 	/**
 	 * This method must be called by all subclasses whenever the encapsulated value has
 	 * changed and a potential listener has to be informed.

include/openspace/rendering/renderengine.h

@@ -65,6 +65,8 @@ public:
 	void takeScreenshot();
 	void toggleVisualizeABuffer(bool b);
 
+	void toggleInfoText(bool b);
+
 	void setPerformanceMeasurements(bool performanceMeasurements);
 	bool doesPerformanceMeasurements() const;