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:
jiayulong 2026-04-15 17:12:35 +08:00
commit 69fbee204e
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
logPlus/formdraw.cpp
View File

@ -146,7 +146,7 @@ void FormDraw::setDrawData(QStringList listdt, QJsonObject objInfo)
QMyCustomPlot *curv = new QMyCustomPlot(this, strSlfName, strWellName, m_strTrackName, strLineName); QMyCustomPlot *curv = new QMyCustomPlot(this, strSlfName, strWellName, m_strTrackName, strLineName);
//绑定m_formTrack，方便关联formInfo //绑定m_formTrack，方便关联formInfo
curv->m_formTrack = m_formTrack; curv->m_formTrack = m_formTrack;
if ("depthObject" == strType) if ("depthObject" == strType || "waveObject" == strType)
{ {
curv->m_bRowGridVisible = false; curv->m_bRowGridVisible = false;
curv->m_bColGridVisible = false; curv->m_bColGridVisible = false;
@ -2682,6 +2682,9 @@ void FormDraw::crossTrackSetting()
} }
if (nleft == 0 && nright == 0)
return;
for (int i = 0; i < m_vecCurv.size(); i++) for (int i = 0; i < m_vecCurv.size(); i++)
{ {
QMyCustomPlot *pCurvPlot = m_vecCurv.at(i); QMyCustomPlot *pCurvPlot = m_vecCurv.at(i);
@ -3069,7 +3072,7 @@ void FormDraw::s_addWave(QString strUuid, QString strSlfName, QString strWellNam
curv->m_formTrack = m_formTrack; curv->m_formTrack = m_formTrack;
curv->m_bRowGridVisible = false; curv->m_bRowGridVisible = false;
curv->m_bColGridVisible = false; curv->m_bColGridVisible = false;
curv->setScaleX(0, 264);
curv->setDepthY(m_iY1, m_iY2); curv->setDepthY(m_iY1, m_iY2);
double nW = m_nTrackW; double nW = m_nTrackW;
if (nW <= 0) if (nW <= 0)

2
logPlus/mainwindowcurve.cpp
View File

@ -4522,7 +4522,7 @@ void MainWindowCurve::DisplayTrack_Top(int id, QJsonObject trackTop, QJsonObject
if(id==0) if(id==0)
{ {
//第一道，默认减掉空井宽g_iOneWidth //第一道，默认减掉空井宽g_iOneWidth
s_NewTrackChangeWidth(strWellName, nW - g_iOneWidth); //s_NewTrackChangeWidth(strWellName, nW - g_iOneWidth);
} }
else else
{ {

6
logPlus/qmycustomplot.cpp
View File

@ -363,6 +363,10 @@ void QMyCustomPlot::initWave(QString strSlfName, QString strWaveName)
} }
delete[] value; delete[] value;
widget->setScaleX(0, 264);
widget->m_fmin = vmin;
widget->m_fmax = vmax;
// //
if (!widget->m_bX2Y) if (!widget->m_bX2Y)
{ {
@ -378,8 +382,6 @@ void QMyCustomPlot::initWave(QString strSlfName, QString strWaveName)
widget->yAxis = xAxis; widget->yAxis = xAxis;
widget->m_bX2Y = true; widget->m_bX2Y = true;
} }
widget->m_fmin = vmin;
widget->m_fmax = vmax;
//------------------- //-------------------
// set up the QCPColorMap: // set up the QCPColorMap: