From 8bfedf3ef6ecf2b3de07fa79e837c362bdd48c51 Mon Sep 17 00:00:00 2001
From: jiayulong <jiayulong@hivekion.com>
Date: Thu, 11 Jun 2026 09:49:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
 =?UTF-8?q?=E7=9A=84=E8=8C=83=E5=9B=B4=E5=80=BC=EF=BC=8C=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8B=E6=96=B9=E6=BB=9A=E5=8A=A8=E6=9D=A1=E7=9A=84=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E5=A4=84=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logPlus/mainwindowcurve.cpp | 74 +++++++++++++++++++++++++++++++++----
 1 file changed, 66 insertions(+), 8 deletions(-)

diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp
index db8c7de..bb41165 100644
--- a/logPlus/mainwindowcurve.cpp
+++ b/logPlus/mainwindowcurve.cpp
@@ -480,8 +480,17 @@ void MainWindowCurve::resizeEvent(QResizeEvent *event)
     else{
         iScreenHeight = (double)(rect2.height()-10- top -bottom - 4)/g_dPixelPerCm * m_iScale;
     }
-
-    ui->verticalScrollBar->setRange(-m_iY2*100, -m_iY1*100 - iScreenHeight);
+    //下方滚动条高度
+    int iHScrollBarHeight = 0;
+    if(!ui->tableWidget_2->horizontalScrollBar()->isVisible())
+    {
+        iHScrollBarHeight = 0;
+    }
+    else
+    {
+        iHScrollBarHeight = ui->tableWidget_2->horizontalScrollBar()->height()/g_dPixelPerCm * m_iScale;
+    }
+    ui->verticalScrollBar->setRange(-m_iY2*100, -m_iY1*100 - iScreenHeight + iHScrollBarHeight);
 }
 
 QToolBar * MainWindowCurve::getPluginToolBar()
@@ -3453,7 +3462,17 @@ void MainWindowCurve::ZoomIn(float fNewZoom)
     else{
         iScreenHeight = (double)(rect2.height()-10- top -bottom - 4)/g_dPixelPerCm * m_iScale;
     }
-    ui->verticalScrollBar->setRange(-m_iY2*100, -m_iY1*100 - iScreenHeight);
+    //下方滚动条高度
+    int iHScrollBarHeight = 0;
+    if(!ui->tableWidget_2->horizontalScrollBar()->isVisible())
+    {
+        iHScrollBarHeight = 0;
+    }
+    else
+    {
+        iHScrollBarHeight = ui->tableWidget_2->horizontalScrollBar()->height()/g_dPixelPerCm * m_iScale;
+    }
+    ui->verticalScrollBar->setRange(-m_iY2*100, -m_iY1*100 - iScreenHeight + iHScrollBarHeight);
 }
 
 //缩放
@@ -4415,7 +4434,17 @@ void MainWindowCurve::s_showHeadTable()
         else{
             iScreenHeight = (double)(rect2.height()-10- top -bottom - 4)/g_dPixelPerCm * m_iScale;
         }
-        ui->verticalScrollBar->setRange(-m_iY2*100, -m_iY1*100 - iScreenHeight);
+        //下方滚动条高度
+        int iHScrollBarHeight = 0;
+        if(!ui->tableWidget_2->horizontalScrollBar()->isVisible())
+        {
+            iHScrollBarHeight = 0;
+        }
+        else
+        {
+            iHScrollBarHeight = ui->tableWidget_2->horizontalScrollBar()->height()/g_dPixelPerCm * m_iScale;
+        }
+        ui->verticalScrollBar->setRange(-m_iY2*100, -m_iY1*100 - iScreenHeight + iHScrollBarHeight);
         ui->verticalScrollBar->setValue(-m_iY2*100);
 
         //QMessageBox::information(NULL,"提示","锁头完成！",QMessageBox::Ok);
@@ -4488,7 +4517,17 @@ void MainWindowCurve::s_showHeadTable()
         else{
             iScreenHeight = (double)(rect2.height()-10- top -bottom - 4)/g_dPixelPerCm * m_iScale;
         }
-        ui->verticalScrollBar->setRange(-m_iY2*100, -m_iY1*100 - iScreenHeight);
+        //下方滚动条高度
+        int iHScrollBarHeight = 0;
+        if(!ui->tableWidget_2->horizontalScrollBar()->isVisible())
+        {
+            iHScrollBarHeight = 0;
+        }
+        else
+        {
+            iHScrollBarHeight = ui->tableWidget_2->horizontalScrollBar()->height()/g_dPixelPerCm * m_iScale;
+        }
+        ui->verticalScrollBar->setRange(-m_iY2*100, -m_iY1*100 - iScreenHeight + iHScrollBarHeight);
         ui->verticalScrollBar->setValue(-m_iY2*100);
 
         //QMessageBox::information(NULL,"提示","锁头取消！",QMessageBox::Ok);
@@ -5723,7 +5762,17 @@ void MainWindowCurve::Open(QString fileFull)
         else{
             iScreenHeight = (double)(rect2.height()-10- top -bottom - 4)/g_dPixelPerCm * m_iScale;
         }
-        ui->verticalScrollBar->setRange(-m_iY2*100, -m_iY1*100 - iScreenHeight);
+        //下方滚动条高度
+        int iHScrollBarHeight = 0;
+        if(!ui->tableWidget_2->horizontalScrollBar()->isVisible())
+        {
+            iHScrollBarHeight = 0;
+        }
+        else
+        {
+            iHScrollBarHeight = ui->tableWidget_2->horizontalScrollBar()->height()/g_dPixelPerCm * m_iScale;
+        }
+        ui->verticalScrollBar->setRange(-m_iY2*100, -m_iY1*100 - iScreenHeight + iHScrollBarHeight);
         //ui->verticalScrollBar->setRange(-m_iY2*100, -m_iY1*100);
         ui->verticalScrollBar->setValue(-m_iY2*100);
 
@@ -6008,8 +6057,17 @@ void MainWindowCurve::s_changeDepth(QString strUuid, QString strSlfName, QString
     else{
         iScreenHeight = (double)(rect2.height()-10- top -bottom - 4)/g_dPixelPerCm * m_iScale;
     }
-
-    ui->verticalScrollBar->setRange(-m_iY2*100, -m_iY1*100 - iScreenHeight);
+    //下方滚动条高度
+    int iHScrollBarHeight = 0;
+    if(!ui->tableWidget_2->horizontalScrollBar()->isVisible())
+    {
+        iHScrollBarHeight = 0;
+    }
+    else
+    {
+        iHScrollBarHeight = ui->tableWidget_2->horizontalScrollBar()->height()/g_dPixelPerCm * m_iScale;
+    }
+    ui->verticalScrollBar->setRange(-m_iY2*100, -m_iY1*100 - iScreenHeight + iHScrollBarHeight);
     //ui->verticalScrollBar->setRange(-m_iY2*100, -m_iY1*100);
     ui->verticalScrollBar->setValue(-m_iY2*100);