diff --git a/CallManage/CallManage.h b/CallManage/CallManage.h index 9304065..6a9282a 100644 --- a/CallManage/CallManage.h +++ b/CallManage/CallManage.h @@ -188,6 +188,9 @@ signals: //改变深度 void sig_changeDepth(QString strUuid, QString strSlfName, QString strWellName, int iY1, int iY2); + //修改滚动条,针对新建的 + void sig_changeScrollBar(QString strUuid); + void sig_changeWellProperty(QString strSlfName, QString strWellName, QVariantList listVal); //改变道宽 diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp index b430a31..f62a5bd 100644 --- a/logPlus/formdraw.cpp +++ b/logPlus/formdraw.cpp @@ -3900,7 +3900,7 @@ void FormDraw::s_addGanZhuangTu(QString strUuid, QString strSlfName, QString str QMyCustomPlot *curv = new QMyCustomPlot(this, strSlfName, strWellName, strTrackName, strLineName); //绑定m_formTrack,方便关联formInfo curv->m_formTrack = m_formTrack; - curv->m_strUuid = m_strUuid; + //curv->m_strUuid = m_strUuid; curv->setDepthY(m_iY1, m_iY2); curv->initGeometry(m_strUuid, m_iScale, g_iOneWidth); curv->show(); @@ -4393,7 +4393,7 @@ void FormDraw::s_addMCals(QString strUuid, QString strSlfName, QString strWellNa QMyCustomPlot *curv = new QMyCustomPlot(this, strSlfName, strWellName, strTrackName, strLineName); //绑定m_formTrack,方便关联formInfo curv->m_formTrack = m_formTrack; - curv->m_strUuid = m_strUuid; + //curv->m_strUuid = m_strUuid; curv->setDepthY(m_iY1, m_iY2); curv->initGeometry(m_strUuid, m_iScale, g_iOneWidth); curv->show(); diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index e9421e5..bf20237 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -119,6 +119,7 @@ MainWindowCurve::MainWindowCurve(QWidget *parent) : ui->verticalScrollBar->setRange(-m_iY2, -m_iY1); ui->verticalScrollBar->setValue(-m_iY2); connect(ui->verticalScrollBar, SIGNAL(valueChanged(int)), this, SLOT(vertScrollBarChanged(int))); + connect(CallManage::getInstance(), SIGNAL(sig_changeScrollBar(QString)), this, SLOT(s_changeScrollBar(QString))); connect(this, SIGNAL(sig_NewTrackChangeWidth(QString, double)), this, SLOT(s_NewTrackChangeWidth(QString, double))); //connect(this, SIGNAL(sig_NewWell(QString, QString)), this, SLOT(s_NewWell(QString, QString))); @@ -5132,5 +5133,21 @@ void MainWindowCurve::setTableSize_Well() } } } - +} + +//修改滚动条,针对新建的 +void MainWindowCurve::s_changeScrollBar(QString strUuid) +{ + if(m_strUuid==strUuid) + { + } + else + { + return; + } + + int iCurValue = ui->verticalScrollBar->value(); + vertScrollBarChanged(iCurValue); + + //ui->verticalScrollBar->setValue(iCurValue+1);//-m_iY2 } diff --git a/logPlus/mainwindowcurve.h b/logPlus/mainwindowcurve.h index 38796ac..ba76456 100644 --- a/logPlus/mainwindowcurve.h +++ b/logPlus/mainwindowcurve.h @@ -251,6 +251,9 @@ public slots: //编辑曲线,框选拉伸/压缩 void s_EShiftDepth(QString strSlfName, QString strLineName, int count, QList left_Low_List, QList right_Hight_List); + //修改滚动条,针对新建的 + void s_changeScrollBar(QString strUuid); + // void s_selectWell(); //选择井 void s_showHeadTable(); //显示/隐藏图头 diff --git a/logPlus/qmycustomplot.cpp b/logPlus/qmycustomplot.cpp index f7a31d6..88b4902 100644 --- a/logPlus/qmycustomplot.cpp +++ b/logPlus/qmycustomplot.cpp @@ -265,6 +265,9 @@ void QMyCustomPlot::initGeometry(QString strUuid, int nscale, double fW) int ntmpw = fW * g_dPixelPerCm; this->setGeometry(0, 0, ntmpw - 2, (int)dHight); + + //修改滚动条,针对新建的 + emit CallManage::getInstance()->sig_changeScrollBar(m_strUuid); } void QMyCustomPlot::changePropertyWaveUpdate()