From bec8d013edfcb8bf52d09cee991ce737e76254da Mon Sep 17 00:00:00 2001 From: jiegeaiai Date: Wed, 12 Feb 2025 01:54:16 +0800 Subject: [PATCH] fix bug by doc/*.txt --- doc/dyt修改.txt | 4 +-- src/Dyt.qrc | 1 + src/res/select_file.ico | Bin 0 -> 1150 bytes src/translations/Dyt_zh_CN.ts | 34 +++++++++--------- src/ui/Layout/AddParamSetting.cpp | 2 +- src/ui/Layout/AddParamSetting.ui | 6 ++++ src/ui/PropertyBrowser.cpp | 3 +- .../qtpropertybrowserutils.cpp | 10 +++--- .../PropertyBrowser/qttreepropertybrowser.cpp | 7 ++-- 9 files changed, 40 insertions(+), 27 deletions(-) create mode 100644 src/res/select_file.ico diff --git a/doc/dyt修改.txt b/doc/dyt修改.txt index ab374932..090a014e 100644 --- a/doc/dyt修改.txt +++ b/doc/dyt修改.txt @@ -1,6 +1,6 @@ 1.参数编辑时候崩溃bug。参数编辑窗口，添加，点击参数名称，在蓝色状态时候点击字母按键会崩溃。后续进行过某些操作就不会崩溃了。 解决方案 - a、修改当前的crash + a、修改当前的crash（解决） 2.参数编辑，第一次生成matlabparam还是在workspace下，后续生成在release下，simmatlab文件需要保存在release下才能运行。参数文件和运行的.m文件路径需要统一 解决方案 a、放到想定空间所在的目录 @@ -23,7 +23,7 @@ 5.关联文件时候更改文件的按键不太明显。 解决方案 - a、属性控件文件选择按钮不明显 + a、属性控件文件选择按钮不明显 （解决） b、属性控件中间的分割线能左右移动 6.提供的轨迹文件是如何输入到dyt界面的，我们需要知道。 diff --git a/src/Dyt.qrc b/src/Dyt.qrc index 5237e772..74ebcf16 100644 --- a/src/Dyt.qrc +++ b/src/Dyt.qrc @@ -7,6 +7,7 @@ res/sys_icon.png res/sys_down.png res/sys_up.png + res/select_file.ico res/default/menu_new_file.png res/default/menu_open_file.png res/default/menu_save_file.png diff --git a/src/res/select_file.ico b/src/res/select_file.ico new file mode 100644 index 0000000000000000000000000000000000000000..6ac6e1a112c947a356ab9f1e84e1c7d5aebff437 GIT binary patch literal 1150 zcmbVMK@Ng25FCPu7Z02~G_q?Y1*JEulch zrzpU_#B~Q80h|e@m$;Bed9ax?i2aWeD`r5DSUB^-^Eyd%#&9xj^Dk-Rg2!kDD>t>XQ?y! z2FH0Xh(mO$B^AY%oA;-f>$HCQfc2b@TESK5$sN~FEz7;MwXY>_D>i>GzQ$Xe<-9zY zhWyPsDIVfCk|z1?AC0vi({aD-Wyk=5mq&oabWae&0k|{NJ(AymJ^vUXCr-qJcml1L B02%-Q literal 0 HcmV?d00001 diff --git a/src/translations/Dyt_zh_CN.ts b/src/translations/Dyt_zh_CN.ts index c9d5d2b2..2215bcd1 100644 --- a/src/translations/Dyt_zh_CN.ts +++ b/src/translations/Dyt_zh_CN.ts @@ -32,57 +32,57 @@ - + 参数名称 - + 描述 - + 数据类型 - + 最大值 - + 最小值 - + 小数点有效位 - + 初始值 - + 数据输入示例 - + 添加 - + 删除 - + 应用 @@ -809,12 +809,12 @@ - + ModelBase - + color base @@ -822,12 +822,12 @@ QFilePathEdit - + Open File - + All Files (*) @@ -835,12 +835,12 @@ QModelFilePathEdit - + Open File - + All Files (*) diff --git a/src/ui/Layout/AddParamSetting.cpp b/src/ui/Layout/AddParamSetting.cpp index 614fd4ee..0074b5fa 100644 --- a/src/ui/Layout/AddParamSetting.cpp +++ b/src/ui/Layout/AddParamSetting.cpp @@ -22,7 +22,7 @@ AddParamSetting::AddParamSetting(const QString& strDir, QWidget* parent) { ui.setupUi(this); - setWindowFlags(/*Qt::FramelessWindowHint | */Qt::Window); + //setWindowFlags(/*Qt::FramelessWindowHint | */Qt::Window); listType << "String" << "Int" << "Double" << "Int[]" << "Double[]" << "String[]" << "a+bi"; diff --git a/src/ui/Layout/AddParamSetting.ui b/src/ui/Layout/AddParamSetting.ui index 82dc229a..d998459b 100644 --- a/src/ui/Layout/AddParamSetting.ui +++ b/src/ui/Layout/AddParamSetting.ui @@ -16,6 +16,12 @@ + + QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed + + + QAbstractItemView::ExtendedSelection + 参数名称 diff --git a/src/ui/PropertyBrowser.cpp b/src/ui/PropertyBrowser.cpp index bacf5490..9c187bc8 100644 --- a/src/ui/PropertyBrowser.cpp +++ b/src/ui/PropertyBrowser.cpp @@ -107,7 +107,8 @@ void PropertyBrowser::InitUI() { browser_ = new QtTreePropertyBrowser; layout->addWidget(browser_); - browser_->setHeaderVisible(false); + browser_->setHeaderVisible(true); + browser_->setResizeMode(QtTreePropertyBrowser::Interactive); InitPropertyManager(); InitComponentPropertyManager(); diff --git a/src/ui/PropertyBrowser/qtpropertybrowserutils.cpp b/src/ui/PropertyBrowser/qtpropertybrowserutils.cpp index 9dd2f476..59585943 100644 --- a/src/ui/PropertyBrowser/qtpropertybrowserutils.cpp +++ b/src/ui/PropertyBrowser/qtpropertybrowserutils.cpp @@ -696,8 +696,9 @@ QFilePathEdit::QFilePathEdit(QWidget* parent) : QWidget(parent), m_stringEdit(new QLineEdit(this)), m_button(new QPushButton(this)) { - m_button->setIcon(QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/button-reset.ico"))); - m_button->setMaximumWidth(15); + m_button->setIcon(QIcon(QLatin1String(":/res/select_file.ico"))); + m_button->setMaximumWidth(64); + m_button->setMinimumWidth(32); m_stringEdit->setReadOnly(true); @@ -771,8 +772,9 @@ QModelFilePathEdit::QModelFilePathEdit(QWidget* parent) : QWidget(parent), m_stringEdit(new QLineEdit(this)), m_button(new QPushButton(this)) { - m_button->setIcon(QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/button-reset.ico"))); - m_button->setMaximumWidth(15); + m_button->setIcon(QIcon(QLatin1String(":/res/select_file.ico"))); + m_button->setMaximumWidth(64); + m_button->setMinimumWidth(32); m_stringEdit->setReadOnly(true); diff --git a/src/ui/PropertyBrowser/qttreepropertybrowser.cpp b/src/ui/PropertyBrowser/qttreepropertybrowser.cpp index 0585c460..f0815b99 100644 --- a/src/ui/PropertyBrowser/qttreepropertybrowser.cpp +++ b/src/ui/PropertyBrowser/qttreepropertybrowser.cpp @@ -460,8 +460,11 @@ void QtTreePropertyBrowserPrivate::init(QWidget *parent) m_delegate = new QtPropertyEditorDelegate(parent); m_delegate->setEditorPrivate(this); m_treeWidget->setItemDelegate(m_delegate); - m_treeWidget->header()->setSectionsMovable(false); - m_treeWidget->header()->setSectionResizeMode(QHeaderView::Stretch); + QHeaderView* header = m_treeWidget->header(); + header->setSectionResizeMode(QHeaderView::Interactive); + header->setStretchLastSection(true); + + //header->setSectionResizeMode(QHeaderView::Stretch); m_expandIcon = drawIndicatorIcon(q_ptr->palette(), q_ptr->style());