From 9d2a6cc2cbd5f2c4362d7604349646a00721d197 Mon Sep 17 00:00:00 2001 From: duanshengchao <519970194@qq.com> Date: Tue, 21 Oct 2025 14:50:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90alarmEventDataDelegat?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?item=E5=B1=95=E7=A4=BA=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/alarmEventDataView.h | 2 +- source/alarmEventDataView.cpp | 11 +++++++++-- ui/alarmEventRealTimeDock.ui | 5 +++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/include/alarmEventDataView.h b/include/alarmEventDataView.h index 1e59456..84e62d9 100644 --- a/include/alarmEventDataView.h +++ b/include/alarmEventDataView.h @@ -146,7 +146,7 @@ public: AlarmEventDataView(QWidget* parent = nullptr); ~AlarmEventDataView(); - void setModelMode(AlarmDataMode); + void setModelMode(AlarmDataMode, int maxRealTimeEvents = 5); private: QTableView* m_tableView; diff --git a/source/alarmEventDataView.cpp b/source/alarmEventDataView.cpp index 1e8b98c..33c3822 100644 --- a/source/alarmEventDataView.cpp +++ b/source/alarmEventDataView.cpp @@ -339,10 +339,13 @@ void AlarmEventDataDelegate::paint(QPainter* painter, const QStyleOptionViewItem if(m_tableView) { painter->save(); - QPen pen(QColor(60,60,60), 1); + QPen pen(QColor(60,60,60), 1, Qt::DotLine); painter->setPen(pen); if(index.column() != m_tableView->model()->columnCount() - 1) + { + //opt.rect.adjust(1, 0, 1, 0); painter->drawLine(opt.rect.topRight(), opt.rect.bottomRight()); + } painter->restore(); } @@ -387,8 +390,12 @@ AlarmEventDataView::AlarmEventDataView(QWidget* parent) AlarmEventDataView::~AlarmEventDataView() {} -void AlarmEventDataView::setModelMode(AlarmDataMode mode) +void AlarmEventDataView::setModelMode(AlarmDataMode mode, int maxRealTimeEvents) { if(m_tableModel) + { m_tableModel->setMode(mode); + if(mode == RealTime) + m_tableModel->setMaxRealTimeEvents(maxRealTimeEvents); + } } diff --git a/ui/alarmEventRealTimeDock.ui b/ui/alarmEventRealTimeDock.ui index 53e0e74..8699aea 100644 --- a/ui/alarmEventRealTimeDock.ui +++ b/ui/alarmEventRealTimeDock.ui @@ -525,8 +525,9 @@ QHeaderView::section font: 700 10pt "黑体"; color: rgb(250, 250, 250); background-color:transparent; - border:0px; - border-right: 1px solid rgb(60,60,60); + padding-left:-1px; + border: 0px; + border-right: 1px dotted rgb(60,60,60); } QHeaderView::section:horizontal:last {