Simplyfying the Interfaces used by protocols

Details:
 - ProtocolInterface --> I_Protocol
 - Merging the DataExportingInterface and
   DataProcessingInterface into I_Protocol
 - Updating the MDP implementation
 - Updating the CMDP implementation
 - Updating the NetworkHandler implementation

Author: KGergo88

application/application.pro

@@ -72,19 +72,17 @@ HEADERS +=                                          \
     sources/configuration.hpp                       \
     sources/continous_measurement_data_protocol.hpp \
     sources/data_connection_interface.hpp           \
-    sources/data_exporting_interface.hpp            \
     sources/data_line.hpp                           \
     sources/data_point.hpp                          \
-    sources/data_processing_interface.hpp           \
     sources/diagram.hpp                             \
     sources/diagram_container.hpp                   \
     sources/global.hpp                              \
     sources/gui_signal_interface.hpp                \
+    sources/i_protocol.hpp                          \
     sources/main_window.hpp                         \
     sources/measurement_data_protocol.hpp           \
     sources/network_connection_interface.hpp        \
     sources/network_handler.hpp                     \
-    sources/protocol_interface.hpp                  \
     sources/ordered_dict.h                          \
     sources/serial_port.hpp
 

application/sources/continous_measurement_data_protocol.cpp

@@ -193,16 +193,28 @@ std::vector<DiagramSpecialized> ContinousMeasurementDataProtocol::ProcessData(st
     return assembled_diagrams;
 }
 
-bool ContinousMeasurementDataProtocol::CanThisFileBeProcessed(const std::string path_to_file)
+std::stringstream ContinousMeasurementDataProtocol::ExportData(const std::vector<DiagramSpecialized>& diagrams_to_export)
 {
-    bool bResult = false;
+    (void) diagrams_to_export;
+    throw("The Continous Measurement Protocol does not support exporting into files!");
+}
 
-    std::string file_extension = QFileInfo(QString::fromStdString(path_to_file)).completeSuffix().toStdString();
+bool ContinousMeasurementDataProtocol::CanThisFileBeProcessed(const std::string path_to_file)
+{
+    (void) path_to_file;
+    // The CMDP protocol does not support file processing
+    return false;
+}
 
-    if(std::string(Constants::native_file_extension) == file_extension)
-    {
-        bResult = true;
-    }
+bool ContinousMeasurementDataProtocol::CanThisFileBeExportedInto(const std::string path_to_file)
+{
+    (void) path_to_file;
+    // The CMDP protocol does not support storing into files
+    return false;
+}
 
-    return bResult;
+std::string ContinousMeasurementDataProtocol::GetSupportedFileType(void)
+{
+    // The CMDP protocol does not support any file types
+    return "";
 }

application/sources/continous_measurement_data_protocol.hpp

@@ -36,8 +36,7 @@
 #include <QFileInfo>
 
 #include "global.hpp"
-#include "protocol_interface.hpp"
-#include "data_processing_interface.hpp"
+#include "i_protocol.hpp"
 #include "diagram.hpp"
 
 
@@ -47,7 +46,7 @@
 
 
 
-class ContinousMeasurementDataProtocol : public DataProcessingInterface
+class ContinousMeasurementDataProtocol : public I_Protocol
 {
 public:
     ContinousMeasurementDataProtocol();
@@ -61,14 +60,15 @@ class ContinousMeasurementDataProtocol : public DataProcessingInterface
 
     virtual std::string GetProtocolName(void) override;
     virtual std::vector<DiagramSpecialized> ProcessData(std::istream& input_data) override;
-    virtual bool CanThisFileBeProcessed(const std::string path_to_file) override;
-    virtual std::string GetSupportedFileType(void) override {return Constants::native_file_extension;}
+    virtual std::stringstream ExportData(const std::vector<DiagramSpecialized>& diagrams_to_export);
+    virtual bool CanThisFileBeProcessed(const std::string path_to_file);
+    virtual bool CanThisFileBeExportedInto(const std::string path_to_file);
+    virtual std::string GetSupportedFileType(void);
 
 private:
     struct Constants
     {
         static constexpr char protocol_name[] = "Continous Measurement Data Protocol CMDP";
-        static constexpr char native_file_extension[] = "cmdp";
 
         enum class States : uint8_t
         {

application/sources/data_processing_interface.hpp

@@ -21,26 +21,27 @@
 
 
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "global.hpp"
-#include "protocol_interface.hpp"
 
 
 
-#ifndef DATA_EXPORTING_INTERFACE_HPP
-#define DATA_EXPORTING_INTERFACE_HPP
+#ifndef I_PROTOCOL_HPP
+#define I_PROTOCOL_HPP
 
 
 
-class DataExportingInterface : virtual ProtocolInterface
+class I_Protocol
 {
 public:
+    virtual std::string GetProtocolName(void) = 0;
+    virtual std::vector<DiagramSpecialized> ProcessData(std::istream& input_data) = 0;
     virtual std::stringstream ExportData(const std::vector<DiagramSpecialized>& diagrams_to_export) = 0;
+    virtual bool CanThisFileBeProcessed(const std::string path_to_file) = 0;
     virtual bool CanThisFileBeExportedInto(const std::string path_to_file) = 0;
     virtual std::string GetSupportedFileType(void) = 0;
-
 };
 
-#endif // DATA_EXPORTING_INTERFACE_HPP
+#endif // I_PROTOCOL_HPP

application/sources/data_exporting_interface.hpp renamed to application/sources/i_protocol.hpp

@@ -35,9 +35,7 @@
 #include <QFileInfo>
 
 #include "global.hpp"
-#include "protocol_interface.hpp"
-#include "data_processing_interface.hpp"
-#include "data_exporting_interface.hpp"
+#include "i_protocol.hpp"
 #include "diagram.hpp"
 
 
@@ -47,7 +45,7 @@
 
 
 
-class MeasurementDataProtocol : public DataProcessingInterface, public DataExportingInterface
+class MeasurementDataProtocol : public I_Protocol
 {
 public:
     MeasurementDataProtocol();

application/sources/measurement_data_protocol.hpp

@@ -29,7 +29,7 @@ bool NetworkHandler::Run(const std::string& new_port_name)
 {
     bool result = false;
 
-    if(network_connection_interface && data_processing_interface && diagram_collector && error_collector)
+    if(network_connection_interface && protocol_interface && diagram_collector && error_collector)
     {
         if(network_connection_interface->Open(new_port_name))
         {
@@ -60,7 +60,7 @@ void NetworkHandler::DataAvailable(std::istream& received_data)
 {
     if(diagram_collector)
     {
-        auto assembled_diagrams = data_processing_interface->ProcessData(received_data);
+        auto assembled_diagrams = protocol_interface->ProcessData(received_data);
 
         if(!assembled_diagrams.empty())
         {

application/sources/network_handler.cpp

@@ -30,7 +30,7 @@
 
 #include "global.hpp"
 #include "network_connection_interface.hpp"
-#include "data_processing_interface.hpp"
+#include "i_protocol.hpp"
 #include "diagram.hpp"
 
 
@@ -50,11 +50,11 @@ class NetworkHandler : public QObject
     using error_collector_type = std::function<void(const std::string&)>;
 
     NetworkHandler(NetworkConnectionInterface *new_network_connection_interface,
-                   DataProcessingInterface *new_data_processing_interface,
+                   I_Protocol *new_protocol_interface,
                    diagram_collector_type new_diagram_collector,
                    error_collector_type new_error_collector)
                               : network_connection_interface(new_network_connection_interface),
-                                data_processing_interface(new_data_processing_interface),
+                                protocol_interface(new_protocol_interface),
                                 diagram_collector(new_diagram_collector),
                                 error_collector(new_error_collector)
     {
@@ -63,9 +63,9 @@ class NetworkHandler : public QObject
             std::string errorMessage = "There was no network_connection_interface set in NetworkHandler::NetworkHandler!";
             throw errorMessage;
         }
-        if(!data_processing_interface)
+        if(!protocol_interface)
         {
-            std::string errorMessage = "There was no data_processor_interface set in NetworkHandler::NetworkHandler!";
+            std::string errorMessage = "There was no protocol_interface set in NetworkHandler::NetworkHandler!";
             throw errorMessage;
         }
         if(!diagram_collector)
@@ -98,7 +98,7 @@ private slots:
 
 private:
     NetworkConnectionInterface* network_connection_interface;
-    DataProcessingInterface* data_processing_interface;
+    I_Protocol* protocol_interface;
     diagram_collector_type diagram_collector;
     error_collector_type error_collector;
     std::string port_name;