eric: comparison eric6/MicroPython/MicroPythonReplWidget.py

-:e3d034e65afc
+:3fc4082fc6ba
 import re
 from PyQt5.QtCore import (
 pyqtSlot, pyqtSignal, Qt, QPoint, QEvent, QIODevice, QTimer
 )
-from PyQt5.QtGui import QColor, QKeySequence, QTextCursor, QBrush
+from PyQt5.QtGui import (
+QColor, QKeySequence, QTextCursor, QBrush, QTextCharFormat
+)
 from PyQt5.QtWidgets import (
-QWidget, QMenu, QApplication, QHBoxLayout, QSpacerItem, QSizePolicy)
+QWidget, QMenu, QApplication, QHBoxLayout, QSpacerItem, QSizePolicy
+)
 try:
 from PyQt5.QtSerialPort import QSerialPort
 HAS_QTSERIALPORT = True
 except ImportError:
 HAS_QTSERIALPORT = False
 except ImportError:
 HAS_QTCHART = False
 import Globals
 import UI.PixmapCache
+import Preferences
 class MicroPythonReplWidget(QWidget, Ui_MicroPythonReplWidget):
 """
 Class implementing the MicroPython REPL widget.
 dataReceived = pyqtSignal(bytes)
 # ANSI Colors
 AnsiColors = {
-(1, 30): QBrush(Qt.darkGray),
+0: QBrush(Qt.black),
-(1, 31): QBrush(Qt.red),
+1: QBrush(Qt.darkRed),
-(1, 32): QBrush(Qt.green),
+2: QBrush(Qt.darkGreen),
-(1, 33): QBrush(Qt.yellow),
+3: QBrush(Qt.darkYellow),
-(1, 34): QBrush(Qt.blue),
+4: QBrush(Qt.darkBlue),
-(1, 35): QBrush(Qt.magenta),
+5: QBrush(Qt.darkMagenta),
-(1, 36): QBrush(Qt.cyan),
+6: QBrush(Qt.darkCyan),
-(1, 37): QBrush(Qt.white),
+7: QBrush(Qt.lightGray),
-(2, 30): QBrush(Qt.black),
+10: QBrush(Qt.darkGray),
-(2, 31): QBrush(Qt.darkRed),
+11: QBrush(Qt.red),
-(2, 32): QBrush(Qt.darkGreen),
+12: QBrush(Qt.green),
-(2, 33): QBrush(Qt.darkYellow),
+13: QBrush(Qt.yellow),
-(2, 34): QBrush(Qt.darkBlue),
+14: QBrush(Qt.blue),
-(2, 35): QBrush(Qt.darkMagenta),
+15: QBrush(Qt.magenta),
-(2, 36): QBrush(Qt.darkCyan),
+16: QBrush(Qt.cyan),
-(2, 37): QBrush(Qt.lightGray),
+17: QBrush(Qt.white),
 }
 def __init__(self, parent=None):
 """
 Constructor
 "MicroPython support is deactivated.</h3>"))
 self.setEnabled(False)
 return
 self.__vt100Re = re.compile(
-r'(?P<count>\d*);?(?P<color>\d*)(?P<action>[ABCDKm])')
+r'(?P<count>\d*)(?P<color>(?:;?\d*)*)(?P<action>[ABCDKm])')
 self.__populateDeviceTypeComboBox()
 self.replEdit.setAcceptRichText(False)
 self.replEdit.setUndoRedoEnabled(False)
 self.replEdit.installEventFilter(self)
 self.replEdit.customContextMenuRequested.connect(
 self.__showContextMenu)
-defaultCharFormat = self.replEdit.textCursor().charFormat()
+font = Preferences.getEditorOtherFonts("MonospacedFont")
-self.DefaultForeground = defaultCharFormat.foreground()
+self.replEdit.setFontFamily(font.family())
-self.DefaultBackground = defaultCharFormat.background()
+self.replEdit.setFontPointSize(font.pointSize())
+self.DefaultCharFormat = self.replEdit.currentCharFormat()
+self.DefaultForeground = self.DefaultCharFormat.foreground()
+self.DefaultBackground = self.DefaultCharFormat.background()
 def __populateDeviceTypeComboBox(self):
 """
 Private method to populate the device type selector.
 """
 tc.movePosition(QTextCursor.EndOfLine,
 mode=QTextCursor.KeepAnchor)
 tc.removeSelectedText()
 self.replEdit.setTextCursor(tc)
 elif action == "m":
-print(match.group("count"), match.group("color"))
+self.__setCharFormat(match.group(0)[:-1].split(";"),
-charFormat = tc.charFormat()
+tc)
-if count == 0 and match.group("color") == "":
-# reset color
-charFormat.setForeground(self.DefaultForeground)
-charFormat.setBackground(self.DefaultBackground)
-elif count in (0, 1, 2):
-if match.group("color") != "":
-color = int(match.group("color"))
-if count == 0:
-count = 1
-if 30 <= color <= 37:
-charFormat.setForeground(
-self.AnsiColors[(count, color)])
-elif 40 <= color <= 47:
-charFormat.setBackground(
-self.AnsiColors[(count, color - 10)])
-tc.setCharFormat(charFormat)
-self.replEdit.setTextCursor(tc)
 elif data[index] == 10:     # \n
 tc.movePosition(QTextCursor.End)
 self.replEdit.setTextCursor(tc)
 self.replEdit.insertPlainText(chr(data[index]))
+self.__setCharFormat(["0"], tc)     # reset format after a \n
 else:
 tc.deleteChar()
 self.replEdit.setTextCursor(tc)
 self.replEdit.insertPlainText(chr(data[index]))
 index += 1
 self.replEdit.ensureCursorVisible()
+def __setCharFormat(self, formatCodes, textCursor):
+"""
+Private method setting the current text format of the REPL pane based
+on the passed ANSI codes.
+Following codes are used:
+<ul>
+<li>0: Reset</li>
+<li>1: Bold font (weight 75)</li>
+<li>2: Light font (weight 25)</li>
+<li>3: Italic font</li>
+<li>4: Underlined font</li>
+<li>9: Strikeout font</li>
+<li>21: Bold off (weight 50)</li>
+<li>22: Light off (weight 50)</li>
+<li>23: Italic off</li>
+<li>24: Underline off</li>
+<li>29: Strikeout off</li>
+<li>30: foreground Black</li>
+<li>31: foreground Dark Red</li>
+<li>32: foreground Dark Green</li>
+<li>33: foreground Dark Yellow</li>
+<li>34: foreground Dark Blue</li>
+<li>35: foreground Dark Magenta</li>
+<li>36: foreground Dark Cyan</li>
+<li>37: foreground Light Gray</li>
+<li>40: background Black</li>
+<li>41: background Dark Red</li>
+<li>42: background Dark Green</li>
+<li>43: background Dark Yellow</li>
+<li>44: background Dark Blue</li>
+<li>45: background Dark Magenta</li>
+<li>46: background Dark Cyan</li>
+<li>47: background Light Gray</li>
+<li>53: Overlined font</li>
+<li>55: Overline off</li>
+<li>90: bright foreground Dark Gray</li>
+<li>91: bright foreground Red</li>
+<li>92: bright foreground Green</li>
+<li>93: bright foreground Yellow</li>
+<li>94: bright foreground Blue</li>
+<li>95: bright foreground Magenta</li>
+<li>96: bright foreground Cyan</li>
+<li>97: bright foreground White</li>
+<li>100: bright background Dark Gray</li>
+<li>101: bright background Red</li>
+<li>102: bright background Green</li>
+<li>103: bright background Yellow</li>
+<li>104: bright background Blue</li>
+<li>105: bright background Magenta</li>
+<li>106: bright background Cyan</li>
+<li>107: bright background White</li>
+</ul>
+@param formatCodes list of format codes
+@type list of str
+@param textCursor reference to the text cursor
+@type QTextCursor
+"""
+if not formatCodes:
+# empty format codes list is treated as a reset
+formatCodes = ["0"]
+charFormat = textCursor.charFormat()
+for formatCode in formatCodes:
+try:
+formatCode = int(formatCode)
+except ValueError:
+# ignore non digit values
+continue
+if formatCode == 0:
+charFormat.setFontWeight(50)
+charFormat.setFontItalic(False)
+charFormat.setFontUnderline(False)
+charFormat.setFontStrikeOut(False)
+charFormat.setFontOverline(False)
+charFormat.setForeground(self.DefaultForeground)
+charFormat.setBackground(self.DefaultBackground)
+elif formatCode == 1:
+charFormat.setFontWeight(75)
+elif formatCode == 2:
+charFormat.setFontWeight(25)
+elif formatCode == 3:
+charFormat.setFontItalic(True)
+elif formatCode == 4:
+charFormat.setFontUnderline(True)
+elif formatCode == 9:
+charFormat.setFontStrikeOut(True)
+elif formatCode in (21, 22):
+charFormat.setFontWeight(50)
+elif formatCode == 23:
+charFormat.setFontItalic(False)
+elif formatCode == 24:
+charFormat.setFontUnderline(False)
+elif formatCode == 29:
+charFormat.setFontStrikeOut(False)
+elif formatCode == 53:
+charFormat.setFontOverline(True)
+elif formatCode == 55:
+charFormat.setFontOverline(False)
+elif formatCode in (30, 31, 32, 33, 34, 35, 36, 37):
+charFormat.setForeground(self.AnsiColors[formatCode - 30])
+elif formatCode in (40, 41, 42, 43, 44, 45, 46, 47):
+charFormat.setBackground(self.AnsiColors[formatCode - 40])
+elif formatCode in (90, 91, 92, 93, 94, 95, 96, 97):
+charFormat.setForeground(self.AnsiColors[formatCode - 80])
+elif formatCode in (100, 101, 102, 103, 104, 105, 106, 107):
+charFormat.setBackground(self.AnsiColors[formatCode - 90])
+textCursor.setCharFormat(charFormat)
 def __doZoom(self, value):
 """
 Private slot to zoom the REPL pane.

Mercurial Repositories > eric / file comparison

comparison: eric6/MicroPython/MicroPythonReplWidget.py

eric6/MicroPython/MicroPythonReplWidget.py