MQTT Monitor: comparison MqttMonitor/MqttMonitorWidget.py

-:ca2e03cb6ed4
+:696b5d1a7b97
 import os
 import collections
 import copy
 from PyQt5.QtCore import pyqtSlot, QTimer
-from PyQt5.QtGui import QTextCursor
+from PyQt5.QtGui import QFont
 from PyQt5.QtWidgets import QWidget, QDialog
 from E5Gui import E5MessageBox
 from E5Gui.E5PathPicker import E5PathPickerModes
 mqttLogLevelString
 import UI.PixmapCache
 import Utilities
-# TODO: change messages display to use a tree widget
-#   first row topic
-#   second row qos and message
-#
-#   include capability to filter on topic
-# TODO: change log display to a tree widget
-#   two columns with log level and message
-#   colorize entries depending on log level
 class MqttMonitorWidget(QWidget, Ui_MqttMonitorWidget):
 """
 Class implementing the MQTT Monitor widget.
 """
 self.pixmapLabel.setPixmap(UI.PixmapCache.getPixmap(
 os.path.join("MqttMonitor", "icons", "mqtt48.png")))
 self.publishPayloadFilePicker.setMode(E5PathPickerModes.OpenFileMode)
 self.publishPayloadFilePicker.setFilters(self.tr("All Files (*)"))
+self.__messagesFormat = self.messagesEdit.currentCharFormat()
+self.__messagesTopicFormat = self.messagesEdit.currentCharFormat()
+self.__messagesTopicFormat.setFontWeight(QFont.Bold)
+self.__messagesQosFormat = self.messagesEdit.currentCharFormat()
+self.__messagesQosFormat.setFontItalic(True)
 for logLevel in (MqttClient.LogDisabled,
 MqttClient.LogDebug,
 MqttClient.LogInfo,
 MqttClient.LogNotice,
 except KeyError:
 # always show unknown log levels
 pass
 txt = self.tr("{0}: {1}").format(mqttLogLevelString(level), message)
-if not txt.endswith(("\r\n", "\r", "\n")):
-txt += "\n"
+self.logEdit.appendPlainText(Utilities.filterAnsiSequences(txt))
-tc = self.logEdit.textCursor()
-tc.movePosition(QTextCursor.End)
-self.logEdit.setTextCursor(tc)
-self.logEdit.insertPlainText(Utilities.filterAnsiSequences(txt))
 self.logEdit.ensureCursorVisible()
 @pyqtSlot(str, bytes, int, bool)
 def __messageReceived(self, topic, payload, qos, retain):
 """
 """
 if topic.startswith(MqttMonitorWidget.BrokerStatusTopicPrefix):
 # handle broker status messages
 self.__handleBrokerStatusMessage(topic, payload)
 else:
-self.__appendMessage(topic, payload)
+self.__appendMessage(topic, payload, qos)
 @pyqtSlot(int)
 def __messagePublished(self, mid):
 """
 Private slot to handle a message being published.
 MqttMonitorWidget.BrokerStatusTopic)
 if rc == 0:
 # successfully sent
 self.__setBrokerStatusSubscribed(True)
+#######################################################################
+## Utility methods
+#######################################################################
 def __setBrokerStatusSubscribed(self, subscribed):
 """
 Private method to set the subscription status for the broker status
 topics.
 self.tr("Press to deactivate the status display"))
 else:
 self.brokerStatusButton.setText(self.tr("Subscribe"))
 self.brokerStatusButton.setToolTip(
 self.tr("Press to activate the status display"))
-#######################################################################
-## Utility methods
-#######################################################################
 def __addBrokerToRecent(self, host, port):
 """
 Private method to add a host name to the list of recently connected
 brokers.
 self.publishTopicComboBox.clearEditText()
 else:
 topicIndex = self.publishTopicComboBox.findText(currentTopic)
 self.publishTopicComboBox.setCurrentIndex(topicIndex)
-def __appendMessage(self, topic, payload):
+def __appendMessage(self, topic, payload, qos):
 """
 Private method to append a received message to the output.
 @param topic topic of the received message
 @type str
 @param payload payload of the received message
 @type bytes
+@param qos quality of service indicator (0, 1, 2)
+@type int
 """
 payloadStr = str(payload, encoding="utf-8", errors="replace")
-txt = self.tr("{0} -> {1}").format(topic, payloadStr)
-if not txt.endswith(("\r\n", "\r", "\n")):
+self.messagesEdit.setCurrentCharFormat(self.__messagesTopicFormat)
-txt += "\n"
+self.messagesEdit.appendPlainText(topic)
+self.messagesEdit.setCurrentCharFormat(self.__messagesQFormat)
-tc = self.messagesEdit.textCursor()
+self.messagesEdit.appendPlainText(self.tr("QoS: {0}").format(qos))
-tc.movePosition(QTextCursor.End)
+self.messagesEdit.setCurrentCharFormat(self.__messagesFormat)
-self.messagesEdit.setTextCursor(tc)
+self.messagesEdit.appendPlainText(
-self.messagesEdit.insertPlainText(Utilities.filterAnsiSequences(txt))
+Utilities.filterAnsiSequences(payloadStr))
+self.messagesEdit.appendPlainText(60 * "#")
 self.messagesEdit.ensureCursorVisible()
 def __handleBrokerStatusMessage(self, topic, payload):
 """
 Private method to append a received message to the output.

Mercurial Repositories > MQTT Monitor / file comparison

comparison: MqttMonitor/MqttMonitorWidget.py

MqttMonitor/MqttMonitorWidget.py