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

Merge branch 'main' of http://git.hivekion.com:3000/jiayulong/logplus

Browse Source
This commit is contained in:
DESKTOP-450PEFP\mainc 2026-05-08 14:40:36 +08:00
commit bab0aaa912
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
logPlus/formdraw.cpp
View File

@ -4091,6 +4091,10 @@ FormLine* FormDraw::s_addSantuyibiao(QString strUuid, QString strSlfName, QStrin
m_formTrack->Add(strSlfName, m_strWellName, m_strTrackName, strLineName, strAliasName, strUnit, newlineColor, width, _nSamples, 0, strScaleType, "SantuyibiaoObject"); m_formTrack->Add(strSlfName, m_strWellName, m_strTrackName, strLineName, strAliasName, strUnit, newlineColor, width, _nSamples, 0, strScaleType, "SantuyibiaoObject");
emit CallManage::getInstance()->sig_ChangeTvdProperty(m_strUuid, m_strSlfName, m_strWellName, m_strTrackName, "Santuyibiao", emit CallManage::getInstance()->sig_ChangeTvdProperty(m_strUuid, m_strSlfName, m_strWellName, m_strTrackName, "Santuyibiao",
(QObject *)(curv->m_drawTvd)); (QObject *)(curv->m_drawTvd));
//修改滚动条，针对新建的
emit CallManage::getInstance()->sig_changeScrollBar(m_strUuid);
return curv; return curv;
} }

15
logPlus/mainwindowcurve.cpp
View File

@ -2803,6 +2803,16 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName,
// changeDepthForPrint(); // changeDepthForPrint();
// } // }
//--/////////////////////////////////
//重置行高
int iTableSize_Head_Tmp = 0;
getTableSize_Head(iTableSize_Head_Tmp);
if(iTableSize_Head_Tmp > (100+m_nObjLayerH))
{
//打印出图，改变深度
changeDepthForPrint();
}
//--/////////////////////////////////
printer.setPageMargins(0.0,0.0,0.0,0.0,QPrinter::DevicePixel); printer.setPageMargins(0.0,0.0,0.0,0.0,QPrinter::DevicePixel);
printer.setFullPage(true); printer.setFullPage(true);
@ -2832,7 +2842,6 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName,
//高度 //高度
for(int i=0; i<ui->tableWidget_2->rowCount(); i++) for(int i=0; i<ui->tableWidget_2->rowCount(); i++)
{ {
iHight += ui->tableWidget_2->rowHeight(i); iHight += ui->tableWidget_2->rowHeight(i);
} }
iHight += 9 + (ui->tableWidget_2->rowCount()+1);//上margin + 边框n+1 iHight += 9 + (ui->tableWidget_2->rowCount()+1);//上margin + 边框n+1
@ -4706,8 +4715,8 @@ void MainWindowCurve::changeDepthForPrint()
// //
//获取井well前2行的高度 //获取井well前2行的高度
int iTableSize_Head = 100 + m_nObjLayerH; int iTableSize_Head = 100 + m_nObjLayerH;
//此处还没有生成well，所以不能这样获取 //
//getTableSize_Head(iTableSize_Head); getTableSize_Head(iTableSize_Head);
// //
ui->tableWidget_2->setRowHeight(1, (int)iHeightOfScreen+iTableSize_Head+(3+1)+10); ui->tableWidget_2->setRowHeight(1, (int)iHeightOfScreen+iTableSize_Head+(3+1)+10);
//update(); //update();