Moved development related files to dev folder

Grouped development and monitoring files to special file within the sysui folder. All development visual elements will be loaded on demand: SystemMonitor from the settings page and the ToolBarMonitor. FpsMonitor is now part of the ToolbarMonitor. Change-Id: I7eeebf70c4c6046c989e99c16031ca2811bc781b Reviewed-by: Dominik Holland <[email protected]>
Kfanup · Dec 8, 2016 · fd18dcb · fd18dcb
1 parent 21066f7
commit fd18dcb
Show file tree

Hide file tree

Showing 14 changed files with 462 additions and 167 deletions.
diff --git a/sysui/Cloud/Settings/SettingsScreen.qml b/sysui/Cloud/Settings/SettingsScreen.qml
@@ -36,7 +36,6 @@ import controls 1.0
 import utils 1.0
 import service.settings 1.0
 import models 1.0
-import "SystemMonitor/"
 import utils 1.0
 
 UIElement {
@@ -86,11 +85,6 @@ UIElement {
     Loader {
         id: systemMonitorLoader
         active: false
-        sourceComponent: Component {
-            MainScreen {
-                id: systemMonitor
-                visible: false
-            }
-        }
+        source: "../../dev/SystemMonitor/MainScreen.qml"
     }
 }
diff --git a/sysui/Display.qml b/sysui/Display.qml
@@ -69,9 +69,7 @@ Item {
                     root.state = "statusBarExpanded"
                 }
             }
-            onTimePressAndHold: {
-                fpsMonitor.visible = !fpsMonitor.visible
-            }
+            onTimePressAndHold: toolBarMonitorLoader.active = !toolBarMonitorLoader.active
         }
 
         Item {
@@ -130,15 +128,15 @@ Item {
             }
         }
 
-        FpsMonitor {
-            id: fpsMonitor
-            x: 0
-            y: 0
-            width: Style.hspan(4)
-            height: Style.vspan(2)
-            visible: false
-            opacity: 0.8
+        Loader {
+            id: toolBarMonitorLoader
+            width: parent.width
+            height: 200
+            anchors.bottom: parent.bottom
+            active: false
+            source: "dev/ToolBarMonitor.qml"
         }
+
     }
 
     NotificationContainer {

diff --git a/sysui/FpsMonitor.qml b/sysui/FpsMonitor.qml
diff --git a/sysui/dev/CpuMonitor.qml b/sysui/dev/CpuMonitor.qml
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Neptune IVI UI.
+**
+** $QT_BEGIN_LICENSE:GPL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+** SPDX-License-Identifier: GPL-3.0
+**
+****************************************************************************/
+
+import QtQuick 2.1
+import QtApplicationManager 1.0
+
+
+MonitorPanel {
+    id: root
+
+    descriptionText: "CPU: "
+    middleText: "50%"
+    middleLine: 0.5
+
+    ListView {
+        id: graph
+        anchors.fill: parent
+
+        model: SystemMonitor
+        orientation: ListView.Horizontal
+        interactive: false
+
+        delegate: Item {
+            width: graph.width / graph.model.count
+            height: graph.height
+
+            Rectangle {
+                width: parent.width
+                height: 3
+                y: parent.height - model.cpuLoad * parent.height
+            }
+        }
+    }
+}
+
+
diff --git a/sysui/dev/FpsMonitor.qml b/sysui/dev/FpsMonitor.qml
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Neptune IVI UI.
+**
+** $QT_BEGIN_LICENSE:GPL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+** SPDX-License-Identifier: GPL-3.0
+**
+****************************************************************************/
+
+import QtQuick 2.1
+import QtApplicationManager 1.0
+
+
+MonitorPanel {
+    id: root
+
+    descriptionText: "FPS: "
+    middleText: "60"
+    middleLine: 0.6
+
+    ListView {
+        id: graph
+        anchors.fill: parent
+
+        model: SystemMonitor
+        orientation: ListView.Horizontal
+        interactive: false
+
+        delegate: Item {
+            width: graph.width / graph.model.count
+            height: graph.height
+
+            Rectangle {
+                width: parent.width
+                height: 3
+                y: parent.height - (model.averageFps/100)*parent.height
+            }
+        }
+    }
+
+    Rectangle {
+        id: rotatingBox
+        width: 20
+        height: 20
+        anchors.bottom: root.bottom
+        //anchors.topMargin: 50
+        anchors.left: root.left
+        //anchors.leftMargin: 150
+        color: "#273033"
+
+        RotationAnimation {
+            id: animator
+            target: rotatingBox;
+            from: 0;
+            to: 360;
+            loops: Animation.Infinite
+            duration: 1000
+            running: true
+        }
+    }
+}
+
+