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:
crqiqi77 2026-04-29 15:51:50 +08:00
commit 83c298e8fe
10 changed files with 62 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CallManage/CallManage.h
View File

@ -177,11 +177,13 @@ signals:
void sig_changeScale(QString strUuid, int iNewScale);
//自定义滚动条
void sig_vertScrollBarChanged_setGeometry(QString strUuid, int iNewValue, int low, int upper);
void sig_vertScrollBarChanged_setGeometry(QString strUuid, double iNewValue, double low, double upper);
//自定义滚动条
void sig_vertScrollBarChanged(QString strUuid, int iNewValue, int low, int upper);
void sig_vertScrollBarChanged(QString strUuid, double iNewValue, double low, double upper);
//自定义滚动条(三图一表)
void sig_vertScrollBarChanged_santuyibiao(QString strUuid, int iNewValue, int low, int upper);
void sig_vertScrollBarChanged_santuyibiao(QString strUuid, double iNewValue, double low, double upper);
//自定义滚动条(三图一表，打印)
void sig_vertScrollBarChanged_santu_Print(QString strUuid, int iNum, int iHeightOfScreen);
//改变深度
void sig_changeDepth(QString strUuid, QString strSlfName, QString strWellName, int iY1, int iY2);

6
logPlus/formdraw.cpp
View File

@ -3496,7 +3496,8 @@ void FormDraw::setRowHeight(double dHight, QProgressBar *progressBar, int iSplit
if(form)
{
int nw = form->geometry().width();
form->setGeometry(0, 0, nw, (int)dHight);
form->setGeometry(form->geometry().x(), form->geometry().y(), nw, (int)dHight);
//form->setGeometry(0, 0, nw, (int)dHight);
form->updateDepthY(m_iY1, m_iY2);
//emit CallManage::getInstance()->sig_ChangeLeftScale(m_strUuid, form->m_strSlfName, m_strWellName, m_strTrackName, form->m_strLineName, form->m_iX1);
@ -4066,7 +4067,8 @@ FormLine* FormDraw::s_addSantuyibiao(QString strUuid, QString strSlfName, QStrin
ntmpw = (g_iOneWidth*4)* g_dPixelPerCm;
}
//curv->setGeometry(0, 0, ntmpw - 2, (int)dHight);
curv->setGeometry(0, 0, ntmpw - 2, (int)32767);//斜井三图一表，固定最大值，方便上下滚动
//curv->setGeometry(0, 0, ntmpw - 2, (int)32767);//斜井三图一表，固定最大值，方便上下滚动
curv->setGeometry(curv->geometry().x(), curv->geometry().y(), ntmpw - 2, (int)30000);
curv->show();
//斜井三图一表

23
logPlus/formline.cpp
View File

@ -22,7 +22,9 @@ FormLine::FormLine(QWidget *parent, QString strSlfName, QString strWellName, QSt
connect(CallManage::getInstance(), SIGNAL(sig_ChangeTvdProperty(QString, QString, QString, QString, QString, QString, QString, QVariant)),
this, SLOT(s_ChangeTvdProperty(QString, QString, QString, QString, QString, QString, QString, QVariant)));
//自定义滚动条
connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged_santuyibiao(QString, int, int, int)), this, SLOT(vertScrollBarChanged(QString, int, int, int)));
connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged_santuyibiao(QString, double, double, double)), this, SLOT(vertScrollBarChanged(QString, double, double, double)));
//打印
connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged_santu_Print(QString, int, int)), this, SLOT(vertScrollBarChanged_Print(QString, int, int)));
}
@ -324,7 +326,7 @@ void FormLine::s_ChangeTvdProperty(QString strUuid, QString strSlfName, QString
}
//自定义滚动条
void FormLine::vertScrollBarChanged(QString strUuid, int value, int low, int upper)
void FormLine::vertScrollBarChanged(QString strUuid, double value, double low, double upper)
{
if(m_strUuid==strUuid)
{
@ -342,6 +344,23 @@ void FormLine::vertScrollBarChanged(QString strUuid, int value, int low, int upp
setGeometry(0, -(dPercent*geoRect.height()), geoRect.width(), geoRect.height());
}
//打印
void FormLine::vertScrollBarChanged_Print(QString strUuid, int iNum, int iHeightOfScreen)
{
if(m_strUuid==strUuid)
{
}
else
{
return;
}
//上移或下移
QRect geoRect = geometry();
//
double dDelta = iHeightOfScreen*(iNum-1);
setGeometry(0, -dDelta, geoRect.width(), geoRect.height());
}
void FormLine::wheelEvent(QWheelEvent *event) // 滚轮事件
{
emit CallManage::getInstance()->sig_mouseWheel(event);

3
logPlus/formline.h
View File

@ -41,7 +41,8 @@ public slots:
QString strGroup, QString strProperty, QVariant variant);
//滚动条
void vertScrollBarChanged(QString strUuid, int value, int low, int upper);
void vertScrollBarChanged(QString strUuid, double value, double low, double upper);
void vertScrollBarChanged_Print(QString strUuid, int iNum, int iHeightOfScreen);
};
#endif // FORMLINE_H

2
logPlus/mainwindow.cpp
View File

@ -173,7 +173,7 @@ void MainWindow::ReadConfig()
//(0:采用最大30000像素高度， 1:采用屏幕工作区域高度， 其他数字：高度采用g_iHeight_MyCustom的值)
int iHeight = 10000;
//读取,MyCustom界面高度
//qtCommon->readHeight(configPath, iHeight);
qtCommon->readHeight(configPath, iHeight);
g_iHeight_MyCustom = iHeight;
//Debug模式

33
logPlus/mainwindowcurve.cpp
View File

@ -252,7 +252,7 @@ void MainWindowCurve::vertScrollBarChanged(int value)
}
if(m_iCurPage == iNumShow)
{
int iCurValue = dDelta - (iNumShow-1)*dScrollHeight;
double iCurValue = dDelta - (iNumShow-1)*dScrollHeight;
//通知界面重设范围
emit CallManage::getInstance()->sig_vertScrollBarChanged_setGeometry(m_strUuid, iCurValue, dScrollHeight_setGeometry, 0);
}
@ -260,14 +260,14 @@ void MainWindowCurve::vertScrollBarChanged(int value)
{
m_iCurPage = iNumShow;
//通知界面重设范围
int iCurValue = (iNumShow-1)*dScrollHeight + upper;
double iCurValue = (iNumShow-1)*dScrollHeight + upper;
emit CallManage::getInstance()->sig_vertScrollBarChanged(m_strUuid, iCurValue, -m_iY1, -m_iY2);//(iNumShow-1)*dScrollHeight_setGeometry
}
else if(value==upper)
{
m_iCurPage = 1;
//通知界面重设范围
int iCurValue = upper;
double iCurValue = upper;
emit CallManage::getInstance()->sig_vertScrollBarChanged(m_strUuid, iCurValue, -m_iY1, -m_iY2);//(iNumShow-1)*dScrollHeight_setGeometry
}
@ -2151,7 +2151,7 @@ void MainWindowCurve::s_ClearSetCurve()
}
}
QStringList MainWindowCurve::insertCol(int nW)
QStringList MainWindowCurve::insertCol(double dW)
{
QStringList sret;
int column = -1;
@ -2213,7 +2213,7 @@ QStringList MainWindowCurve::insertCol(int nW)
}
//设置列宽
ui->tableWidget_2->setColumnWidth(column, iWidth+nW*g_dPixelPerCm);
ui->tableWidget_2->setColumnWidth(column, iWidth+dW*g_dPixelPerCm);
return sret;
}
@ -2755,6 +2755,7 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName,
{
iHeightOfScreen = g_iHeight_MyCustom;
}
iHeightOfScreen = iHeightOfScreen - 2;
double dScrollHeight = iHeightOfScreen/g_dPixelPerCm/100.0 * (double)m_iScale;
double dDeep = m_iY2-m_iY1;
@ -2784,7 +2785,7 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName,
int iTableSize_Head = 0;
getTableSize_Head(iTableSize_Head);
//
int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (9+3) + iTableSize_Head;
int iTableWellTrack_height = ui->tableWidget_2->rowHeight(0) + (9+3) + iTableSize_Head -1;
//图片高度
int iTotalSize_Height = iHight_Head+iHight_Tail;
int iNum = dDeep/dScrollHeight;
@ -2888,13 +2889,13 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName,
//通知界面重设范围
emit CallManage::getInstance()->sig_vertScrollBarChanged(m_strUuid, newValue, -m_iY1, -m_iY2);
//通知界面重设范围(三图一表)
emit CallManage::getInstance()->sig_vertScrollBarChanged_santuyibiao(m_strUuid, newValue, -m_iY1, -m_iY2);
emit CallManage::getInstance()->sig_vertScrollBarChanged_santu_Print(m_strUuid, iLoop+1, iHeightOfScreen);
if(iLoop==iNum-1)
{
//最后1页
ui->centralwidget->setGeometry(geoRect.x(), geoRect.y(), iMaxWidth, iHight+40);
QPixmap pPixmap = this->grab(QRect(geoRect.x(), geoRect.y()+iTableWellTrack_height, iMaxWidth, dLastHeight-2));
QPixmap pPixmap = this->grab(QRect(geoRect.x(), geoRect.y()+iTableWellTrack_height, iMaxWidth, dLastHeight));
//保存，方便查看
if(g_iDebug)
{
@ -2903,7 +2904,7 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName,
if(IsBmp == 0 || IsBmp == 4)
{
//pdf,svg
painter.drawPixmap(0, iHight_Head + iTableWellTrack_height + (iHeightOfScreen-2)*iLoop, pPixmap);
painter.drawPixmap(0, iHight_Head + iTableWellTrack_height + (iHeightOfScreen)*iLoop, pPixmap);
}
else
{
@ -2912,7 +2913,7 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName,
}
else{
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, iMaxWidth, iHeightOfScreen));
//保存，方便查看
if(g_iDebug)
{
@ -2921,7 +2922,7 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName,
if(IsBmp == 0 || IsBmp == 4)
{
//pdf,svg
painter.drawPixmap(0, iHight_Head + iTableWellTrack_height + (iHeightOfScreen-2)*iLoop, pPixmap);
painter.drawPixmap(0, iHight_Head + iTableWellTrack_height + (iHeightOfScreen)*iLoop, pPixmap);
}
else
{
@ -2938,9 +2939,9 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName,
mDepthProgress.SetShowName(s);
mDepthProgress.SetDepth(iNumShow+2);
//
painter.drawPixmap(0, iHight_Head + iTableWellTrack_height + (iHeightOfScreen-2)*(iNum-1) + (dLastHeight-2), pPixmap_wellTrackInfo);
painter.drawPixmap(0, iHight_Head + iTableWellTrack_height + (iHeightOfScreen)*(iNum-1) + (dLastHeight), pPixmap_wellTrackInfo);
//尾
painter.drawPixmap(0, iHight_Head + iTableWellTrack_height*2 + (iHeightOfScreen-2)*(iNum-1) + (dLastHeight-2), pPixmap_Tail);
painter.drawPixmap(0, iHight_Head + iTableWellTrack_height*2 + (iHeightOfScreen)*(iNum-1) + (dLastHeight), pPixmap_Tail);
//结束
painter.end();
}
@ -3456,8 +3457,8 @@ void MainWindowCurve::s_NewTrack()
void MainWindowCurve::s_NewDepth()
{
int column = -1;
int nW = 1.2;
QStringList sret = this->insertCol(nW);
double dW = 1.2;
QStringList sret = this->insertCol(dW);
if (sret.length() <= 0)
return;
@ -3467,7 +3468,7 @@ void MainWindowCurve::s_NewDepth()
dt << sret.at(1);
dt << "深度";
dt << "depthObject";
dt << QString::number(nW);
dt << QString::number(dW);
//新建道
emit CallManage::getInstance()->sig_NewCol(dt);
}

2
logPlus/mainwindowcurve.h
View File

@ -118,7 +118,7 @@ public:
QJsonArray m_tailsArray;
// 返回 strWellName << strSlfName
QStringList insertCol(int nW);
QStringList insertCol(double dW);
// 返回 strWellName << strSlfName
QStringList getSelectWell();

12
logPlus/qmycustomplot.cpp
View File

@ -129,8 +129,8 @@ QMyCustomPlot::QMyCustomPlot(QWidget *parent, QString strSlfName, QString strWel
connect(CallManage::getInstance(), SIGNAL(sig_ChangeScaleType(QString, QString, QString, QString, QString, QString)), this, SLOT(s_ChangeScaleType(QString, QString, QString, QString, QString, QString)));
//自定义滚动条
connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged(QString, int, int, int)), this, SLOT(vertScrollBarChanged(QString, int, int, int)));
connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged_setGeometry(QString, int, int, int)), this, SLOT(vertScrollBarChanged_setGeometry(QString, int, int, int)));
connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged(QString, double, double, double)), this, SLOT(vertScrollBarChanged(QString, double, double, double)));
connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged_setGeometry(QString, double, double, double)), this, SLOT(vertScrollBarChanged_setGeometry(QString, double, double, double)));
//曲线选中，置顶
connect(CallManage::getInstance(), SIGNAL(sig_Raise(QString, QString, QString, QString, QString, int, QString)), this, SLOT(s_Raise(QString, QString, QString, QString, QString, int, QString)));
@ -4888,7 +4888,9 @@ void QMyCustomPlot::s_DelSelectShiftLineFromPlot(QString strUuid, QString strSlf
{
TransparentDraggableLine *pDraggableLine = (TransparentDraggableLine *)m_SelectShiftLine;
pDraggableLine->deleteRect();
m_SelectShiftLine = nullptr;
}
replot();
}
//清除全部分段线
@ -4914,7 +4916,9 @@ void QMyCustomPlot::s_DelAllShiftLineFromPlot(QString strUuid, QString strSlfNam
pDraggableLine = (TransparentDraggableLine*)it.value();
it++;
pDraggableLine->deleteRect();
m_SelectShiftLine = nullptr;
}
this->replot();
}
//执行校正
@ -12001,7 +12005,7 @@ void QMyCustomPlot::addQCPItemLine(QMyCustomPlot *widget, float cx, float cy, co
pLine->setPoints(myPolygon);
}
void QMyCustomPlot::vertScrollBarChanged_setGeometry(QString strUuid, int value, int low, int upper)
void QMyCustomPlot::vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper)
{
if(m_strUuid==strUuid)
{
@ -12021,7 +12025,7 @@ void QMyCustomPlot::vertScrollBarChanged_setGeometry(QString strUuid, int value,
}
//自定义滚动条
void QMyCustomPlot::vertScrollBarChanged(QString strUuid, int value, int low, int upper)
void QMyCustomPlot::vertScrollBarChanged(QString strUuid, double value, double low, double upper)
{
if(m_strUuid==strUuid)
{

4
logPlus/qmycustomplot.h
View File

@ -407,8 +407,8 @@ signals:
public slots:
void slot_time();
//自定义滚动条
void vertScrollBarChanged(QString strUuid, int value, int low, int upper);
void vertScrollBarChanged_setGeometry(QString strUuid, int value, int low, int upper);
void vertScrollBarChanged(QString strUuid, double value, double low, double upper);
void vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper);
//信号槽刷新
void slot_replot();

2
logPlus/qtcommonclass.cpp
View File

@ -51,7 +51,7 @@ double QtCommonClass::readHeight(QString filePathName, int &iHeight)
{
QSettings set(filePathName, QSettings::IniFormat);
set.beginGroup("config");
iHeight = set.value("iHeight", "1").toInt();
iHeight = set.value("iHeight", "10000").toInt();
set.endGroup();
return 0;