From ba2400bbd75f79cc17e74ca0eed7b93f1b39ddd7 Mon Sep 17 00:00:00 2001 From: duanshengchao <519970194@qq.com> Date: Wed, 27 Nov 2024 16:39:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BATimeLine=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 6 ++++++ source/customTab.cpp | 4 ++-- source/dashboard.cpp | 2 +- util/TimeLine/eventItem.cpp | 0 util/TimeLine/eventItem.h | 0 util/TimeLine/timeLineItem.cpp | 0 util/TimeLine/timeLineItem.h | 0 util/TimeLine/timeLineWidget.cpp | 21 +++++++++++++++++++++ util/TimeLine/timeLineWidget.h | 7 +++++++ util/TimeLine/timeStampItem.cpp | 0 util/TimeLine/timeStampItem.h | 0 11 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 util/TimeLine/eventItem.cpp create mode 100644 util/TimeLine/eventItem.h create mode 100644 util/TimeLine/timeLineItem.cpp create mode 100644 util/TimeLine/timeLineItem.h create mode 100644 util/TimeLine/timeStampItem.cpp create mode 100644 util/TimeLine/timeStampItem.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 00766d2..e17793e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,6 +89,12 @@ set(UI_FILES set(UTIL_FILES util/TimeLine/timeLineWidget.h util/TimeLine/timeLineWidget.cpp + util/TimeLine/timeLineItem.h + util/TimeLine/timeLineItem.cpp + util/TimeLine/timeStampItem.h + util/TimeLine/timeStampItem.cpp + util/TimeLine/eventItem.h + util/TimeLine/eventItem.cpp ) # 包含源文件目录 diff --git a/source/customTab.cpp b/source/customTab.cpp index 8160b1d..87d0f43 100644 --- a/source/customTab.cpp +++ b/source/customTab.cpp @@ -151,8 +151,8 @@ void CustomTab::setText(const QString& strTitle) QFontMetrics metrics(m_pTitle->font()); QRect rect = metrics.boundingRect(m_pTitle->text()); - m_pTitle->setMinimumSize(rect.width() + 10, 0); - m_pTitle->setMaximumSize(rect.width() + 10, 1660); + m_pTitle->setMinimumSize(rect.width() + 12, 0); + m_pTitle->setMaximumSize(rect.width() + 12, 1660); setObjectName("dashboardTab_" + strTitle); } diff --git a/source/dashboard.cpp b/source/dashboard.cpp index 8e62a21..70c8af4 100644 --- a/source/dashboard.cpp +++ b/source/dashboard.cpp @@ -141,7 +141,7 @@ void Dashboard::addPanel(const QString& strType) QString strDefaultName = "dataPanel-" + QString::number(m_nPanenlNameNumber); m_nPanenlNameNumber++; panel->setName(strDefaultName); - int nPanelWidth = m_pDisplayArea->width() * 0.25; + int nPanelWidth = m_pDisplayArea->width() * 0.3; int nPanelHeight = nPanelWidth * 0.56; //16:9宽高比 panel->setInitialSize(QSize(nPanelWidth, nPanelHeight)); int nCount = m_dataPanels.count(); diff --git a/util/TimeLine/eventItem.cpp b/util/TimeLine/eventItem.cpp new file mode 100644 index 0000000..e69de29 diff --git a/util/TimeLine/eventItem.h b/util/TimeLine/eventItem.h new file mode 100644 index 0000000..e69de29 diff --git a/util/TimeLine/timeLineItem.cpp b/util/TimeLine/timeLineItem.cpp new file mode 100644 index 0000000..e69de29 diff --git a/util/TimeLine/timeLineItem.h b/util/TimeLine/timeLineItem.h new file mode 100644 index 0000000..e69de29 diff --git a/util/TimeLine/timeLineWidget.cpp b/util/TimeLine/timeLineWidget.cpp index 784f889..a28e8e1 100644 --- a/util/TimeLine/timeLineWidget.cpp +++ b/util/TimeLine/timeLineWidget.cpp @@ -28,6 +28,27 @@ TimeLineWidget::~TimeLineWidget() delete d_ptr; } +void TimeLineWidget::resizeEvent(QResizeEvent* e) +{ + +} +void TimeLineWidget::mousePressEvent(QMouseEvent* e) +{ + +} +void TimeLineWidget::mouseMoveEvent(QMouseEvent* e) +{ + +} +void TimeLineWidget::mouseReleaseEvent(QMouseEvent* e) +{ + +} +void TimeLineWidget::wheelEvent(QWheelEvent* e) +{ + +} + void TimeLineWidget::setBackground(QColor color) { d_ptr->m_background_color = color; diff --git a/util/TimeLine/timeLineWidget.h b/util/TimeLine/timeLineWidget.h index 2fcb051..cf38e2e 100644 --- a/util/TimeLine/timeLineWidget.h +++ b/util/TimeLine/timeLineWidget.h @@ -18,6 +18,13 @@ public: void setBackground(QColor); void setTimelineColor(QColor); +protected: + virtual void resizeEvent(QResizeEvent*) override; + virtual void mousePressEvent(QMouseEvent*) override; + virtual void mouseMoveEvent(QMouseEvent*) override; + virtual void mouseReleaseEvent(QMouseEvent*) override; + virtual void wheelEvent(QWheelEvent*) override; + private: TimeLineWidgetPrivate* d_ptr; }; // class TimeLineWidget diff --git a/util/TimeLine/timeStampItem.cpp b/util/TimeLine/timeStampItem.cpp new file mode 100644 index 0000000..e69de29 diff --git a/util/TimeLine/timeStampItem.h b/util/TimeLine/timeStampItem.h new file mode 100644 index 0000000..e69de29