Merge branch 'main' of http://git.hivekion.com:3000/jiayulong/logplus
This commit is contained in:
commit
e53cbe241c
|
|
@ -3756,6 +3756,7 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName,
|
||||||
//切换回锁头模式
|
//切换回锁头模式
|
||||||
m_fixwellsectionHeaderAc->setChecked(true);
|
m_fixwellsectionHeaderAc->setChecked(true);
|
||||||
|
|
||||||
|
//全部显示道头,方便抓拍道头
|
||||||
ShowTableHead_All();
|
ShowTableHead_All();
|
||||||
ui->tableWidget_2->verticalScrollBar()->setValue(0);
|
ui->tableWidget_2->verticalScrollBar()->setValue(0);
|
||||||
|
|
||||||
|
|
@ -4039,6 +4040,15 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName,
|
||||||
images.append(convertToQImage(pPixmap_wellTrackInfo)); // 将QPixmap转换为QImage并存储到列表中
|
images.append(convertToQImage(pPixmap_wellTrackInfo)); // 将QPixmap转换为QImage并存储到列表中
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//-------------------------
|
||||||
|
//部分显示道头,方便抓拍曲线(不然如果道头太高,占满整个界面,会导致曲线部分抓怕失败)
|
||||||
|
ShowTableHead_One();
|
||||||
|
//获取井well前2行的高度
|
||||||
|
int iTableSize_Head_ForGrab = 0;
|
||||||
|
getTableSize_Head(iTableSize_Head_ForGrab);
|
||||||
|
int iTableWellTrack_height_ForGrab = ui->tableWidget_2->rowHeight(0) + (top+3) + iTableSize_Head_ForGrab -1 +2;
|
||||||
|
//-------------------------
|
||||||
|
|
||||||
double newValue = 0;
|
double newValue = 0;
|
||||||
double newValue_last = 0;
|
double newValue_last = 0;
|
||||||
//int iPreH = 6;
|
//int iPreH = 6;
|
||||||
|
|
@ -4077,7 +4087,7 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName,
|
||||||
{
|
{
|
||||||
//最后1页
|
//最后1页
|
||||||
ui->centralwidget->setGeometry(geoRect.x(), geoRect.y(), iMaxWidth, iHight+40);
|
ui->centralwidget->setGeometry(geoRect.x(), geoRect.y(), iMaxWidth, iHight+40);
|
||||||
QPixmap pPixmap = this->grab(QRect(geoRect.x(), geoRect.y()+iTableWellTrack_height, iMaxWidth, dLastHeight));
|
QPixmap pPixmap = this->grab(QRect(geoRect.x(), geoRect.y()+iTableWellTrack_height_ForGrab, iMaxWidth, dLastHeight));
|
||||||
//保存,方便查看
|
//保存,方便查看
|
||||||
if(g_iDebug)
|
if(g_iDebug)
|
||||||
{
|
{
|
||||||
|
|
@ -4095,7 +4105,7 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName,
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
ui->centralwidget->setGeometry(geoRect.x(), geoRect.y(), iMaxWidth, iHight+40);
|
ui->centralwidget->setGeometry(geoRect.x(), geoRect.y(), iMaxWidth, iHight+40);
|
||||||
QPixmap pPixmap = this->grab(QRect(geoRect.x(), geoRect.y()+iTableWellTrack_height, iMaxWidth, iHeightOfScreen-2));
|
QPixmap pPixmap = this->grab(QRect(geoRect.x(), geoRect.y()+iTableWellTrack_height_ForGrab, iMaxWidth, iHeightOfScreen-2));
|
||||||
//保存,方便查看
|
//保存,方便查看
|
||||||
if(g_iDebug)
|
if(g_iDebug)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user