diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index 8cfd3fd..b10bcce 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -370,8 +370,9 @@ void MainWindowCurve::SetScrollBar_Geometry() if(m_fixwellsectionHeaderAc->isChecked()) { //获取井well前2行的高度 - int iTableSize_Head = 0; - getTableSize_Head(iTableSize_Head); + int iTableSize_Head = 100 + m_nObjLayerH; +// int iTableSize_Head = 0; +// getTableSize_Head(iTableSize_Head); int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1; QRect geoRect2 = ui->verticalScrollBar_2->geometry(); @@ -467,8 +468,9 @@ void MainWindowCurve::resizeEvent(QResizeEvent *event) ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom); } //获取井well前2行的高度 - int iTableSize_Head = 0; - getTableSize_Head(iTableSize_Head); + int iTableSize_Head = 100 + m_nObjLayerH; +// int iTableSize_Head = 0; +// getTableSize_Head(iTableSize_Head); int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1; //可视区域高度 int iScreenHeight = 0; @@ -3427,8 +3429,9 @@ void MainWindowCurve::ZoomIn(float fNewZoom) ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom); } //获取井well前2行的高度 - int iTableSize_Head = 0; - getTableSize_Head(iTableSize_Head); + int iTableSize_Head = 100 + m_nObjLayerH; +// int iTableSize_Head = 0; +// getTableSize_Head(iTableSize_Head); int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1; //可视区域高度 int iScreenHeight = 0; @@ -3682,9 +3685,10 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName, //--///////////////////////////////// //重置行高 int iTableSize_Head_Tmp = 0; - getTableSize_Head(iTableSize_Head_Tmp); + getTableSize_Head(iTableSize_Head_Tmp);//(此处获取的是被拉伸后的高度) if(iTableSize_Head_Tmp > (100+m_nObjLayerH)) { + //大于原始的高度,说明well井的第2行已经被拉伸,需要重新复位 //打印出图,改变深度 changeDepthForPrint(); } @@ -4399,8 +4403,9 @@ void MainWindowCurve::s_showHeadTable() ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom); } //获取井well前2行的高度 - int iTableSize_Head = 0; - getTableSize_Head(iTableSize_Head); + int iTableSize_Head = 100 + m_nObjLayerH; +// int iTableSize_Head = 0; +// getTableSize_Head(iTableSize_Head); int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1; //可视区域高度 int iScreenHeight = 0; @@ -4482,8 +4487,9 @@ void MainWindowCurve::s_showHeadTable() ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom); } //获取井well前2行的高度 - int iTableSize_Head = 0; - getTableSize_Head(iTableSize_Head); + int iTableSize_Head = 100 + m_nObjLayerH; +// int iTableSize_Head = 0; +// getTableSize_Head(iTableSize_Head); int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1; //可视区域高度 int iScreenHeight = 0; @@ -5727,8 +5733,9 @@ void MainWindowCurve::Open(QString fileFull) ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom); } //获取井well前2行的高度 - int iTableSize_Head = 0; - getTableSize_Head(iTableSize_Head); + int iTableSize_Head = 100 + m_nObjLayerH; +// int iTableSize_Head = 0; +// getTableSize_Head(iTableSize_Head); int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1; //可视区域高度 int iScreenHeight = 0; @@ -6022,8 +6029,9 @@ void MainWindowCurve::s_changeDepth(QString strUuid, QString strSlfName, QString ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom); } //获取井well前2行的高度 - int iTableSize_Head = 0; - getTableSize_Head(iTableSize_Head); + int iTableSize_Head = 100 + m_nObjLayerH; +// int iTableSize_Head = 0; +// getTableSize_Head(iTableSize_Head); int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1; //可视区域高度 int iScreenHeight = 0;