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);