jiayulong/logplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: jiayulong:34484fae27fc6e76b0e0beb22d012412b63cdafb
Branches Tags
jiayulong:main
jiayulong:master
..
compare: jiayulong:5fac5ceafa383456d60af5d84c6d19cc335c5295
Branches Tags
jiayulong:main
jiayulong:master

No commits in common. "34484fae27fc6e76b0e0beb22d012412b63cdafb" and "5fac5ceafa383456d60af5d84c6d19cc335c5295" have entirely different histories.
34484fae27 ... 5fac5ceafa

8 changed files with 16 additions and 22 deletions
Show Stats Expand all files Collapse all files

2
logPlus/CallManage.h
View File

@ -187,7 +187,7 @@ signals:
void sig_changeScale(QString strUuid, int iNewScale);
//自定义滚动条
void sig_vertScrollBarChanged_setGeometry(QString strUuid, double iNewValue, double low, double upper, double ndepth);
void sig_vertScrollBarChanged_setGeometry(QString strUuid, double iNewValue, double low, double upper, int ndepth);
//自定义滚动条
void sig_vertScrollBarChanged(QString strUuid, double iNewValue, double low, double upper);
//自定义滚动条(三图一表)

6
logPlus/formimage.cpp
View File

@ -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, double)), this, SLOT(vertScrollBarChanged_setGeometry(QString, double, 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_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, double ddepth)
void FormImage::vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper, int ndepth)
{
if (m_strUuid == strUuid)
{
@ -347,7 +347,7 @@ void FormImage::vertScrollBarChanged_setGeometry(QString strUuid, double value,
{
return;
}
m_fTopY = ddepth;
m_fTopY = ndepth;
update();
}

2
logPlus/formimage.h
View File

@ -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, double ddepth);
void vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper, int ndepth);
};
#endif // FormImage_H

10
logPlus/formwave.cpp
View File

@ -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, double)), this, SLOT(vertScrollBarChanged_setGeometry(QString, double, 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_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,7 +92,6 @@ 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)
@ -101,7 +100,6 @@ 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()
@ -376,7 +374,6 @@ void FormWave::vertScrollBarChanged(QString strUuid, double value, double low, d
return;
}
m_fTopY = value;
qDebug() << " 333###### m_fTopY " << m_fTopY;
update();
}
@ -397,7 +394,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, double ddepth)
void FormWave::vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper, int ndepth)
{
if (m_strUuid == strUuid)
{
@ -406,8 +403,7 @@ void FormWave::vertScrollBarChanged_setGeometry(QString strUuid, double value, d
{
return;
}
m_fTopY = ddepth;
qDebug() << " 444###### m_fTopY " << m_fTopY;
m_fTopY = ndepth;
update();
}

2
logPlus/formwave.h
View File

@ -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, double ddepth);
void vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper, int ndepth);
};
#endif // FormWave_H

5
logPlus/mainwindowcurve.cpp
View File

@ -522,9 +522,6 @@ void MainWindowCurve::vertScrollBarChanged(int iValue)
//通知界面重设范围
double iCurValue = (iNumShow-1)*dScrollHeight + upper;
emit CallManage::getInstance()->sig_vertScrollBarChanged(m_strUuid, iCurValue, -m_iY1, -m_iY2);//(iNumShow-1)*dScrollHeight_setGeometry
// 修复滚动跳动: 翻页时同步发送 setGeometry 信号
double iCurValue_setGeom = dDelta - (iNumShow-1)*dScrollHeight;
emit CallManage::getInstance()->sig_vertScrollBarChanged_setGeometry(m_strUuid, iCurValue_setGeom, dScrollHeight_setGeometry, 0, value);
}
else if(value==upper)
{
@ -545,8 +542,6 @@ void MainWindowCurve::vertScrollBarChanged(int iValue)
//通知界面重设范围
double iCurValue = upper;
emit CallManage::getInstance()->sig_vertScrollBarChanged(m_strUuid, iCurValue, -m_iY1, -m_iY2);//(iNumShow-1)*dScrollHeight_setGeometry
// 修复滚动跳动: 顶部复位时同步发送 setGeometry
emit CallManage::getInstance()->sig_vertScrollBarChanged_setGeometry(m_strUuid, 0, dScrollHeight_setGeometry, 0, value);
}

9
logPlus/qmycustomplot.cpp
View File

@ -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, double)), this, SLOT(vertScrollBarChanged_setGeometry(QString, double, 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_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, double ddepth)
void QMyCustomPlot::vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper, int ndepth)
{
if(m_strUuid==strUuid)
{
@ -12299,7 +12299,10 @@ void QMyCustomPlot::vertScrollBarChanged(QString strUuid, double value, double l
{
return;
}
// NOTE: 不在此处 setGeometry(0,0,...), 由 vertScrollBarChanged_setGeometry 统一管理位置
QRect geoRect = geometry();
setGeometry(0, 0, geoRect.width(), geoRect.height());
//
FormInfo* pInfo = m_formTrack->getFormInfoByParameters(m_strUuid, m_strWellName, m_strTrackName, m_strLineName);
if (pInfo == NULL)
{

2
logPlus/qmycustomplot.h
View File

@ -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, double ddepth);
void vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper, int ndepth);
void s_ResizeHeight(QString strUuid, int nPixVal);
//信号槽刷新