GUI: Peers: Add direction table column before "Address" with arrow

luke-jr · luke-jr · commit bc2ffa15b953 · 2021-06-22T00:07:56.000Z
Arrow icon drawn at startup to make text translatable
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
@@ -12,6 +12,12 @@
 
 #include <utility>
 
+#include <QBrush>
+#include <QFont>
+#include <QFontInfo>
+#include <QImage>
+#include <QPainter>
+#include <QPixmap>
 #include <QList>
 #include <QTimer>
 
@@ -26,6 +32,8 @@ PeerTableModel::PeerTableModel(interfaces::Node& node, const PlatformStyle& plat
     connect(timer, &QTimer::timeout, this, &PeerTableModel::refresh);
     timer->setInterval(MODEL_UPDATE_DELAY);
 
+    DrawIcons();
+
     // load initial data
     refresh();
 }
@@ -35,6 +43,99 @@ PeerTableModel::~PeerTableModel()
     // Intentionally left empty
 }
 
+void PeerTableModel::DrawIcons()
+{
+    static constexpr auto SIZE = 32;
+    static constexpr auto ARROW_HEIGHT = SIZE * 2 / 3;
+    QImage icon_in(SIZE, SIZE, QImage::Format_Alpha8);
+    icon_in.fill(Qt::transparent);
+    QImage icon_out(icon_in);
+    QPainter icon_in_painter(&icon_in);
+    QPainter icon_out_painter(&icon_out);
+
+    // Arrow
+    auto DrawArrow = [](const int x, QPainter& icon_painter) {
+        icon_painter.setBrush(Qt::SolidPattern);
+        QPoint shape[] = {
+            {x, ARROW_HEIGHT / 2},
+            {(SIZE-1) - x,  0},
+            {(SIZE-1) - x, ARROW_HEIGHT-1},
+        };
+        icon_painter.drawConvexPolygon(shape, 3);
+    };
+    DrawArrow(0, icon_in_painter);
+    DrawArrow(SIZE-1, icon_out_painter);
+
+    {
+        //: Label on inbound connection icon
+        const QString label_in  = tr("IN");
+        //: Label on outbound connection icon
+        const QString label_out = tr("OUT");
+        QImage scratch(SIZE, SIZE, QImage::Format_Alpha8);
+        QPainter scratch_painter(&scratch);
+        QFont font;  // NOTE: Application default font
+        font.setBold(true);
+        auto CheckSize = [&](const QImage& icon, const QString& text, const bool align_right) {
+            // Make sure it's at least able to fit (width only)
+            if (scratch_painter.boundingRect(0, 0, SIZE, SIZE, 0, text).width() > SIZE) {
+                return false;
+            }
+
+            // Draw text on the scratch image
+            // NOTE: QImage::fill doesn't like QPainter being active
+            scratch_painter.setCompositionMode(QPainter::CompositionMode_Source);
+            scratch_painter.fillRect(0, 0, SIZE, SIZE, Qt::transparent);
+            scratch_painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
+            scratch_painter.drawText(0, SIZE, text);
+
+            int text_offset_x = 0;
+            if (align_right) {
+                // Figure out how far right we can shift it
+                for (int col = SIZE-1; col >= 0; --col) {
+                    bool any_pixels = false;
+                    for (int row = SIZE-1; row >= 0; --row) {
+                        int opacity = qAlpha(scratch.pixel(col, row));
+                        if (opacity > 0) {
+                            any_pixels = true;
+                            break;
+                        }
+                    }
+                    if (any_pixels) {
+                        text_offset_x = (SIZE-1) - col;
+                        break;
+                    }
+                }
+            }
+
+            // Check if there's any overlap
+            for (int row = 0; row < SIZE; ++row) {
+                for (int col = text_offset_x; col < SIZE; ++col) {
+                    int opacity = qAlpha(icon.pixel(col, row));
+                    if (col >= text_offset_x) {
+                        opacity += qAlpha(scratch.pixel(col - text_offset_x, row));
+                    }
+                    if (opacity > 0xff) {
+                        // Overlap found, we're done
+                        return false;
+                    }
+                }
+            }
+            return true;
+        };
+        int font_size = SIZE;
+        while (font_size > 1) {
+            font.setPixelSize(--font_size);
+            scratch_painter.setFont(font);
+            if (CheckSize(icon_in , label_in , /* align_right= */ false) &&
+                CheckSize(icon_out, label_out, /* align_right= */ true)) break;
+        }
+        icon_in_painter .drawText(0, 0, SIZE, SIZE, Qt::AlignLeft  | Qt::AlignBottom, label_in);
+        icon_out_painter.drawText(0, 0, SIZE, SIZE, Qt::AlignRight | Qt::AlignBottom, label_out);
+    }
+    m_icon_conn_in  = m_platform_style.TextColorIcon(QIcon(QPixmap::fromImage(icon_in)));
+    m_icon_conn_out = m_platform_style.TextColorIcon(QIcon(QPixmap::fromImage(icon_out)));
+}
+
 void PeerTableModel::startAutoRefresh()
 {
     timer->start();
@@ -73,9 +174,10 @@ QVariant PeerTableModel::data(const QModelIndex& index, int role) const
         switch (column) {
         case NetNodeId:
             return (qint64)rec->nodeStats.nodeid;
+        case Direction:
+            return {};
         case Address:
-            // prepend to peer address down-arrow symbol for inbound connection and up-arrow for outbound connection
-            return QString::fromStdString((rec->nodeStats.fInbound ? "↓ " : "↑ ") + rec->nodeStats.addrName);
+            return QString::fromStdString(rec->nodeStats.addrName);
         case ConnectionType:
             return GUIUtil::ConnectionTypeToQString(rec->nodeStats.m_conn_type, /* prepend_direction */ false);
         case Network:
@@ -94,6 +196,7 @@ QVariant PeerTableModel::data(const QModelIndex& index, int role) const
         switch (column) {
         case NetNodeId:
             return QVariant(Qt::AlignRight | Qt::AlignVCenter);
+        case Direction:
         case Address:
             return {};
         case ConnectionType:
@@ -109,6 +212,8 @@ QVariant PeerTableModel::data(const QModelIndex& index, int role) const
         assert(false);
     } else if (role == StatsRole) {
         return QVariant::fromValue(rec);
+    } else if (index.column() == Direction && role == Qt::DecorationRole) {
+        return rec->nodeStats.fInbound ? m_icon_conn_in : m_icon_conn_out;
     }
 
     return QVariant();
diff --git a/src/qt/peertablemodel.h b/src/qt/peertablemodel.h
@@ -9,6 +9,7 @@
 #include <net.h>
 
 #include <QAbstractTableModel>
+#include <QIcon>
 #include <QList>
 #include <QModelIndex>
 #include <QStringList>
@@ -46,8 +47,10 @@ class PeerTableModel : public QAbstractTableModel
     void startAutoRefresh();
     void stopAutoRefresh();
 
+    // See also RPCConsole::ColumnWidths in rpcconsole.h
     enum ColumnIndex {
         NetNodeId = 0,
+        Direction,
         Address,
         ConnectionType,
         Network,
@@ -82,10 +85,13 @@ public Q_SLOTS:
     QList<CNodeCombinedStats> m_peers_data{};
     interfaces::Node& m_node;
     const PlatformStyle& m_platform_style;
+    void DrawIcons();
+    QIcon m_icon_conn_in, m_icon_conn_out;
     const QStringList columns{
         /*: Title of Peers Table column which contains a
             unique number used to identify a connection. */
         tr("Peer"),
+        "",  // Direction column has no title
         /*: Title of Peers Table column which contains the
             IP/Onion/I2P address of the connected peer. */
         tr("Address"),
diff --git a/src/qt/peertablesortproxy.cpp b/src/qt/peertablesortproxy.cpp
@@ -24,6 +24,8 @@ bool PeerTableSortProxy::lessThan(const QModelIndex& left_index, const QModelInd
     switch (static_cast<PeerTableModel::ColumnIndex>(left_index.column())) {
     case PeerTableModel::NetNodeId:
         return left_stats.nodeid < right_stats.nodeid;
+    case PeerTableModel::Direction:
+        return left_stats.fInbound > right_stats.fInbound;  // default sort Inbound, then Outbound
     case PeerTableModel::Address:
         return left_stats.addrName.compare(right_stats.addrName) < 0;
     case PeerTableModel::ConnectionType:
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -666,6 +666,7 @@ void RPCConsole::setClientModel(ClientModel *model, int bestblock_height, int64_
         ui->peerWidget->setContextMenuPolicy(Qt::CustomContextMenu);
 
         if (!ui->peerWidget->horizontalHeader()->restoreState(m_peer_widget_header_state)) {
+            ui->peerWidget->setColumnWidth(PeerTableModel::Direction, DIRECTION_COLUMN_WIDTH);
             ui->peerWidget->setColumnWidth(PeerTableModel::Address, ADDRESS_COLUMN_WIDTH);
             ui->peerWidget->setColumnWidth(PeerTableModel::Subversion, SUBVERSION_COLUMN_WIDTH);
             ui->peerWidget->setColumnWidth(PeerTableModel::Ping, PING_COLUMN_WIDTH);
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
@@ -144,6 +144,7 @@ public Q_SLOTS:
 
     enum ColumnWidths
     {
+        DIRECTION_COLUMN_WIDTH = 32,
         ADDRESS_COLUMN_WIDTH = 200,
         SUBVERSION_COLUMN_WIDTH = 150,
         PING_COLUMN_WIDTH = 80,

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,7 @@ public Q_SLOTS:`
`144`	`144`
`145`	`145`	`enum ColumnWidths`
`146`	`146`	`{`
	`147`	`+ DIRECTION_COLUMN_WIDTH = 32,`
`147`	`148`	`ADDRESS_COLUMN_WIDTH = 200,`
`148`	`149`	`SUBVERSION_COLUMN_WIDTH = 150,`
`149`	`150`	`PING_COLUMN_WIDTH = 80,`