From b456e69d1ef87ee1f52cfb70467381557a27019c Mon Sep 17 00:00:00 2001 From: "DESKTOP-450PEFP\\mainc" Date: Fri, 27 Mar 2026 20:19:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E8=BD=AF=E4=BB=B6=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=89=93=E5=BC=80=20=E2=80=98=E4=BE=8B=E5=AD=90?= =?UTF-8?q?=E2=80=99=E9=A1=B9=E7=9B=AE=E3=80=82=20=E5=B7=A6=E4=B8=8B?= =?UTF-8?q?=E8=A7=92=E5=B1=9E=E6=80=A7=E5=AD=97=E4=BD=93=E3=80=81=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E7=AD=89=E5=B1=9E=E6=80=A7=EF=BC=8C=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=94=B6=E7=BC=A9=E6=98=BE=E7=A4=BA=20=E6=B3=A2=E5=88=97?= =?UTF-8?q?=E9=81=93=E9=81=93=E5=A4=B4=E6=98=BE=E7=A4=BA=E6=B3=A2=E5=88=97?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logPlus/PropertyWidget.cpp | 15 +++++++++++---- logPlus/forminfo.cpp | 2 ++ logPlus/mainwindow.cpp | 6 ++++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/logPlus/PropertyWidget.cpp b/logPlus/PropertyWidget.cpp index 377802a..63f4d79 100644 --- a/logPlus/PropertyWidget.cpp +++ b/logPlus/PropertyWidget.cpp @@ -2361,6 +2361,14 @@ QtVariantProperty* PropertyWidget::_CreateVariantPropertyItem(QString strGroup, item->setValue(vtPropertyValue); m_propertyData[item] = strPropertyCaption; pGroupItem->addSubProperty(item); + + // 字体不展开 + if (QVariant::Font == propertyType || QVariant::Color == propertyType) + { + QList list = m_pPropertyBrowser->items(item); + if (list.size() > 0) + m_pPropertyBrowser->setExpanded(list.at(0), false); + } return item; } @@ -2951,12 +2959,11 @@ void PropertyWidget::initWaveProperty(FormInfo *formInfo, int nType) _CreateVariantPropertyItem("波形绘制参数", "幅度刻度", formInfo->m_strAmp, QVariant::String); _CreateVariantPropertyItem("波形绘制参数", "最大振幅", formInfo->m_fMaxAmp, QVariant::Double); _CreateVariantPropertyItem("波形绘制参数", "显示刻度", formInfo->m_bShowScale, QVariant::Bool); - + _CreateVariantPropertyItem("波形绘制参数", "波列基值", formInfo->m_fWaveBase, QVariant::Double); + _CreateVariantPropertyItem("波形绘制参数", "波形间隔", formInfo->m_nWaveJg, QVariant::Int); + _CreateVariantPropertyItem("波形绘制参数", "波形高度", formInfo->m_fWaveHei, QVariant::Double); if (nType == 0 || nType == 1) { - _CreateVariantPropertyItem("波形绘制参数", "波列基值", formInfo->m_fWaveBase, QVariant::Double); - _CreateVariantPropertyItem("波形绘制参数", "波形间隔", formInfo->m_nWaveJg, QVariant::Int); - _CreateVariantPropertyItem("波形绘制参数", "波形高度", formInfo->m_fWaveHei, QVariant::Double); _CreateVariantPropertyItem("波形绘制参数", "线宽", formInfo->m_dWidth, QVariant::Int); _CreateVariantPropertyItem("波形绘制参数", "颜色", formInfo->m_lineColor, QVariant::Color); } diff --git a/logPlus/forminfo.cpp b/logPlus/forminfo.cpp index fb8cee0..bc89ab3 100644 --- a/logPlus/forminfo.cpp +++ b/logPlus/forminfo.cpp @@ -620,6 +620,8 @@ void FormInfo::paintEvent(QPaintEvent* event) if(m_strType=="waveObject") { + painter.drawText(rect.left(), rect.top(), rect.width(), 30, Qt::AlignCenter, m_strLineName); + if (m_nDrawType == 0 || m_nDrawType == 1) { int nbot = rect.bottom()- rect.height() / 3.0; diff --git a/logPlus/mainwindow.cpp b/logPlus/mainwindow.cpp index bf85a25..9de0cb9 100644 --- a/logPlus/mainwindow.cpp +++ b/logPlus/mainwindow.cpp @@ -244,6 +244,12 @@ void MainWindow::initToolBar() // connect(m_runAc, &QAction::triggered, this, &MainWindow::s_SaveImage); // connect(m_debugAc, &QAction::triggered, this, &MainWindow::s_DrawImg); // connect(m_loadAc, &QAction::triggered, this, &MainWindow::s_DrawLine); + QTimer::singleShot(500, this, [=]() { + QString fileFull = GetProjectFolder() + "例子.wwl"; + QFileInfo fileInfo(fileFull); + if (fileInfo.exists()) + emit CallManage::getInstance()->sig_OpenProject(fileFull); + }); } //初始化插件QAction