Merge pull request #172 from vcastilla/default-char

Enable customization of default ASCII character

Author: Simsys

src/qhexedit.cpp

@@ -36,6 +36,7 @@ QHexEdit::QHexEdit(QWidget *parent) : QAbstractScrollArea(parent)
     , _addressWidth(4)
     , _asciiArea(true)
     , _bytesPerLine(16)
+    , _defaultChar('.')
     , _hexCharsInLine(47)
     , _highlighting(true)
     , _overwriteMode(true)
@@ -158,6 +159,20 @@ int QHexEdit::bytesPerLine()
     return _bytesPerLine;
 }
 
+char QHexEdit::defaultChar()
+{
+    return _defaultChar;
+}
+
+void QHexEdit::setDefaultChar(char defaultChar)
+{
+    _defaultChar = defaultChar;
+
+    adjust();
+    setCursorPosition(_cursorPosition);
+    viewport()->update();
+}
+
 void QHexEdit::setCursorPosition(qint64 position)
 {
     // 1. delete old cursor
@@ -945,7 +960,7 @@ void QHexEdit::paintEvent(QPaintEvent *event)
 
                     int ch = (uchar)_dataShown.at(bPosLine + colIdx);
                     if ( ch < ' ' || ch > '~' )
-                        ch = '.';
+                        ch = _defaultChar;
                     rect.setRect(pxPosAsciiX2, pxPosY - _pxCharHeight + _pxSelectionSub, _pxCharWidth, _pxCharHeight);
                     painter.fillRect(rect, asciiArea.areaStyle());
                     painter.drawText(pxPosAsciiX2, pxPosY, QChar(ch));
@@ -982,7 +997,7 @@ void QHexEdit::paintEvent(QPaintEvent *event)
             // every 2 hex there is 1 ascii
             int ch = (uchar)_dataShown.at(hexPos / 2);
             if (ch < ' ' || ch > '~')
-                ch = '.';
+                ch = _defaultChar;
 
             painter.drawText(_pxCursorX - pxOfsX, _pxCursorY, QChar(ch));
         }
@@ -1180,7 +1195,7 @@ QString QHexEdit::toReadable(const QByteArray &ba)
                 hexStr.append(" ").append(ba.mid(i+j, 1).toHex());
                 char ch = ba[i + j];
                 if ((ch < 0x20) || (ch > 0x7e))
-                        ch = '.';
+                        ch = _defaultChar;
                 ascStr.append(QChar(ch));
             }
         }

src/qhexedit.h

@@ -104,6 +104,10 @@ class QHEXEDIT_API QHexEdit : public QAbstractScrollArea
     /*! Set and get bytes number per line.*/
     Q_PROPERTY(int bytesPerLine READ bytesPerLine WRITE setBytesPerLine)
 
+    /*! Set and get character to display when outside the printable range.
+    */
+    Q_PROPERTY(int defaultChar READ defaultChar WRITE setDefaultChar)
+
     /*! Property cursorPosition sets or gets the position of the editor cursor
     in QHexEdit. Every byte in data has two cursor positions: the lower and upper
     Nibble. Maximum cursor position is factor two of data.size().
@@ -330,6 +334,9 @@ public slots:
     int bytesPerLine();
     void setBytesPerLine(int count);
 
+    char defaultChar();
+    void setDefaultChar(char defaultChar);
+
     qint64 cursorPosition();
     void setCursorPosition(qint64 position);
 
@@ -407,6 +414,7 @@ private slots:
     bool _asciiArea;
     qint64 _addressOffset;
     int _bytesPerLine;
+    char _defaultChar;
     int _hexCharsInLine;
     bool _highlighting;
     bool _overwriteMode;