Merge branch 'develop' into NewHorizonsMerge

include/openspace/engine/openspaceengine.h

@@ -69,6 +69,7 @@ public:
     interaction::InteractionHandler* interactionHandler();
     RenderEngine* renderEngine();
 	scripting::ScriptEngine* scriptEngine();
+    NetworkEngine* networkEngine();
 	LuaConsole* console();
 
 	gui::GUI* gui();

include/openspace/network/networkengine.h

@@ -25,17 +25,50 @@
 #ifndef __NETWORKENGINE_H__
 #define __NETWORKENGINE_H__
 
+#include <cstdint>
+#include <map>
 #include <string>
+#include <vector>
 
 namespace openspace {
 
 class NetworkEngine {
 public:
-    NetworkEngine() = default;
+    typedef uint16_t MessageIdentifier;
 
+    NetworkEngine();
+
+    // Receiving messages
     bool handleMessage(const std::string& message);
 
-    void sendStatusMessage();
+    // Sending messages
+    void publishStatusMessage();
+    void publishIdentifierMappingMessage();
+    void publishMessage(MessageIdentifier identifier, std::vector<char> message);
+    void sendMessages();
+
+    // Initial Connection Messages
+    void setInitialConnectionMessage(MessageIdentifier identifier, std::vector<char> message);
+    void sendInitialInformation();
+
+    // Background
+    MessageIdentifier identifier(std::string name);
+private:
+    std::map<MessageIdentifier, std::string> _identifiers;
+    MessageIdentifier _lastAssignedIdentifier;
+
+    struct Message {
+        MessageIdentifier identifer;
+        std::vector<char> body;
+    };
+    std::vector<Message> _messagesToSend;
+
+    std::vector<Message> _initialConnectionMessages;
+
+
+
+    MessageIdentifier _statusMessageIdentifier;
+    MessageIdentifier _identifierMappingIdentifier;
 };
 
 } // namespace openspace

include/openspace/util/hongkangparser.h

@@ -25,7 +25,7 @@
 
 #ifndef __HONGKANGPARSER_H__
 #define __HONGKANGPARSER_H__
-#include <openspace/util/ImageSequencer2.h>
+#include <openspace/util/imagesequencer2.h>
 #include <openspace/util/sequenceparser.h>
 
 #include <map>
@@ -65,6 +65,7 @@ namespace openspace {
 			                  std::string spacecraft, 
 							  std::vector<std::string> payload, 
 							  std::vector<std::string> potentialTargets);
+        void sendPlaybookInformation();
 
 		std::string _defaultCaptureImage;
 		double _metRef = 299180517;

include/openspace/util/imagesequencer2.h

@@ -122,11 +122,11 @@ public:
 	 * makes the request. If an instance is not registered in the class then the singleton
 	 * returns false and no projections will occur. 
 	 */
-	bool ImageSequencer2::getImagePaths(std::vector<Image>& captures, 
+	bool getImagePaths(std::vector<Image>& captures, 
 		                                std::string projectee, 
 										std::string instrumentID);
 
-	bool ImageSequencer2::getImagePaths(std::vector<Image>& captures,
+	bool getImagePaths(std::vector<Image>& captures,
 		                                std::string projectee);
 
 	/*

include/openspace/util/labelparser.h

@@ -22,10 +22,9 @@
 * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
 ****************************************************************************************/
 
-
 #ifndef __LABELPARSER_H__
 #define __LABELPARSER_H__
-#include <openspace/util/ImageSequencer2.h>
+#include <openspace/util/imagesequencer2.h>
 #include <openspace/util/sequenceparser.h>
 
 #include <map>

include/openspace/version.h

@@ -23,6 +23,6 @@
  ****************************************************************************************/
 
 #define OPENSPACE_VERSION_MAJOR 0
-#define OPENSPACE_VERSION_MINOR 0
-#define OPENSPACE_VERSION_REVISION 3
-#define OPENSPACE_VERSION_STRING "prerelease-3"
+#define OPENSPACE_VERSION_MINOR 1
+#define OPENSPACE_VERSION_REVISION 0
+#define OPENSPACE_VERSION_STRING "prerelease-4"