From a9b4a42c871b4bfe4b63625109852ba19b2c9713 Mon Sep 17 00:00:00 2001 From: jiayulong Date: Fri, 29 May 2026 11:11:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=81=E5=A4=B4?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=97=B6=E7=9A=84=E5=B1=85=E4=B8=AD=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logPlus/mainwindowcurve.cpp | 48 +++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index 878d4bd..d40898f 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -270,8 +270,10 @@ void MainWindowCurve::s_setRangeVScrollBar2(QString strUuid) getTableSize_Head_Biggest(iTableSize_Head_Biggest); //int iTableWellTrack_height_Biggest = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head_Biggest -1; - ui->verticalScrollBar_2->setRange(0, iTableSize_Head_Biggest-100-100); - ui->verticalScrollBar_2->setValue(0); +// ui->verticalScrollBar_2->setRange(0, iTableSize_Head_Biggest-100-100); +// ui->verticalScrollBar_2->setValue(0); + //2个滚动条位置 + SetScrollBar_Geometry(); emit sig_resizeWindow(); } @@ -357,7 +359,14 @@ void MainWindowCurve::SetScrollBar_Geometry() } else { - ui->verticalScrollBar_2->hide(); + //ui->verticalScrollBar_2->hide(); + //替换为高度0，不然居中处理失效 + QRect geoRect2 = ui->verticalScrollBar_2->geometry(); + ui->verticalScrollBar_2->setGeometry(geoRect2.x(), geoRect2.y(), geoRect2.width(), 0); + // + QRect geoRect = ui->verticalScrollBar->geometry(); + ui->verticalScrollBar->setGeometry(geoRect.x(), geoRect2.y(), geoRect.width(), geoRect.height()+geoRect2.height()); + // // //获取井well前2行的高度 // int iTableSize_Head = 0; @@ -408,6 +417,8 @@ void MainWindowCurve::resizeEvent(QResizeEvent *event) // nhei mainToolBar的高度 m_nObjLyrH，对象单元格高度 100头高度，100井头高度 emit CallManage::getInstance()->sig_ResizeHeight(m_strUuid, m_nObjDrawH); + emit sig_resizeWindow(); + //2个滚动条位置 SetScrollBar_Geometry(); } @@ -3360,10 +3371,10 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName, // changeDepthForPrint(); // } - //切换回锁头模式 - m_fixwellsectionHeaderAc->setChecked(true); //预览 m_PreviewPrintAc->setChecked(true); + //切换回锁头模式 + m_fixwellsectionHeaderAc->setChecked(true); ShowTableHead_All(); ui->tableWidget_2->verticalScrollBar()->setValue(0); @@ -3846,19 +3857,18 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName, //居中显示 m_PreviewPrintAc->setChecked(false); - emit sig_resizeWindow(); - // - ShowTableHead_One(); //2个滚动条位置 SetScrollBar_Geometry(); - if(bOK) { QMessageBox::information(NULL,"提示","图件输出完成！",QMessageBox::Ok); } + ShowTableHead_One(); + //2个滚动条位置 + SetScrollBar_Geometry(); } //导出长图 @@ -3968,6 +3978,8 @@ void MainWindowCurve::s_showHeadTable() //2个滚动条位置 SetScrollBar_Geometry(); ui->verticalScrollBar->setValue(-m_iY2*100); + + //QMessageBox::information(NULL,"提示","锁头完成！",QMessageBox::Ok); } else { //第一次显示，判断是否从json加载 @@ -4003,12 +4015,24 @@ void MainWindowCurve::s_showHeadTable() { m_dock2->show(); } + //---------------------- + //ui->verticalScrollBar_2->hide(); + //替换为高度0，不然居中处理失效 + QRect geoRect2 = ui->verticalScrollBar_2->geometry(); + ui->verticalScrollBar_2->setGeometry(geoRect2.x(), geoRect2.y(), geoRect2.width(), 0); // - ui->verticalScrollBar_2->hide(); + QRect geoRect = ui->verticalScrollBar->geometry(); + ui->verticalScrollBar->setGeometry(geoRect.x(), geoRect2.y(), geoRect.width(), geoRect.height()+geoRect2.height()); + //---------------------- + //通过原始的滚动条，整体滚动 //ui->tableWidget_2->verticalScrollBar()->setValue(0); ShowTableHead_All(); ui->verticalScrollBar->setValue(-m_iY2*100); + + //QMessageBox::information(NULL,"提示","锁头取消！",QMessageBox::Ok); + + } } @@ -6311,6 +6335,8 @@ void MainWindowCurve::ShowTableHead_All() } } } + //居中 + emit sig_resizeWindow(); } void MainWindowCurve::ShowTableHead_One() @@ -6349,6 +6375,8 @@ void MainWindowCurve::ShowTableHead_One() } } } + //居中 + emit sig_resizeWindow(); } //打开成果表 From e486388b1b0841cc70d794d1f87e41bddd3abb8e Mon Sep 17 00:00:00 2001 From: jiayulong Date: Fri, 29 May 2026 11:31:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=97=E5=AE=BD=E6=94=B9=E5=8F=98?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=BF=80=E5=8F=91=E5=B1=85=E4=B8=AD=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logPlus/mainwindowcurve.cpp | 18 +++++++++++++++++- logPlus/mainwindowcurve.h | 3 +++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index d40898f..31db9bf 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -119,6 +119,8 @@ MainWindowCurve::MainWindowCurve(QWidget *parent) : ui->tableWidget_2->setContextMenuPolicy(Qt::CustomContextMenu); // 连接信号和槽 connect(ui->tableWidget_2, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(slotContextMenu(QPoint))); + //列宽改变 + connect(ui->tableWidget_2->horizontalHeader(), &QHeaderView::sectionResized, this, &MainWindowCurve::onSectionResized); //隐藏滚动条 ui->tableWidget_2->verticalScrollBar()->setDisabled(true); // 禁用滚动 @@ -275,7 +277,7 @@ void MainWindowCurve::s_setRangeVScrollBar2(QString strUuid) //2个滚动条位置 SetScrollBar_Geometry(); - emit sig_resizeWindow(); + //emit sig_resizeWindow(); } //窗口居中处理 @@ -6389,3 +6391,17 @@ void MainWindowCurve::slotCreateTail() { m_dock2->show(); } + +//列宽改变 +void MainWindowCurve::onSectionResized(int logicalIndex, int oldSize, int newSize) +{ + if(g_iLoadingJson==1)//针对模板加载，不处理列宽改变，避免多次冲突 + { + return; + } + + qDebug() << "onSectionResized"; + + //居中 + emit sig_resizeWindow(); +} diff --git a/logPlus/mainwindowcurve.h b/logPlus/mainwindowcurve.h index 7e06b36..89ecc27 100644 --- a/logPlus/mainwindowcurve.h +++ b/logPlus/mainwindowcurve.h @@ -228,6 +228,9 @@ public slots: //窗口居中处理 void resizeWindow(); + //列宽改变 + void onSectionResized(int logicalIndex, int oldSize, int newSize); + public: QAction* m_selectWellAc = nullptr; //选择井 QAction* m_fixwellsectionHeaderAc = nullptr; //锁头 From 1f0b878dcb53ad556a913a9fa043dbbdf1107f8a Mon Sep 17 00:00:00 2001 From: jiayulong Date: Fri, 29 May 2026 12:02:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E2=80=9C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=81=93=E5=A4=B4=E2=80=9D=E5=8B=BE=E9=80=89=E5=B8=A6?= =?UTF-8?q?=E6=9D=A5=E7=9A=84=E5=A4=B4=E9=83=A8=E6=BB=9A=E5=8A=A8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logPlus/formwell.cpp | 12 ++++++------ logPlus/mainwindowcurve.cpp | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/logPlus/formwell.cpp b/logPlus/formwell.cpp index 0adff99..7c52032 100644 --- a/logPlus/formwell.cpp +++ b/logPlus/formwell.cpp @@ -1204,12 +1204,12 @@ void FormWell::HideTableHead() { if(ui->tableWidget->rowCount()>0) { - //显示道头 - if(m_bShowTrackHead) - { - ui->tableWidget->showRow(0); - } - else +// //显示道头 +// if(m_bShowTrackHead) +// { +// ui->tableWidget->showRow(0); +// } +// else { ui->tableWidget->hideRow(0); } diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index 31db9bf..b4b7e5b 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -3975,8 +3975,12 @@ void MainWindowCurve::s_showHeadTable() // ui->verticalScrollBar_2->show(); ShowTableHead_One(); + //通过原始的滚动条，整体滚动 //ui->tableWidget_2->verticalScrollBar()->setValue(0); + //ui->verticalScrollBar_2->setValue(0); + vertScrollBarChanged_Head(0); + //2个滚动条位置 SetScrollBar_Geometry(); ui->verticalScrollBar->setValue(-m_iY2*100);