Initialize monitor in a Discovery Server network (#91)

* Initialize discovery server dialog

Signed-off-by: RaulSanchez <[email protected]>

* Update init a Discovery Server monitor API

Signed-off-by: RaulSanchez <[email protected]>

* Add IPv6 support

Signed-off-by: RaulSanchez <[email protected]>

* Regex for matching any string

Signed-off-by: RaulSanchez <[email protected]>

* Separate initialize monitor dialogs

Signed-off-by: RaulSanchez <[email protected]>

* Uncrustify

Signed-off-by: RaulSanchez <[email protected]>

* Applied suggested changes

Signed-off-by: RaulSanchez <[email protected]>

* Added discovery server monitor error type

Signed-off-by: RaulSanchez <[email protected]>

* Handle dialog errors

Signed-off-by: RaulSanchez <[email protected]>

* Supported transports retrieved from backend

Signed-off-by: RaulSanchez <[email protected]>

* Handle duplicated locators

Signed-off-by: RaulSanchez <[email protected]>

* Uncrustify

Signed-off-by: RaulSanchez <[email protected]>

* Remove windows warning

Signed-off-by: RaulSanchez <[email protected]>

* Uncrustify 2

Signed-off-by: RaulSanchez <[email protected]>

* Fix find duplicated locators

Signed-off-by: RaulSanchez <[email protected]>

* Applied suggested changes

Signed-off-by: RaulSanchez <[email protected]>

* Fixed discovery server guid regex

Signed-off-by: RaulSanchez <[email protected]>

Author: rsanchez15

include/fastdds_monitor/Controller.h

@@ -27,8 +27,9 @@ class Engine;
 
 enum class ErrorType : int
 {
-    GENERIC = 0,        //! Generic error, just show the message
-    INIT_MONITOR = 1    //! Error in @c init_monitor. Reopen the @c init_monitor dialog
+    GENERIC = 0,            //! Generic error, just show the message
+    INIT_MONITOR = 1,       //! Error in @c init_monitor. Reopen the @c init dds monitor dialog
+    INIT_DS_MONITOR = 2     //! Error in @c init_monitor. Reopen the @c init discovery server monitor dialog
 };
 
 /**
@@ -63,9 +64,10 @@ public slots:
     void init_monitor(
             int domain);
 
-    //! Slot called by init a monitor with a list of locators
+    //! Slot called when initializing a monitor for a Discovery Server network
     void init_monitor(
-            QString locators);
+            QString discovery_server_guid_prefix,
+            QString discovery_server_locators);
 
     //! Slot called when a Host entity is pressed
     void host_click(
@@ -188,6 +190,9 @@ public slots:
             QStringList chartbox_names,
             QStringList label_names);
 
+    //! Retrive a string list containing the transport protocols supported by the Statistics Backend Discovery Server.
+    QStringList ds_supported_transports();
+
 signals:
 
     //! Signal to show the Error Dialog

include/fastdds_monitor/Engine.h

@@ -96,7 +96,8 @@ class Engine : public QQmlApplicationEngine
      * @param domain number of the domain
      */
     void init_monitor(
-            QString locators);
+            QString discovery_server_guid_prefix,
+            QString discovery_server_locators);
 
     /////
     // PHYSICAL PARTITION
@@ -377,6 +378,9 @@ class Engine : public QQmlApplicationEngine
             const QStringList& chartbox_names,
             const QStringList& label_names);
 
+    //! Retrive a string vector containing the transport protocols supported by the Statistics Backend Discovery Server.
+    std::vector<std::string> ds_supported_transports();
+
 signals:
 
     /**

include/fastdds_monitor/backend/SyncBackendConnection.h

@@ -91,7 +91,8 @@ class SyncBackendConnection
      * @return EntityId of the new Domain Entity created
      */
     EntityId init_monitor(
-            QString locators);
+            std::string discovery_server_guid_prefix,
+            std::string discovery_server_locators);
 
     /////
     // Information query functions
@@ -196,6 +197,9 @@ class SyncBackendConnection
     std::string get_data_kind_units(
             const DataKind data_kind);
 
+    //! Retrive a string vector containing the transport protocols supported by the Statistics Backend Discovery Server.
+    std::vector<std::string> ds_supported_transports();
+
 protected:
 
     void change_unit_magnitude(

include/fastdds_monitor/utils.h

@@ -62,6 +62,10 @@ std::string now(
 std::string double_to_string(
         const double& d);
 
+//! Cast a std::vector<std::string> to QStringList
+QStringList to_QStringList(
+        const std::vector<std::string>& vector);
+
 } //namespace utils
 
 #endif // _EPROSIMA_FASTDDS_MONITOR_UTILS_H

qml.qrc

@@ -15,6 +15,7 @@
         <file>imports/Theme/Theme.qml</file>
         <file>qml/AboutDialog.qml</file>
         <file>qml/AdaptiveComboBox.qml</file>
+        <file>qml/AdaptiveMenu.qml</file>
         <file>qml/ChangeAliasDialog.qml</file>
         <file>qml/ChartsLayout.qml</file>
         <file>qml/CustomLegend.qml</file>
@@ -33,6 +34,7 @@
         <file>qml/IconsVBar.qml</file>
         <file>qml/IconSVG.qml</file>
         <file>qml/InfoToolTip.qml</file>
+        <file>qml/InitDSMonitorDialog.qml</file>
         <file>qml/InitMonitorDialog.qml</file>
         <file>qml/IssuesPanel.qml</file>
         <file>qml/IssueView.qml</file>

qml/AdaptiveMenu.qml

@@ -0,0 +1,16 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+
+Menu {
+    id: adaptiveMenu
+    width: {
+        var result = 0;
+        var padding = 0;
+        for (var i = 0; i < count; ++i) {
+            var item = itemAt(i);
+            result = Math.max(item.contentItem.implicitWidth, result);
+            padding = Math.max(item.padding, padding);
+        }
+        return result + padding * 2;
+    }
+}

qml/ErrorDialog.qml

@@ -26,6 +26,8 @@ MessageDialog {
     onAccepted: {
         if (errorType == 1) {           // INIT_MONITOR
             dialogInitMonitor.open()
+        } else if (errorType == 2) {    // INIT_DS_MONITOR
+            dialogDSInitMonitor.open()
         }
     }
 }