CL-Softwares
/
PowerMaster
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:修复历史事件浏窗口中‘QDateTimeEdit的upButton无法点击问题’

This commit is contained in:
duanshengchao 2025-11-17 10:13:02 +08:00
parent fdc164ed5e
commit 7d1e06bda9
11 changed files with 109 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/alarmEventMainDialog.h
View File

@ -3,6 +3,7 @@
#include <QDialog>
#include "alarmEventGlobal.h"
#include "alarmEventUtils.h"
QT_BEGIN_NAMESPACE
namespace Ui {
@ -10,6 +11,7 @@ class alarmEventMainDialog;
}
QT_END_NAMESPACE
class AlarmEventDataView;
class AlarmEventMainDialog : public QDialog
{
Q_OBJECT
@ -31,7 +33,9 @@ public slots:
private:
Ui::alarmEventMainDialog* ui;
AlarmEventDataView* m_tableView;
AlarmDataMode m_mode;
AlarmEventDataFilter m_eventFilter;
};

1
include/alarmEventUtils.h
View File

@ -225,6 +225,7 @@ public:
QVector<EventData> apply(const QVector<EventData>& events);
private:
void reset();
bool isEmpty();
QDateTime m_startTime;

2
include/customLineEdit.h
View File

@ -20,7 +20,7 @@ signals:
void clicked();
protected:
void mousePressEvent(QMouseEvent* event) override;
void mouseDoubleClickEvent(QMouseEvent* event) override;
};
#endif

1
resource/PowerMaster.qrc
View File

@ -7,6 +7,7 @@
<file>images/icon_doubleArrow_down_hover.png</file>
<file>images/icon_doubleArrow_up_default.png</file>
<file>images/icon_doubleArrow_up_hover.png</file>
<file>images/up-arrow.png</file>
<file>images/icon_first.png</file>
<file>images/icon_last.png</file>
<file>images/icon_next.png</file>

BIN
resource/images/up-arrow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 788 B

10
source/alarmEventDataView.cpp
View File

@ -36,9 +36,9 @@ AlarmEventDataModel::AlarmEventDataModel(AlarmDataMode mode, QObject* parent)
//实时数据测试
/*m_simulatedDataTimer = new QTimer(this);
m_simulatedDataTimer = new QTimer(this);
connect(m_simulatedDataTimer, &QTimer::timeout, this, &AlarmEventDataModel::onTimeoutSimulateData);
m_simulatedDataTimer->start(3000);*/
m_simulatedDataTimer->start(3000);
}
AlarmEventDataModel::~AlarmEventDataModel()
@ -173,10 +173,10 @@ void AlarmEventDataModel::iniHeaderData()
m_headerData.emplace_back(SectionData("厂站", 200, Station));
m_headerData.emplace_back(SectionData("间隔", 200, Bay));
m_headerData.emplace_back(SectionData("信息", -1, Description));
m_headerData.emplace_back(SectionData("类型", 150, Type));
m_headerData.emplace_back(SectionData("等级", 150, Severity));
m_headerData.emplace_back(SectionData("类型", 160, Type));
m_headerData.emplace_back(SectionData("等级", 160, Severity));
m_headerData.emplace_back(SectionData("确认状态", 150, Status));
m_headerData.emplace_back(SectionData("操作", 172, Operation));
m_headerData.emplace_back(SectionData("操作", 180, Operation));
}
/*void AlarmEventDataModel::setMode(AlarmDataMode mode)

4
source/alarmEventMainDialog.cpp
View File

@ -1,5 +1,6 @@
#include "alarmEventMainDialog.h"
#include "ui_alarmEventMainDialog.h"
#include "alarmEventDataView.h"
AlarmEventMainDialog::AlarmEventMainDialog(QWidget *parent)
: QDialog(parent)
@ -10,6 +11,9 @@ AlarmEventMainDialog::AlarmEventMainDialog(QWidget *parent)
setWindowFlags(Qt::FramelessWindowHint);
setAttribute(Qt::WA_TranslucentBackground);
m_tableView = new AlarmEventDataView(Historical, this);
ui->tableLayout->addWidget(m_tableView);
connect(ui->btnClose, &QPushButton::clicked, this, &AlarmEventMainDialog::onBtnClicked_close);
}

44
source/alarmEventUtils.cpp
View File

@ -3,10 +3,33 @@
///////------AlarmEventDataFilter-----
AlarmEventDataFilter::AlarmEventDataFilter()
{
reset();
}
void AlarmEventDataFilter::reset()
{
m_startTime = QDateTime();
m_endTime = QDateTime();
m_station.clear();
m_bay.clear();
m_type = -1;
m_severity.clear();
m_description.clear();
m_status = -1;
}
bool AlarmEventDataFilter::isEmpty()
{
return !m_startTime.isValid() &&
!m_endTime.isValid() &&
m_station.isEmpty() &&
m_bay.isEmpty() &&
m_type == -1 &&
m_severity.isEmpty() &&
m_description.isEmpty() &&
m_status == -1;
}
bool AlarmEventDataFilter::matches(const EventData& event)
{
QDateTime eventTime = QDateTime::fromMSecsSinceEpoch(event.timestamp);
@ -38,14 +61,7 @@ bool AlarmEventDataFilter::matches(const EventData& event)
void AlarmEventDataFilter::clear()
{
m_startTime = QDateTime();
m_endTime = QDateTime();
m_station.clear();
m_bay.clear();
m_type = -1;
m_severity.clear();
m_description.clear();
m_status = -1;
reset();
}
QVector<EventData> AlarmEventDataFilter::apply(const QVector<EventData>& events)
@ -65,18 +81,6 @@ QVector<EventData> AlarmEventDataFilter::apply(const QVector<EventData>& events)
return filteredEvents; //RVO + QT的隐式共享(QVector)，不用担心开销
}
bool AlarmEventDataFilter::isEmpty()
{
return !m_startTime.isValid() &&
!m_endTime.isValid() &&
m_station.isEmpty() &&
m_bay.isEmpty() &&
m_type == -1 &&
m_severity.isEmpty() &&
m_description.isEmpty() &&
m_status == -1;
}
///////------AlarmEventDataFilter-----
AlarmEventCache::AlarmEventCache()

4
source/customLineEdit.cpp
View File

@ -5,10 +5,10 @@ CustomLineEdit::CustomLineEdit(QWidget* parent)
: QLineEdit(parent)
{}
void CustomLineEdit::mousePressEvent(QMouseEvent* event)
void CustomLineEdit::mouseDoubleClickEvent(QMouseEvent* event)
{
if(event->button() == Qt::LeftButton)
emit clicked();
QLineEdit::mousePressEvent(event);
QLineEdit::mouseDoubleClickEvent(event);
}

181
ui/alarmEventMainDialog.ui
View File

@ -56,6 +56,48 @@ QLineEdit:focus
border:1px solid rgb(67,160,249);
}
QDateTimeEdit
{
font: 12pt &quot;黑体&quot;;
color: rgb(250, 250, 250);
background-color: rgb(24, 32, 38);
border:1px solid rgb(200,200,200);
padding-right:25px;
}
QDateTimeEdit:focus
{
border:1px solid rgb(67,160,249);
}
QDateTimeEdit::up-button
{
border: 0px;
margin:2px;
}
QDateTimeEdit::up-button:hover
{
background-color: rgb(54, 62, 74);
}
QDateTimeEdit::up-arrow
{
margin-top:5px;
width:14px;
image: url(:/images/up-arrow.png);
}
QDateTimeEdit::down-button
{
border: 0px;
margin:2px;
}
QDateTimeEdit::down-button:hover
{
background-color: rgb(54, 62, 74);
}
QDateTimeEdit::down-arrow
{
width:14px;
image: url(:/images/down-arrow.png);
}
QComboBox
{
font: 12pt &quot;黑体&quot;;
@ -570,28 +612,6 @@ icon: url(:/images/icon_configuration.png);
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="CustomLineEdit" name="lineEdit_beginTime">
<property name="minimumSize">
<size>
<width>0</width>
<height>31</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>31</height>
</size>
</property>
<property name="text">
<string>2025/09/16 10:06:12 </string>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_endTime">
<property name="minimumSize">
@ -611,8 +631,8 @@ icon: url(:/images/icon_configuration.png);
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="CustomLineEdit" name="lineEdit_endTime">
<item row="0" column="1">
<widget class="QDateTimeEdit" name="beginTime">
<property name="minimumSize">
<size>
<width>0</width>
@ -625,11 +645,27 @@ icon: url(:/images/icon_configuration.png);
<height>31</height>
</size>
</property>
<property name="text">
<string>2025/09/16 10:07:12</string>
<property name="displayFormat">
<string>yyyy/MM/dd H:mm</string>
</property>
<property name="readOnly">
<bool>true</bool>
</widget>
</item>
<item row="1" column="1">
<widget class="QDateTimeEdit" name="endTime">
<property name="minimumSize">
<size>
<width>0</width>
<height>31</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>31</height>
</size>
</property>
<property name="displayFormat">
<string>yyyy/MM/dd H:mm</string>
</property>
</widget>
</item>
@ -639,7 +675,7 @@ icon: url(:/images/icon_configuration.png);
</widget>
</item>
<item>
<widget class="QWidget" name="tableView" native="true">
<widget class="QWidget" name="tableWidget" native="true">
<property name="styleSheet">
<string notr="true">QWidget #tableView
{
@ -682,88 +718,10 @@ QTableView::item:selected
{
}</string>
</property>
<layout class="QVBoxLayout" name="vLayout_table">
<layout class="QVBoxLayout" name="tableLayout">
<property name="topMargin">
<number>15</number>
</property>
<item>
<widget class="QTableWidget" name="tableWidget">
<property name="textElideMode">
<enum>Qt::TextElideMode::ElideNone</enum>
</property>
<property name="showGrid">
<bool>false</bool>
</property>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
<row>
<property name="text">
<string>新建行</string>
</property>
</row>
<row>
<property name="text">
<string>新建行</string>
</property>
</row>
<row>
<property name="text">
<string>新建行</string>
</property>
</row>
<column>
<property name="text">
<string>序号</string>
</property>
</column>
<column>
<property name="text">
<string>时间</string>
</property>
</column>
<column>
<property name="text">
<string>厂站</string>
</property>
</column>
<column>
<property name="text">
<string>详情</string>
</property>
</column>
<column>
<property name="text">
<string>类型</string>
</property>
</column>
<column>
<property name="text">
<string>级别</string>
</property>
</column>
<column>
<property name="text">
<string>操作</string>
</property>
</column>
<item row="0" column="0">
<property name="text">
<string>1</string>
</property>
</item>
<item row="0" column="1">
<property name="text">
<string>2025-09-17 16：51：01</string>
</property>
</item>
<item row="0" column="2">
<property name="text">
<string>灵州换流站</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
@ -1074,13 +1032,6 @@ QPushButton:pressed
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>CustomLineEdit</class>
<extends>QLineEdit</extends>
<header location="global">customLineEdit.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../resource/PowerMaster.qrc"/>
</resources>

2
ui/alarmEventRealTimeDock.ui
View File

@ -582,7 +582,7 @@ QTableView::item:selected
<number>0</number>
</property>
<item>
<widget class="QWidget" name="talbeWidget" native="true">
<widget class="QWidget" name="tableWidget" native="true">
<layout class="QVBoxLayout" name="tableLayout">
<property name="spacing">
<number>0</number>