diff --git a/CallManage/CallManage.h b/CallManage/CallManage.h index 67b6192..e86eb55 100644 --- a/CallManage/CallManage.h +++ b/CallManage/CallManage.h @@ -177,11 +177,13 @@ signals: void sig_changeScale(QString strUuid, int iNewScale); //自定义滚动条 - void sig_vertScrollBarChanged_setGeometry(QString strUuid, int iNewValue, int low, int upper); + void sig_vertScrollBarChanged_setGeometry(QString strUuid, double iNewValue, double low, double upper); //自定义滚动条 - void sig_vertScrollBarChanged(QString strUuid, int iNewValue, int low, int upper); + void sig_vertScrollBarChanged(QString strUuid, double iNewValue, double low, double upper); //自定义滚动条(三图一表) - void sig_vertScrollBarChanged_santuyibiao(QString strUuid, int iNewValue, int low, int upper); + void sig_vertScrollBarChanged_santuyibiao(QString strUuid, double iNewValue, double low, double upper); + //自定义滚动条(三图一表,打印) + void sig_vertScrollBarChanged_santu_Print(QString strUuid, int iNum, int iHeightOfScreen); //改变深度 void sig_changeDepth(QString strUuid, QString strSlfName, QString strWellName, int iY1, int iY2); diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp index b826dce..d8e296b 100644 --- a/logPlus/formdraw.cpp +++ b/logPlus/formdraw.cpp @@ -3496,7 +3496,8 @@ void FormDraw::setRowHeight(double dHight, QProgressBar *progressBar, int iSplit if(form) { int nw = form->geometry().width(); - form->setGeometry(0, 0, nw, (int)dHight); + form->setGeometry(form->geometry().x(), form->geometry().y(), nw, (int)dHight); + //form->setGeometry(0, 0, nw, (int)dHight); form->updateDepthY(m_iY1, m_iY2); //emit CallManage::getInstance()->sig_ChangeLeftScale(m_strUuid, form->m_strSlfName, m_strWellName, m_strTrackName, form->m_strLineName, form->m_iX1); @@ -4066,7 +4067,8 @@ FormLine* FormDraw::s_addSantuyibiao(QString strUuid, QString strSlfName, QStrin ntmpw = (g_iOneWidth*4)* g_dPixelPerCm; } //curv->setGeometry(0, 0, ntmpw - 2, (int)dHight); - curv->setGeometry(0, 0, ntmpw - 2, (int)32767);//斜井三图一表,固定最大值,方便上下滚动 + //curv->setGeometry(0, 0, ntmpw - 2, (int)32767);//斜井三图一表,固定最大值,方便上下滚动 + curv->setGeometry(curv->geometry().x(), curv->geometry().y(), ntmpw - 2, (int)30000); curv->show(); //斜井三图一表 diff --git a/logPlus/formline.cpp b/logPlus/formline.cpp index ffb4ed9..435048b 100644 --- a/logPlus/formline.cpp +++ b/logPlus/formline.cpp @@ -22,7 +22,9 @@ FormLine::FormLine(QWidget *parent, QString strSlfName, QString strWellName, QSt 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))); //自定义滚动条 - connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged_santuyibiao(QString, int, int, int)), this, SLOT(vertScrollBarChanged(QString, int, int, int))); + connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged_santuyibiao(QString, double, double, double)), this, SLOT(vertScrollBarChanged(QString, double, double, double))); + //打印 + connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged_santu_Print(QString, int, int)), this, SLOT(vertScrollBarChanged_Print(QString, int, int))); } @@ -324,7 +326,7 @@ void FormLine::s_ChangeTvdProperty(QString strUuid, QString strSlfName, QString } //自定义滚动条 -void FormLine::vertScrollBarChanged(QString strUuid, int value, int low, int upper) +void FormLine::vertScrollBarChanged(QString strUuid, double value, double low, double upper) { if(m_strUuid==strUuid) { @@ -342,6 +344,23 @@ void FormLine::vertScrollBarChanged(QString strUuid, int value, int low, int upp setGeometry(0, -(dPercent*geoRect.height()), geoRect.width(), geoRect.height()); } +//打印 +void FormLine::vertScrollBarChanged_Print(QString strUuid, int iNum, int iHeightOfScreen) +{ + if(m_strUuid==strUuid) + { + } + else + { + return; + } + //上移或下移 + QRect geoRect = geometry(); + // + double dDelta = iHeightOfScreen*(iNum-1); + setGeometry(0, -dDelta, geoRect.width(), geoRect.height()); +} + void FormLine::wheelEvent(QWheelEvent *event) // 滚轮事件 { emit CallManage::getInstance()->sig_mouseWheel(event); diff --git a/logPlus/formline.h b/logPlus/formline.h index 5b935a3..5abe734 100644 --- a/logPlus/formline.h +++ b/logPlus/formline.h @@ -41,7 +41,8 @@ public slots: QString strGroup, QString strProperty, QVariant variant); //滚动条 - void vertScrollBarChanged(QString strUuid, int value, int low, int upper); + void vertScrollBarChanged(QString strUuid, double value, double low, double upper); + void vertScrollBarChanged_Print(QString strUuid, int iNum, int iHeightOfScreen); }; #endif // FORMLINE_H diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index 8d611a9..7c92152 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -252,7 +252,7 @@ void MainWindowCurve::vertScrollBarChanged(int value) } if(m_iCurPage == iNumShow) { - int iCurValue = dDelta - (iNumShow-1)*dScrollHeight; + double iCurValue = dDelta - (iNumShow-1)*dScrollHeight; //通知界面重设范围 emit CallManage::getInstance()->sig_vertScrollBarChanged_setGeometry(m_strUuid, iCurValue, dScrollHeight_setGeometry, 0); } @@ -260,14 +260,14 @@ void MainWindowCurve::vertScrollBarChanged(int value) { m_iCurPage = iNumShow; //通知界面重设范围 - int iCurValue = (iNumShow-1)*dScrollHeight + upper; + double iCurValue = (iNumShow-1)*dScrollHeight + upper; emit CallManage::getInstance()->sig_vertScrollBarChanged(m_strUuid, iCurValue, -m_iY1, -m_iY2);//(iNumShow-1)*dScrollHeight_setGeometry } else if(value==upper) { m_iCurPage = 1; //通知界面重设范围 - int iCurValue = upper; + double iCurValue = upper; emit CallManage::getInstance()->sig_vertScrollBarChanged(m_strUuid, iCurValue, -m_iY1, -m_iY2);//(iNumShow-1)*dScrollHeight_setGeometry } @@ -2888,7 +2888,7 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName, //通知界面重设范围 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); + emit CallManage::getInstance()->sig_vertScrollBarChanged_santu_Print(m_strUuid, iLoop+1, iHeightOfScreen); if(iLoop==iNum-1) { diff --git a/logPlus/qmycustomplot.cpp b/logPlus/qmycustomplot.cpp index 38943bc..6982de0 100644 --- a/logPlus/qmycustomplot.cpp +++ b/logPlus/qmycustomplot.cpp @@ -129,8 +129,8 @@ QMyCustomPlot::QMyCustomPlot(QWidget *parent, QString strSlfName, QString strWel connect(CallManage::getInstance(), SIGNAL(sig_ChangeScaleType(QString, QString, QString, QString, QString, QString)), this, SLOT(s_ChangeScaleType(QString, QString, QString, QString, QString, QString))); //自定义滚动条 - connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged(QString, int, int, int)), this, SLOT(vertScrollBarChanged(QString, int, int, int))); - connect(CallManage::getInstance(), SIGNAL(sig_vertScrollBarChanged_setGeometry(QString, int, int, int)), this, SLOT(vertScrollBarChanged_setGeometry(QString, int, 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)), this, SLOT(vertScrollBarChanged_setGeometry(QString, double, double, double))); //曲线选中,置顶 connect(CallManage::getInstance(), SIGNAL(sig_Raise(QString, QString, QString, QString, QString, int, QString)), this, SLOT(s_Raise(QString, QString, QString, QString, QString, int, QString))); @@ -11930,7 +11930,7 @@ void QMyCustomPlot::addQCPItemLine(QMyCustomPlot *widget, float cx, float cy, co pLine->setPoints(myPolygon); } -void QMyCustomPlot::vertScrollBarChanged_setGeometry(QString strUuid, int value, int low, int upper) +void QMyCustomPlot::vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper) { if(m_strUuid==strUuid) { @@ -11950,7 +11950,7 @@ void QMyCustomPlot::vertScrollBarChanged_setGeometry(QString strUuid, int value, } //自定义滚动条 -void QMyCustomPlot::vertScrollBarChanged(QString strUuid, int value, int low, int upper) +void QMyCustomPlot::vertScrollBarChanged(QString strUuid, double value, double low, double upper) { if(m_strUuid==strUuid) { diff --git a/logPlus/qmycustomplot.h b/logPlus/qmycustomplot.h index ae82630..f4dacde 100644 --- a/logPlus/qmycustomplot.h +++ b/logPlus/qmycustomplot.h @@ -407,8 +407,8 @@ signals: public slots: void slot_time(); //自定义滚动条 - void vertScrollBarChanged(QString strUuid, int value, int low, int upper); - void vertScrollBarChanged_setGeometry(QString strUuid, int value, int low, int upper); + void vertScrollBarChanged(QString strUuid, double value, double low, double upper); + void vertScrollBarChanged_setGeometry(QString strUuid, double value, double low, double upper); //信号槽刷新 void slot_replot();