[ui] Messaging : test code, simplify code

Author: Alxiice

meshroom/ui/app.py

@@ -26,7 +26,7 @@
 from meshroom.ui.components.scene3D import Scene3DHelper, Transformations3DHelper
 from meshroom.ui.components.scriptEditor import ScriptEditorManager
 from meshroom.ui.components.thumbnail import ThumbnailCache
-from meshroom.ui.components.statusBar import MessageController
+from meshroom.ui.components.messaging import MessageController
 from meshroom.ui.palette import PaletteManager
 from meshroom.ui.reconstruction import Reconstruction
 from meshroom.ui.utils import QmlInstantEngine

meshroom/ui/components/statusBar.py renamed to meshroom/ui/components/messaging.py

@@ -56,7 +56,14 @@ def getMessages(self):
 
     @Slot(result=str)
     def getMessagesAsString(self):
-        return json.dumps(self._getMessagesDict(fullDate=True), indent=4)
+        """ Return messages for clipboard copy 
+        .. note::
+           Could also do `json.dumps(self._getMessagesDict(fullDate=True), indent=4)`
+        """
+        messages = []
+        for msg in self._messages:
+            messages.append(f"{msg.dateStr(True)} [{msg.status.upper():<7}] {msg.msg}")
+        return "\n".join(messages)
 
     @Slot()
     def clearMessages(self):

meshroom/ui/qml/Controls/StatusBar.qml

@@ -98,27 +98,12 @@ RowLayout {
         }
     }
 
-    function _showMessage(msg, status=undefined, duration=root.interval) {
+    function showMessage(msg, status=undefined, duration=root.interval) {
         statusBar.showMessage(msg, status, duration)
         // Add message to the message list
         _messageController.storeMessage(msg, status)
     }
 
-    function showMessage(msg, status=undefined, duration=root.interval) {
-        // Info
-        statusBar.showMessage("test info", "info", duration)
-        _messageController.storeMessage("test info", "info")
-        // Warning
-        statusBar.showMessage("test warning", "warning", duration)
-        _messageController.storeMessage("test warning", "warning")
-        // Error
-        statusBar.showMessage("test error", "error", duration)
-        _messageController.storeMessage("test error", "error")
-        // Ok
-        statusBar.showMessage("test ok", "ok", duration)
-        _messageController.storeMessage("test ok", "ok")
-    }
-
     Connections {
         target: _messageController
         function onMessage(message, color, duration) {

meshroom/ui/qml/Controls/StatusMessages.qml

@@ -15,35 +15,25 @@ ApplicationWindow {
 
     SystemPalette { id: systemPalette }
 
-    function getColor(status, mode="unknown") {
-        var color = systemPalette.text
-        var alphaValue = 1.0
+    function getColor(status) {
         switch (status) {
-            case "ok": {
-                color = Colors.green
-                break
-            }
-            case "warning": {
-                color = Colors.orange
-                break
-            }
-            case "error": {
-                color = Colors.red
-                break
-            }
-        }
-        switch (mode) {
-            case "background": {
-                if (status == "info") alphaValue = 0.05
-                else alphaValue = 0.1
-                break
-            }
-            case "border": {
-                if (status == "info") alphaValue = 0.2
-                else alphaValue = 0.3
-                break
-            }
+            case "ok": return Colors.green
+            case "warning": return Colors.orange
+            case "error": return Colors.red
+            default: return systemPalette.text
         }
+    }
+
+    function getBackgroundColor(status) {
+        // var color = Qt.darker(getColor(status), 1.2)
+        var color = getColor(status)
+        var alphaValue = status == "info" ? 0.05 : 0.1
+        return Qt.rgba(color.r, color.g, color.b, alphaValue)
+    }
+
+    function getBorderColor(status) {
+        var color = getColor(status)
+        var alphaValue = status == "info" ? 0.2 : 0.3
         return Qt.rgba(color.r, color.g, color.b, alphaValue)
     }
 
@@ -61,7 +51,7 @@ ApplicationWindow {
         background: Rectangle {
             implicitWidth: root.width
             implicitHeight: 50
-            color: Qt.darker(systemPalette.base, 1.1)
+            color: Qt.darker(systemPalette.base, 1.2)
         }
 
         RowLayout {
@@ -122,8 +112,8 @@ ApplicationWindow {
                 delegate: Rectangle {
                     width: messageListView.width
                     height: messageLayout.implicitHeight + 16
-                    color: root.getColor(modelData.status, "background")
-                    border.color: root.getColor(modelData.status, "border")
+                    color: root.getBackgroundColor(modelData.status)
+                    border.color: root.getBorderColor(modelData.status)
                     border.width: 1
                     radius: 4