模板加载视,不处理滚动条
This commit is contained in:
parent
342d945672
commit
036a18d083
|
|
@ -54,6 +54,8 @@ extern int g_iDebug;
|
||||||
//SmallPrint
|
//SmallPrint
|
||||||
extern int g_iSmallPrint;
|
extern int g_iSmallPrint;
|
||||||
|
|
||||||
|
int g_iLoadingJson = 0;
|
||||||
|
|
||||||
MainWindowCurve::MainWindowCurve(QWidget *parent) :
|
MainWindowCurve::MainWindowCurve(QWidget *parent) :
|
||||||
QMainWindow(parent),
|
QMainWindow(parent),
|
||||||
ui(new Ui::MainWindowCurve)
|
ui(new Ui::MainWindowCurve)
|
||||||
|
|
@ -4655,8 +4657,12 @@ void MainWindowCurve::Open(QString fileFull)
|
||||||
if (value.isArray()) {
|
if (value.isArray()) {
|
||||||
wellsArray = value.toArray();
|
wellsArray = value.toArray();
|
||||||
qDebug() << "wellsArray number:" << QString::number(wellsArray.size());
|
qDebug() << "wellsArray number:" << QString::number(wellsArray.size());
|
||||||
|
|
||||||
|
//是否正在加载json
|
||||||
|
g_iLoadingJson = 1;
|
||||||
//展示所有井
|
//展示所有井
|
||||||
DisplayWells(wellsArray);
|
DisplayWells(wellsArray);
|
||||||
|
g_iLoadingJson = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,7 @@ extern double g_dPixelPerCm;//每厘米像素数
|
||||||
extern double g_SDepthFac;
|
extern double g_SDepthFac;
|
||||||
extern double g_EDepthFac;
|
extern double g_EDepthFac;
|
||||||
extern QString g_SelectMFac;
|
extern QString g_SelectMFac;
|
||||||
|
extern int g_iLoadingJson;
|
||||||
|
|
||||||
QMyCustomPlot::QMyCustomPlot(QWidget *parent, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString strType) :
|
QMyCustomPlot::QMyCustomPlot(QWidget *parent, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString strType) :
|
||||||
QCustomPlot(parent)
|
QCustomPlot(parent)
|
||||||
|
|
@ -273,8 +274,11 @@ void QMyCustomPlot::initGeometry(QString strUuid, int nscale, double fW)
|
||||||
int ntmpw = fW * g_dPixelPerCm;
|
int ntmpw = fW * g_dPixelPerCm;
|
||||||
this->setGeometry(0, 0, ntmpw - 2, (int)dHight);
|
this->setGeometry(0, 0, ntmpw - 2, (int)dHight);
|
||||||
|
|
||||||
//修改滚动条,针对新建的
|
if(g_iLoadingJson==0)//针对模板加载,不处理滚动条,避免多次冲突
|
||||||
emit CallManage::getInstance()->sig_changeScrollBar(m_strUuid);
|
{
|
||||||
|
//修改滚动条,针对新建的
|
||||||
|
emit CallManage::getInstance()->sig_changeScrollBar(m_strUuid);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void QMyCustomPlot::changePropertyWaveUpdate()
|
void QMyCustomPlot::changePropertyWaveUpdate()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user