From 2b68607854e387e862680f1456d1fbe8607948ea Mon Sep 17 00:00:00 2001 From: "DESKTOP-450PEFP\\mainc" Date: Wed, 20 May 2026 11:47:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A2=E5=88=97=E6=B8=B2=E6=9F=93=E5=B4=A9?= =?UTF-8?q?=E6=BA=83=E9=97=AE=E9=A2=98=EF=BC=8C=20=E6=96=B0=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E6=B3=A2=E5=88=97=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E6=9C=AA=E5=8F=96=E5=88=B0=E6=95=B0=E6=8D=AE=E5=88=99=E8=B7=B3?= =?UTF-8?q?=E5=87=BA=E6=B8=B2=E6=9F=93=E9=80=BB=E8=BE=91=E3=80=82=20?= =?UTF-8?q?=E7=BB=98=E5=88=B6=E7=BD=91=E6=A0=BC=E7=BA=BF=EF=BC=8CY?= =?UTF-8?q?=E8=BD=B4=E5=8F=98=E9=87=8F=E6=B2=A1=E6=9C=89=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E9=9A=8F=E6=9C=BA=E5=80=BC=E5=8D=A1=E4=BD=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logPlus/formdraw.cpp | 20 ++++++++++---------- logPlus/formwave.cpp | 4 ++++ logPlus/logplus.vcxproj | 6 +++--- logPlus/qmycustomplot.h | 4 ++-- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp index 7c38184..804f49d 100644 --- a/logPlus/formdraw.cpp +++ b/logPlus/formdraw.cpp @@ -4353,8 +4353,8 @@ void FormDraw::s_addDrawImage(QString strUuid, QString strSlfName, QString strWe QMyCustomPlot *curv = new QMyCustomPlot(this, strSlfName, strWellName, strTrackName, strLineName, "DrawImageObject"); //绑定m_formTrack，方便关联formInfo curv->m_formTrack = m_formTrack; - curv->setScaleX(0, 264); curv->setDepthY(m_iY1, m_iY2); + curv->setScaleX(0, 264); if (nW <= 0) nW = g_iOneWidth; curv->initGeometry(m_strUuid, m_iScale, nW); @@ -4495,8 +4495,8 @@ void FormDraw::s_addCrack(QString strUuid, QString strSlfName, QString strWellNa float vmax = iMyWidth; float vmin = 0; - curv->setScaleX(vmin, vmax); curv->setDepthY(m_iY1, m_iY2); + curv->setScaleX(vmin, vmax); curv->initGeometry(m_strUuid, m_iScale, g_iOneWidth); curv->axisRect()->setupFullAxesBox(); // @@ -4566,8 +4566,8 @@ void FormDraw::s_addJiegutext(QString strUuid, QString strSlfName, QString strWe float vmax = iMyWidth; float vmin = 0; // - curv->setScaleX(vmin, vmax); curv->setDepthY(m_iY1, m_iY2); + curv->setScaleX(vmin, vmax); curv->initGeometry(m_strUuid, m_iScale, g_iOneWidth); curv->axisRect()->setupFullAxesBox(); // @@ -4670,8 +4670,8 @@ void FormDraw::s_addLogface(QString strUuid, QString strSlfName, QString strWell float vmax = iMyWidth; float vmin = 0; - curv->setScaleX(vmin, vmax); curv->setDepthY(m_iY1, m_iY2); + curv->setScaleX(vmin, vmax); curv->initGeometry(m_strUuid, m_iScale, g_iOneWidth); curv->axisRect()->setupFullAxesBox(); // @@ -4920,8 +4920,8 @@ void FormDraw::s_addTubingstring(QString strUuid, QString strSlfName, QString st m_LeftVal = 0; m_RightVal = iMyWidth; // - curv->setScaleX(vmin, vmax); curv->setDepthY(m_iY1, m_iY2); + curv->setScaleX(vmin, vmax); curv->initGeometry(m_strUuid, m_iScale, g_iOneWidth); curv->axisRect()->setupFullAxesBox(); // @@ -5124,8 +5124,8 @@ void FormDraw::initForm(QMyCustomPlot *widget, QString strSlfName, QString strLi widget->setInteractions(QCP::iSelectLegend | QCP::iSelectPlottables); widget->setRowGridVisible(true); widget->setColGridVisible(true); + widget->setDepthY(m_iY1, m_iY2); widget->setScaleX(vmin, vmax); - widget->setDepthY(m_iY1, m_iY2); widget->initGeometry(m_strUuid, m_iScale, g_iOneWidth); widget->axisRect()->setupFullAxesBox(); @@ -6215,8 +6215,8 @@ void FormDraw::initFgrq(QMyCustomPlot *widget) widget->xAxis->setSubTicks(false); widget->xAxis->setTickLabels(false); - widget->setScaleX(0, 1024); widget->setDepthY(m_iY1, m_iY2); + widget->setScaleX(0, 1024); //对调XY轴，在最前面设置 QCPAxis *yAxis = widget->yAxis; @@ -6228,8 +6228,8 @@ void FormDraw::initFgrq(QMyCustomPlot *widget) void FormDraw::initRose(QMyCustomPlot *widget) { - widget->setScaleX(0, 1024); widget->setDepthY(m_iY1, m_iY2); + widget->setScaleX(0, 1024); //对调XY轴，在最前面设置 QCPAxis *yAxis = widget->yAxis; @@ -6594,8 +6594,8 @@ void FormDraw::initDCA(QMyCustomPlot *widget, QString m_csCurveFd, QString m_csC widget->clearGraphs(); widget->clearItems(); - widget->setScaleX(0, 360); widget->setDepthY(m_iY1, m_iY2); + widget->setScaleX(0, 360); //对调XY轴，在最前面设置 QCPAxis *yAxis = widget->yAxis; @@ -6869,8 +6869,8 @@ void FormDraw::initTDT(QMyCustomPlot *curv) // curv->yAxis->setTickLabelFont(font1); curv->yAxis->setTicks(false); - curv->setScaleX(0, 400); curv->setDepthY(m_iY1, m_iY2); + curv->setScaleX(0, 400); // // curv->xAxis->ticker()->setTickCount(10);//x个主刻度 // curv->yAxis->ticker()->setTickCount(60);//y个主刻度 diff --git a/logPlus/formwave.cpp b/logPlus/formwave.cpp index 02c1c60..665fb4c 100644 --- a/logPlus/formwave.cpp +++ b/logPlus/formwave.cpp @@ -431,6 +431,10 @@ QImage TTranspose(QImage* image) void FormWave::DrawWave(QPainter* pdc, QRectF mrt1) { + if (m_vMD.size() <= 0 || m_vProperty.size() <= 0) + { + return; + } if (m_pInfo == NULL) { m_pInfo = m_formTrack->getFormInfoByParameters(m_strUuid, m_strWellName, m_strTrackName, m_strLineName); diff --git a/logPlus/logplus.vcxproj b/logPlus/logplus.vcxproj index 85b8e55..803d75c 100644 --- a/logPlus/logplus.vcxproj +++ b/logPlus/logplus.vcxproj @@ -341,12 +341,12 @@ true true - None - MaxSpeed + ProgramDatabase + Disabled Windows - false + true diff --git a/logPlus/qmycustomplot.h b/logPlus/qmycustomplot.h index bbaacd2..faa8688 100644 --- a/logPlus/qmycustomplot.h +++ b/logPlus/qmycustomplot.h @@ -176,8 +176,8 @@ public: FormTrack *m_formTrack = NULL; FormDraw *m_formDraw = NULL; // - float m_iX1, m_iX2; - float m_iY1, m_iY2; + float m_iX1 = 0.0f, m_iX2 = 0.0f; + float m_iY1 = 0.0f, m_iY2 = 0.0f; float m_fTopY = 0; // 显示深度upper float m_fBottomY = 0; // 显示深度lower qint8 m_nLeftCross = 0; // 左跨道个数