From a4be42a4db77d310354d4e5856478e06c2256642 Mon Sep 17 00:00:00 2001 From: "DESKTOP-450PEFP\\mainc" Date: Wed, 27 May 2026 17:05:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=8B=96=E5=8A=A8?= =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E9=97=AE=E9=A2=98=E6=94=B9double=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logPlus/CallManage.h | 2 +- logPlus/formimage.cpp | 6 +++--- logPlus/formimage.h | 2 +- logPlus/formwave.cpp | 10 +++++++--- logPlus/formwave.h | 2 +- logPlus/qmycustomplot.cpp | 4 ++-- logPlus/qmycustomplot.h | 2 +- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/logPlus/CallManage.h b/logPlus/CallManage.h index 3946cca..2adc011 100644 --- a/logPlus/CallManage.h +++ b/logPlus/CallManage.h @@ -187,7 +187,7 @@ signals: void sig_changeScale(QString strUuid, int iNewScale); //自定义滚动条 - void sig_vertScrollBarChanged_setGeometry(QString strUuid, double iNewValue, double low, double upper, int ndepth); + void sig_vertScrollBarChanged_setGeometry(QString strUuid, double iNewValue, double low, double upper, double ndepth); //自定义滚动条 void sig_vertScrollBarChanged(QString strUuid, double iNewValue, double low, double upper); //自定义滚动条(三图一表) diff --git a/logPlus/formimage.cpp b/logPlus/formimage.cpp index 2f63e52..332582b 100644 --- a/logPlus/formimage.cpp +++ b/logPlus/formimage.cpp @@ -32,7 +32,7 @@ FormImage::FormImage(QWidget *parent, QString strSlfName, QString strWellName, Q //打印 //connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged_santu_Print(QString, int, int)), this, SLOT(vertScrollBarChanged_Print(QString, 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, int)), this, SLOT(vertScrollBarChanged_setGeometry(QString, double, double, double, int))); + connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged_setGeometry(QString, double, double, double, double)), this, SLOT(vertScrollBarChanged_setGeometry(QString, double, double, double, double))); connect(CallManage::getInstance(), SIGNAL(sig_ResizeDepth(QString, int, float)), this, SLOT(s_ResizeDepth(QString, int, float))); //黑白图 connect(CallManage::getInstance(), SIGNAL(sig_changeBlack(QString, bool)), this, SLOT(s_changeBlack(QString, bool))); @@ -338,7 +338,7 @@ void FormImage::vertScrollBarChanged_Print(QString strUuid, int iNum, int iHeigh setGeometry(0, -dDelta, geoRect.width(), geoRect.height()); } -void FormImage::vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper, int ndepth) +void FormImage::vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper, double ddepth) { if (m_strUuid == strUuid) { @@ -347,7 +347,7 @@ void FormImage::vertScrollBarChanged_setGeometry(QString strUuid, double value, { return; } - m_fTopY = ndepth; + m_fTopY = ddepth; update(); } diff --git a/logPlus/formimage.h b/logPlus/formimage.h index 3a3a9f4..6a6b139 100644 --- a/logPlus/formimage.h +++ b/logPlus/formimage.h @@ -108,7 +108,7 @@ public slots: //滚动条 void vertScrollBarChanged(QString strUuid, double value, double low, double upper); void vertScrollBarChanged_Print(QString strUuid, int iNum, int iHeightOfScreen); - void vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper, int ndepth); + void vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper, double ddepth); }; #endif // FormImage_H diff --git a/logPlus/formwave.cpp b/logPlus/formwave.cpp index aad5174..ce411b5 100644 --- a/logPlus/formwave.cpp +++ b/logPlus/formwave.cpp @@ -48,7 +48,7 @@ FormWave::FormWave(QWidget *parent, QString strSlfName, QString strWellName, QSt //打印 //connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged_santu_Print(QString, int, int)), this, SLOT(vertScrollBarChanged_Print(QString, 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, int)), this, SLOT(vertScrollBarChanged_setGeometry(QString, double, double, double, int))); + connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged_setGeometry(QString, double, double, double, double)), this, SLOT(vertScrollBarChanged_setGeometry(QString, double, double, double, double))); connect(CallManage::getInstance(), SIGNAL(sig_ResizeDepth(QString, int, float)), this, SLOT(s_ResizeDepth(QString, int, float))); //黑白图 connect(CallManage::getInstance(), SIGNAL(sig_changeBlack(QString, bool)), this, SLOT(s_changeBlack(QString, bool))); @@ -92,6 +92,7 @@ void FormWave::setDepthY(float fy1, float fy2) m_PlotSdep = qAbs(this->m_iY2); m_fTopY = m_PlotSdep; + qDebug() << " 111###### m_fTopY " << m_fTopY; } void FormWave::updateDepthY(float fy1, float fy2) @@ -100,6 +101,7 @@ void FormWave::updateDepthY(float fy1, float fy2) this->m_iY2 = fy2; m_fTopY = qAbs(this->m_iY2); update(); + qDebug() << " 222###### m_fTopY " << m_fTopY; } bool FormWave::LoadFromSLF_wave() @@ -374,6 +376,7 @@ void FormWave::vertScrollBarChanged(QString strUuid, double value, double low, d return; } m_fTopY = value; + qDebug() << " 333###### m_fTopY " << m_fTopY; update(); } @@ -394,7 +397,7 @@ void FormWave::vertScrollBarChanged_Print(QString strUuid, int iNum, int iHeight setGeometry(0, -dDelta, geoRect.width(), geoRect.height()); } -void FormWave::vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper, int ndepth) +void FormWave::vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper, double ddepth) { if (m_strUuid == strUuid) { @@ -403,7 +406,8 @@ void FormWave::vertScrollBarChanged_setGeometry(QString strUuid, double value, d { return; } - m_fTopY = ndepth; + m_fTopY = ddepth; + qDebug() << " 444###### m_fTopY " << m_fTopY; update(); } diff --git a/logPlus/formwave.h b/logPlus/formwave.h index 110655b..e155c76 100644 --- a/logPlus/formwave.h +++ b/logPlus/formwave.h @@ -111,7 +111,7 @@ public slots: //滚动条 void vertScrollBarChanged(QString strUuid, double value, double low, double upper); void vertScrollBarChanged_Print(QString strUuid, int iNum, int iHeightOfScreen); - void vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper, int ndepth); + void vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper, double ddepth); }; #endif // FormWave_H diff --git a/logPlus/qmycustomplot.cpp b/logPlus/qmycustomplot.cpp index 7c59ba9..e6262c7 100644 --- a/logPlus/qmycustomplot.cpp +++ b/logPlus/qmycustomplot.cpp @@ -144,7 +144,7 @@ QMyCustomPlot::QMyCustomPlot(QWidget *parent, QString strSlfName, QString strWel //自定义滚动条 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, int)), this, SLOT(vertScrollBarChanged_setGeometry(QString, double, double, double, int))); + connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged_setGeometry(QString, double, double, double, double)), this, SLOT(vertScrollBarChanged_setGeometry(QString, double, double, double, double))); connect(CallManage::getInstance(), SIGNAL(sig_ResizeHeight(QString, int)), this, SLOT(s_ResizeHeight(QString, int))); @@ -12257,7 +12257,7 @@ void QMyCustomPlot::addQCPItemLine(QMyCustomPlot *widget, float cx, float cy, co pLine->setPoints(myPolygon); } -void QMyCustomPlot::vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper, int ndepth) +void QMyCustomPlot::vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper, double ddepth) { if(m_strUuid==strUuid) { diff --git a/logPlus/qmycustomplot.h b/logPlus/qmycustomplot.h index 4c6b169..c8bde17 100644 --- a/logPlus/qmycustomplot.h +++ b/logPlus/qmycustomplot.h @@ -390,7 +390,7 @@ public slots: void slot_time(); //自定义滚动条 void vertScrollBarChanged(QString strUuid, double value, double low, double upper); - void vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper, int ndepth); + void vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper, double ddepth); void s_ResizeHeight(QString strUuid, int nPixVal); //信号槽刷新