jiayulong/logplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: jiayulong:97181df7cfe344930f7190471b923fd1b96b6621
Branches Tags
jiayulong:main
jiayulong:master
..
compare: jiayulong:021d3e3f82cb7352082f470be0b43bbcead0c758
Branches Tags
jiayulong:main
jiayulong:master

No commits in common. "97181df7cfe344930f7190471b923fd1b96b6621" and "021d3e3f82cb7352082f470be0b43bbcead0c758" have entirely different histories.
97181df7cf ... 021d3e3f82

1 changed files with 38 additions and 24 deletions
Show Stats Expand all files Collapse all files

62
logPlus/mainwindowcurve.cpp
View File

@ -370,9 +370,8 @@ void MainWindowCurve::SetScrollBar_Geometry()
if(m_fixwellsectionHeaderAc->isChecked()) if(m_fixwellsectionHeaderAc->isChecked())
{ {
//获取井well前2行的高度 //获取井well前2行的高度
int iTableSize_Head = 100 + m_nObjLayerH; int iTableSize_Head = 0;
// int iTableSize_Head = 0; getTableSize_Head(iTableSize_Head);
// getTableSize_Head(iTableSize_Head);
int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1; int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1;
QRect geoRect2 = ui->verticalScrollBar_2->geometry(); QRect geoRect2 = ui->verticalScrollBar_2->geometry();
@ -468,9 +467,8 @@ void MainWindowCurve::resizeEvent(QResizeEvent *event)
ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom); ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom);
} }
//获取井well前2行的高度 //获取井well前2行的高度
int iTableSize_Head = 100 + m_nObjLayerH; int iTableSize_Head = 0;
// int iTableSize_Head = 0; getTableSize_Head(iTableSize_Head);
// getTableSize_Head(iTableSize_Head);
int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1; int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1;
//可视区域高度 //可视区域高度
int iScreenHeight = 0; int iScreenHeight = 0;
@ -596,9 +594,31 @@ void MainWindowCurve::vertScrollBarChanged(int iValue)
iHeightOfScreen = g_iHeight_MyCustom; iHeightOfScreen = g_iHeight_MyCustom;
} }
double dScrollHeight = (iHeightOfScreen-g_WorkSpace_Height)/g_dPixelPerCm/100.0 * (double)m_iScale; QRect rect2 = ui->centralwidget->geometry();
int left, top, right, bottom;
if (ui->centralwidget->layout())
{
ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom);
}
//获取井well前2行的高度
int iTableSize_Head = 0;
getTableSize_Head(iTableSize_Head);
int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1;
//可视区域高度
int iScreenHeight = 0;
//锁头
if(m_fixwellsectionHeaderAc->isChecked())
{
iScreenHeight = (double)(rect2.height()-10- top -bottom - iTableWellTrack_height)/g_dPixelPerCm * m_iScale;
}
else{
iScreenHeight = (double)(rect2.height()-10- top -bottom - 4)/g_dPixelPerCm * m_iScale;
}
//double dScrollHeight = (iHeightOfScreen-g_WorkSpace_Height)/g_dPixelPerCm/100.0 * (double)m_iScale;
double dScrollHeight_setGeometry = iHeightOfScreen/g_dPixelPerCm/100.0 * (double)m_iScale; double dScrollHeight_setGeometry = iHeightOfScreen/g_dPixelPerCm/100.0 * (double)m_iScale;
double dScreenHeightMi = (double)iScreenHeight/100.0;
double dScrollHeight = dScrollHeight_setGeometry - dScreenHeightMi;
// //
double dDelta = value - upper; double dDelta = value - upper;
int iNumShow = dDelta/dScrollHeight; int iNumShow = dDelta/dScrollHeight;
@ -3429,9 +3449,8 @@ void MainWindowCurve::ZoomIn(float fNewZoom)
ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom); ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom);
} }
//获取井well前2行的高度 //获取井well前2行的高度
int iTableSize_Head = 100 + m_nObjLayerH; int iTableSize_Head = 0;
// int iTableSize_Head = 0; getTableSize_Head(iTableSize_Head);
// getTableSize_Head(iTableSize_Head);
int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1; int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1;
//可视区域高度 //可视区域高度
int iScreenHeight = 0; int iScreenHeight = 0;
@ -3685,10 +3704,9 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName,
//--///////////////////////////////// //--/////////////////////////////////
//重置行高 //重置行高
int iTableSize_Head_Tmp = 0; int iTableSize_Head_Tmp = 0;
getTableSize_Head(iTableSize_Head_Tmp);//（此处获取的是被拉伸后的高度） getTableSize_Head(iTableSize_Head_Tmp);
if(iTableSize_Head_Tmp > (100+m_nObjLayerH)) if(iTableSize_Head_Tmp > (100+m_nObjLayerH))
{ {
//大于原始的高度，说明well井的第2行已经被拉伸，需要重新复位
//打印出图，改变深度 //打印出图，改变深度
changeDepthForPrint(); changeDepthForPrint();
} }
@ -4403,9 +4421,8 @@ void MainWindowCurve::s_showHeadTable()
ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom); ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom);
} }
//获取井well前2行的高度 //获取井well前2行的高度
int iTableSize_Head = 100 + m_nObjLayerH; int iTableSize_Head = 0;
// int iTableSize_Head = 0; getTableSize_Head(iTableSize_Head);
// getTableSize_Head(iTableSize_Head);
int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1; int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1;
//可视区域高度 //可视区域高度
int iScreenHeight = 0; int iScreenHeight = 0;
@ -4487,9 +4504,8 @@ void MainWindowCurve::s_showHeadTable()
ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom); ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom);
} }
//获取井well前2行的高度 //获取井well前2行的高度
int iTableSize_Head = 100 + m_nObjLayerH; int iTableSize_Head = 0;
// int iTableSize_Head = 0; getTableSize_Head(iTableSize_Head);
// getTableSize_Head(iTableSize_Head);
int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1; int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1;
//可视区域高度 //可视区域高度
int iScreenHeight = 0; int iScreenHeight = 0;
@ -5733,9 +5749,8 @@ void MainWindowCurve::Open(QString fileFull)
ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom); ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom);
} }
//获取井well前2行的高度 //获取井well前2行的高度
int iTableSize_Head = 100 + m_nObjLayerH; int iTableSize_Head = 0;
// int iTableSize_Head = 0; getTableSize_Head(iTableSize_Head);
// getTableSize_Head(iTableSize_Head);
int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1; int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1;
//可视区域高度 //可视区域高度
int iScreenHeight = 0; int iScreenHeight = 0;
@ -6029,9 +6044,8 @@ void MainWindowCurve::s_changeDepth(QString strUuid, QString strSlfName, QString
ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom); ui->centralwidget->layout()->getContentsMargins(&left, &top, &right, &bottom);
} }
//获取井well前2行的高度 //获取井well前2行的高度
int iTableSize_Head = 100 + m_nObjLayerH; int iTableSize_Head = 0;
// int iTableSize_Head = 0; getTableSize_Head(iTableSize_Head);
// getTableSize_Head(iTableSize_Head);
int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1; int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (5) + iTableSize_Head -1;
//可视区域高度 //可视区域高度
int iScreenHeight = 0; int iScreenHeight = 0;