P6E: independent multi-IED engineering workspaces

.github/workflows/ied-simulator-qt.yml

@@ -268,6 +268,19 @@ jobs:
           apps/ied_simulator/qml/GooseWorkspace.qml
           apps/ied_simulator/qml/CommissioningWorkspace.qml
 
+      - name: P6E Multi-IED workspace authority contract
+        run: >-
+          python3 apps/ied_simulator/test_multi_ied_workspace.py
+          apps/ied_simulator/src/IedBrowserFleetController.cpp
+          apps/ied_simulator/src/IedBrowserFleetController.hpp
+          apps/ied_simulator/qml/Main.qml
+          apps/ied_simulator/qml/IedBrowserWorkspace.qml
+          apps/ied_simulator/qml/FileWorkspace.qml
+          apps/ied_simulator/qml/FleetGlobalDataPane.qml
+          apps/ied_simulator/qml/BrowserGlobalDataPane.qml
+          apps/ied_simulator/src/SclWorkspaceController_part_01.inc
+          apps/ied_simulator/src/MmsReportController.cpp
+
       - name: P6D passive MMS capture and decoder contract
         run: >-
           python3 apps/ied_simulator/test_passive_mms_sniffer.py

apps/ied_simulator/CMakeLists.txt

@@ -70,6 +70,8 @@ qt_add_qml_module(arstack_ied_simulator
         src/MmsControlController.hpp
         src/IedBrowserSessionController.cpp
         src/IedBrowserSessionController.hpp
+        src/IedBrowserFleetController.cpp
+        src/IedBrowserFleetController.hpp
         src/MmsReportController.cpp
         src/MmsReportController.hpp
         src/MmsSettingGroupPolicy.hpp
@@ -103,6 +105,7 @@ qt_add_qml_module(arstack_ied_simulator
         qml/BrowserDataSetPane.qml
         qml/BrowserGoosePane.qml
         qml/BrowserGlobalDataPane.qml
+        qml/FleetGlobalDataPane.qml
         qml/BrowserControlDialog.qml
         qml/BrowserDataSetAuthoringDialog.qml
         qml/BrowserReportAuthoringDialog.qml
@@ -355,6 +358,10 @@ add_executable(ied_browser_session_qa
     src/ied_browser_session_qa.cpp
     src/IedBrowserSessionController.cpp
     src/IedBrowserSessionController.hpp
+    src/IedBrowserFleetController.cpp
+    src/IedBrowserFleetController.hpp
+    src/SclWorkspaceController.cpp
+    src/SclWorkspaceController.hpp
     src/MmsLiveTreeModel.cpp
     src/MmsLiveTreeModel.hpp
     src/IedEngineeringContextController.cpp

apps/ied_simulator/qml/BrowserGlobalDataPane.qml

@@ -13,13 +13,31 @@ Rectangle {
 
     readonly property int maximumEntries: 256
     readonly property int watchCount: watchModel.count
+    signal watchSnapshotChanged()
     property int boundContextGeneration: context.contextGeneration
     property string statusMessage: "Add DataAttributes, DataSets, Reports, or configured GOOSE from the Browser."
 
     color: theme.background
 
     ListModel { id: watchModel }
 
+    function snapshotRows() {
+        var entries = []
+        for (var i = 0; i < watchModel.count; ++i) {
+            var row = watchModel.get(i)
+            entries.push({
+                "kind": row.kind,
+                "reference": row.reference,
+                "detail": row.detail,
+                "value": row.value,
+                "quality": row.quality,
+                "timestamp": row.timestamp,
+                "status": row.status
+            })
+        }
+        return entries
+    }
+
     function indexFor(kind, reference) {
         for (var i = 0; i < watchModel.count; ++i) {
             var row = watchModel.get(i)
@@ -102,13 +120,15 @@ Rectangle {
         if (row < 0 || row >= watchModel.count)
             return
         watchModel.remove(row)
+        root.watchSnapshotChanged()
         statusMessage = watchModel.count > 0
             ? String(watchModel.count) + " monitored object(s)."
             : "Global Data is empty."
     }
 
     function clearAll() {
         watchModel.clear()
+        root.watchSnapshotChanged()
         statusMessage = "Global Data cleared."
     }
 
@@ -178,6 +198,7 @@ Rectangle {
                 watchModel.setProperty(i, "status", context.online ? "CONFIGURED" : "OFFLINE")
             }
         }
+        root.watchSnapshotChanged()
     }
 
     Connections {

apps/ied_simulator/qml/FileWorkspace.qml

@@ -16,6 +16,7 @@ Item {
     property int viewIndex: 0
 
     signal browserRequested()
+    signal openSourceRequested(url fileUrl)
     signal discoverRequested(string host, int port)
     signal endpointRequested(string host, int port)
     signal simulatorRequested()
@@ -32,10 +33,7 @@ Item {
         title: "Open IEC 61850 engineering model"
         fileMode: FileDialog.OpenFile
         nameFilters: ["IEC 61850 engineering files (*.scl *.cid *.scd *.iid *.icd)", "All files (*)"]
-        onAccepted: {
-            if (workspace.openFile(selectedFile))
-                root.browserRequested()
-        }
+        onAccepted: root.openSourceRequested(selectedFile)
     }
 
     Dialog {
@@ -164,14 +162,14 @@ Item {
                     theme: root.theme
                     text: "Open SCL"
                     primary: true
-                    enabled: !workspace.busy && !browserSession.configurationLocked
+                    enabled: !workspace.busy
                     onClicked: openDialog.open()
                 }
 
                 ActionButton {
                     theme: root.theme
                     text: "Discover IED"
-                    enabled: !browserSession.configurationLocked
+                    enabled: true
                     onClicked: discoverDialog.open()
                 }
 
@@ -245,7 +243,7 @@ Item {
                                     theme: root.theme
                                     text: "Open SCL"
                                     primary: true
-                                    enabled: !workspace.busy && !browserSession.configurationLocked
+                                    enabled: !workspace.busy
                                     onClicked: openDialog.open()
                                 }
                             }
@@ -271,7 +269,7 @@ Item {
                                 ActionButton {
                                     theme: root.theme
                                     text: "Discover IED"
-                                    enabled: !browserSession.configurationLocked
+                                    enabled: true
                                     onClicked: discoverDialog.open()
                                 }
                             }
@@ -441,10 +439,8 @@ Item {
                                             hoverEnabled: true
                                             enabled: hardening.recentResourceExists(index)
                                                      && !workspace.busy
-                                                     && !browserSession.configurationLocked
                                             onClicked: {
-                                                if (workspace.openFile(hardening.recentResourceUrl(index)))
-                                                    root.browserRequested()
+                                                root.openSourceRequested(hardening.recentResourceUrl(index))
                                             }
                                         }
                                     }
@@ -532,7 +528,7 @@ Item {
                                             id: discoveredMouse
                                             anchors.fill: parent
                                             hoverEnabled: true
-                                            enabled: !browserSession.configurationLocked
+                                            enabled: true
                                             onClicked: root.endpointRequested(
                                                 hardening.recentDiscoveredIedHost(index),
                                                 hardening.recentDiscoveredIedPort(index))