深度改变后,优化滚动条逻辑
This commit is contained in:
parent
90cecd6f40
commit
6c4f89f705
|
|
@ -180,6 +180,8 @@ signals:
|
||||||
void sig_vertScrollBarChanged_setGeometry(QString strUuid, int iNewValue, int low, int upper);
|
void sig_vertScrollBarChanged_setGeometry(QString strUuid, int iNewValue, int low, int upper);
|
||||||
//自定义滚动条
|
//自定义滚动条
|
||||||
void sig_vertScrollBarChanged(QString strUuid, int iNewValue, int low, int upper);
|
void sig_vertScrollBarChanged(QString strUuid, int iNewValue, int low, int upper);
|
||||||
|
//自定义滚动条(三图一表)
|
||||||
|
void sig_vertScrollBarChanged_santuyibiao(QString strUuid, int iNewValue, int low, int upper);
|
||||||
|
|
||||||
//改变深度
|
//改变深度
|
||||||
void sig_changeDepth(QString strUuid, QString strSlfName, QString strWellName, int iY1, int iY2);
|
void sig_changeDepth(QString strUuid, QString strSlfName, QString strWellName, int iY1, int iY2);
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ FormLine::FormLine(QWidget *parent, QString strSlfName, QString strWellName, QSt
|
||||||
connect(CallManage::getInstance(), SIGNAL(sig_ChangeTvdProperty(QString, QString, QString, QString, QString, QString, QString, QVariant)),
|
connect(CallManage::getInstance(), SIGNAL(sig_ChangeTvdProperty(QString, QString, QString, QString, QString, QString, QString, QVariant)),
|
||||||
this, SLOT(s_ChangeTvdProperty(QString, QString, QString, QString, QString, QString, QString, QVariant)));
|
this, SLOT(s_ChangeTvdProperty(QString, QString, QString, QString, QString, QString, QString, QVariant)));
|
||||||
//自定义滚动条
|
//自定义滚动条
|
||||||
connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged(QString, int, int, int)), this, SLOT(vertScrollBarChanged(QString, int, int, int)));
|
connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged_santuyibiao(QString, int, int, int)), this, SLOT(vertScrollBarChanged(QString, int, int, int)));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -117,6 +117,7 @@ MainWindowCurve::MainWindowCurve(QWidget *parent) :
|
||||||
ui->tableWidget_2->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); //隐藏垂直滚动条
|
ui->tableWidget_2->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); //隐藏垂直滚动条
|
||||||
//自定义滚动条
|
//自定义滚动条
|
||||||
ui->verticalScrollBar->setRange(-m_iY2, -m_iY1);
|
ui->verticalScrollBar->setRange(-m_iY2, -m_iY1);
|
||||||
|
ui->verticalScrollBar->setValue(-m_iY2);
|
||||||
connect(ui->verticalScrollBar, SIGNAL(valueChanged(int)), this, SLOT(vertScrollBarChanged(int)));
|
connect(ui->verticalScrollBar, SIGNAL(valueChanged(int)), this, SLOT(vertScrollBarChanged(int)));
|
||||||
|
|
||||||
connect(this, SIGNAL(sig_NewTrackChangeWidth(QString, double)), this, SLOT(s_NewTrackChangeWidth(QString, double)));
|
connect(this, SIGNAL(sig_NewTrackChangeWidth(QString, double)), this, SLOT(s_NewTrackChangeWidth(QString, double)));
|
||||||
|
|
@ -259,17 +260,11 @@ void MainWindowCurve::vertScrollBarChanged(int value)
|
||||||
{
|
{
|
||||||
m_iCurPage = iNumShow;
|
m_iCurPage = iNumShow;
|
||||||
//通知界面重设范围
|
//通知界面重设范围
|
||||||
emit CallManage::getInstance()->sig_vertScrollBarChanged(m_strUuid, (iNumShow-1)*dScrollHeight_setGeometry, -m_iY1, -m_iY2);
|
emit CallManage::getInstance()->sig_vertScrollBarChanged(m_strUuid, value, -m_iY1, -m_iY2);//(iNumShow-1)*dScrollHeight_setGeometry
|
||||||
|
|
||||||
// //
|
|
||||||
// int iCurValue = dDelta - (iNumShow-1)*dScrollHeight;
|
|
||||||
// //通知界面重设范围
|
|
||||||
// emit CallManage::getInstance()->sig_vertScrollBarChanged_setGeometry(m_strUuid, iCurValue, dScrollHeight, 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//通知界面重设范围
|
//通知界面重设范围(三图一表)
|
||||||
//emit CallManage::getInstance()->sig_vertScrollBarChanged(m_strUuid, value, -m_iY1, -m_iY2);
|
emit CallManage::getInstance()->sig_vertScrollBarChanged_santuyibiao(m_strUuid, value, -m_iY1, -m_iY2);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//初始化工具栏
|
//初始化工具栏
|
||||||
|
|
@ -2883,6 +2878,8 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName,
|
||||||
//ui->verticalScrollBar->setValue(newValue);//设置右侧滚动条
|
//ui->verticalScrollBar->setValue(newValue);//设置右侧滚动条
|
||||||
//通知界面重设范围
|
//通知界面重设范围
|
||||||
emit CallManage::getInstance()->sig_vertScrollBarChanged(m_strUuid, newValue, -m_iY1, -m_iY2);
|
emit CallManage::getInstance()->sig_vertScrollBarChanged(m_strUuid, newValue, -m_iY1, -m_iY2);
|
||||||
|
//通知界面重设范围(三图一表)
|
||||||
|
emit CallManage::getInstance()->sig_vertScrollBarChanged_santuyibiao(m_strUuid, newValue, -m_iY1, -m_iY2);
|
||||||
|
|
||||||
if(iLoop==iNum-1)
|
if(iLoop==iNum-1)
|
||||||
{
|
{
|
||||||
|
|
@ -4392,6 +4389,7 @@ void MainWindowCurve::s_changeDepth(QString strUuid, QString strSlfName, QString
|
||||||
m_iY2 = iY2;
|
m_iY2 = iY2;
|
||||||
//自定义滚动条
|
//自定义滚动条
|
||||||
ui->verticalScrollBar->setRange(-m_iY2, -m_iY1);
|
ui->verticalScrollBar->setRange(-m_iY2, -m_iY1);
|
||||||
|
ui->verticalScrollBar->setValue(-m_iY2);
|
||||||
|
|
||||||
double dHight = 0;
|
double dHight = 0;
|
||||||
dHight = (m_iY2-m_iY1)*100.0/(double)m_iScale * g_dPixelPerCm;
|
dHight = (m_iY2-m_iY1)*100.0/(double)m_iScale * g_dPixelPerCm;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user