diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp index 67bec2e..1dae78a 100644 --- a/logPlus/formdraw.cpp +++ b/logPlus/formdraw.cpp @@ -146,7 +146,7 @@ void FormDraw::setDrawData(QStringList listdt, QJsonObject objInfo) QMyCustomPlot *curv = new QMyCustomPlot(this, strSlfName, strWellName, m_strTrackName, strLineName); //绑定m_formTrack,方便关联formInfo curv->m_formTrack = m_formTrack; - if ("depthObject" == strType) + if ("depthObject" == strType || "waveObject" == strType) { curv->m_bRowGridVisible = 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++) { 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_bRowGridVisible = false; curv->m_bColGridVisible = false; - curv->setScaleX(0, 264); + curv->setDepthY(m_iY1, m_iY2); double nW = m_nTrackW; if (nW <= 0) diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index d8edd78..15a405f 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -4522,7 +4522,7 @@ void MainWindowCurve::DisplayTrack_Top(int id, QJsonObject trackTop, QJsonObject if(id==0) { //第一道,默认减掉空井宽g_iOneWidth - s_NewTrackChangeWidth(strWellName, nW - g_iOneWidth); + //s_NewTrackChangeWidth(strWellName, nW - g_iOneWidth); } else { diff --git a/logPlus/qmycustomplot.cpp b/logPlus/qmycustomplot.cpp index 14289f5..790027f 100644 --- a/logPlus/qmycustomplot.cpp +++ b/logPlus/qmycustomplot.cpp @@ -363,6 +363,10 @@ void QMyCustomPlot::initWave(QString strSlfName, QString strWaveName) } delete[] value; + + widget->setScaleX(0, 264); + widget->m_fmin = vmin; + widget->m_fmax = vmax; // if (!widget->m_bX2Y) { @@ -378,8 +382,6 @@ void QMyCustomPlot::initWave(QString strSlfName, QString strWaveName) widget->yAxis = xAxis; widget->m_bX2Y = true; } - widget->m_fmin = vmin; - widget->m_fmax = vmax; //------------------- // set up the QCPColorMap: