Merge branch 'feature/graph_views' into feature/domain_view

eProsima · Sep 20, 2023 · 7f83569 · 7f83569
2 parents b1e29b5 + ccaa137
commit 7f83569
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/qml.qrc b/qml.qrc
@@ -62,6 +62,7 @@
         <file>qml/StatusPanel.qml</file>
         <file>qml/StatusView.qml</file>
         <file>qml/SummaryView.qml</file>
+        <file>qml/TabLayout.qml</file>
         <file>qtquickcontrols2.conf</file>
     </qresource>
     <qresource prefix="/resources/images">

diff --git a/qml/ChartsLayout.qml b/qml/ChartsLayout.qml
@@ -119,6 +119,7 @@ Rectangle {
 
                     Rectangle {
                         anchors.fill: parent
+                        anchors.topMargin: 1
                         anchors.rightMargin: 2
                         anchors.leftMargin: 2
                         radius: width / 2
@@ -134,6 +135,13 @@ Rectangle {
                         color: gridViewScrollBar.pressed ? Theme.lightGrey : Theme.grey
                     }
                 }
+
+                Rectangle {
+                    anchors.top: parent.top
+                    height: 1
+                    width: parent.width
+                    color: gridViewScrollBar.pressed ? Theme.lightGrey : Theme.grey
+                }
             }
 
             onCountChanged: {

diff --git a/qml/Panels.qml b/qml/Panels.qml
@@ -45,8 +45,8 @@ RowLayout {
         }
     }
     onChangeChartboxLayout: {
-        chartsLayout.boxesPerRow = chartsPerRow
-        chartsLayout.exitFullScreen()
+        tabs.chartsLayout_boxesPerRow(chartsPerRow)
+        tabs.chartsLayout_exitFullScreen()
     }
 
     IconsVBar {
@@ -92,8 +92,8 @@ RowLayout {
             onExplorerEntityInfoChanged: panels.explorerEntityInfoChanged(status)
         }
 
-        ChartsLayout {
-            id: chartsLayout
+        TabLayout {
+            id: tabs
             SplitView.fillWidth: true
             clip: true
 
@@ -115,19 +115,19 @@ RowLayout {
     }
 
     function createHistoricChart(dataKind){
-        chartsLayout.createHistoricChart(dataKind)
+        tabs.chartsLayout_createHistoricChart(dataKind)
     }
 
     function createDynamicChart(dataKind, timeWindowSeconds, updatePeriod, maxPoints){
-        chartsLayout.createDynamicChart(dataKind, timeWindowSeconds, updatePeriod, maxPoints)
+        tabs.chartsLayout_createDynamicChart(dataKind, timeWindowSeconds, updatePeriod, maxPoints)
     }
 
     function createScheduleClear(entities, data, updateData, updateClear){
-        chartsLayout.createScheduleClear(entities, data, updateData, updateClear)
+        tabs.chartsLayout_createScheduleClear(entities, data, updateData, updateClear)
     }
 
     function saveAllCSV() {
-        chartsLayout.saveAllCSV()
+        tabs.chartsLayout_saveAllCSV()
     }
 
     function changeExplorerDDSEntities(status) {

diff --git a/qml/TabLayout.qml b/qml/TabLayout.qml
@@ -240,6 +240,7 @@ Item {
                                 text: "Chart View"
                                 onClicked: {
                                     if (!disable_chart_selection_)
+
                                     {
                                         tabLayout.tab_model_[current_]["title"] = "Chart View"
                                         if (stack.deep > 1)
@@ -248,6 +249,7 @@ Item {
                                         }
                                         stack.push(chartsLayout)
                                         disable_chart_selection_ = true
+
                                         refresh_layout(current_)
                                     }
                                 }
@@ -430,7 +432,7 @@ Item {
                     }
                 }
             }
-
+            
             refresh_layout(current_)
         }
         // update idx model