diff --git a/logPlus/forminfo.cpp b/logPlus/forminfo.cpp index e9e99b0..578d1a7 100644 --- a/logPlus/forminfo.cpp +++ b/logPlus/forminfo.cpp @@ -128,7 +128,7 @@ void FormInfo::initProperty_Kedou(QJsonObject obj) this->m_rose_attribute_field = "ID"; // 属性字段 //蝌蚪符号 - this->m_nRadius = 6; // 圆半径 + this->m_nRadius = 3; // 圆半径 this->m_nCircleWidth = 1; // 圆线宽度 this->m_nTailLen = 10; // 尾线长度 this->m_nTailWidth = 2; // 尾线宽度 @@ -302,7 +302,7 @@ void FormInfo::initProperty_Jykt(QJsonObject obj) this->m_pl_deltaCurve = "CALM"; // 井径差曲线 //蝌蚪符号 - this->m_nRadius = 6; // 圆半径 + this->m_nRadius = 3; // 圆半径 this->m_nCircleWidth = 1; // 圆线宽度 this->m_nTailLen = 10; // 尾线长度 this->m_nTailWidth = 2; // 尾线宽度 @@ -369,7 +369,7 @@ void FormInfo::initProperty_Denv(QJsonObject obj) this->m_pl_deviCurve = "DEVI"; // 井斜曲线 //蝌蚪符号 - this->m_nRadius = 6; // 圆半径 + this->m_nRadius = 3; // 圆半径 this->m_nCircleWidth = 1; // 圆线宽度 this->m_nTailLen = 10; // 尾线长度 this->m_nTailWidth = 2; // 尾线宽度 diff --git a/logPlus/forminfo.h b/logPlus/forminfo.h index cde8076..6638e35 100644 --- a/logPlus/forminfo.h +++ b/logPlus/forminfo.h @@ -411,7 +411,7 @@ public: QString m_pl_GradCurve = "GRAD"; // 可信度曲线 float m_flGrad1 = 10; // 可信度 float m_flGrad2 = 50; // 可信度 - float m_nRadius = 6; // 半径 + float m_nRadius = 3; // 半径 float m_nCircleWidth = 2; // 圆线宽度 float m_nTailWidth = 2; // 尾宽度 float m_nTailLen = 10; // 尾长 diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index b086f5f..9c2166d 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -2982,8 +2982,8 @@ void MainWindowCurve::s_Runcor_List(QString strUuid, QList left_Low_List //单条曲线校深 MoveShift(Filename1, curve, sdep, edep, m_MoveDep); - //Plot重新加载数据 - emit CallManage::getInstance()->sig_ReloadPlot(m_strUuid, Filename1, curve); + //Plot重新加载数据 MoveShift已经包含刷新 + //emit CallManage::getInstance()->sig_ReloadPlot(m_strUuid, Filename1, curve); } } return; diff --git a/logPlus/qmycustomplot.cpp b/logPlus/qmycustomplot.cpp index eb363af..0b16ac8 100644 --- a/logPlus/qmycustomplot.cpp +++ b/logPlus/qmycustomplot.cpp @@ -5185,8 +5185,24 @@ void QMyCustomPlot::s_PreMergeFromPlot(QString strUuid, QString strSlfName, QStr emit CallManage::getInstance()->sig_PreMerge_List(m_strUuid, m_strSlfName, m_strWellName, m_strTrackName, m_strLineName, left_Low_List, right_Hight_List); } -//Plot重新加载数据 void QMyCustomPlot::s_ReloadPlot(QString strUuid, QString strSlfName, QString strLineName) +{ + //不判断strUuid,所有视图都更新 + if(m_strSlfName.compare(strSlfName,Qt::CaseInsensitive)==0 && + m_strLineName == strLineName) + { + } + else + { + return; + } + + //刷新,曲线或表格名称,已在前面判断。此处不判断strUuid,strWellName。所有视图都更新 + s_Refresh_All(m_strUuid, strSlfName, m_strWellName); +} + +//Plot重新加载数据,不判断strUuid,所有视图都更新 +void QMyCustomPlot::ReloadPlot_In(QString strUuid, QString strSlfName, QString strLineName) { if(m_strSlfName.compare(strSlfName,Qt::CaseInsensitive)==0 && m_strLineName == strLineName) @@ -5297,7 +5313,7 @@ void QMyCustomPlot::s_Refresh_All(QString strUuid, QString strSlfName, QString s //曲线 if(m_addRandomGraph && m_strLineName != "CORE_PHYSICS") { - s_ReloadPlot(m_strUuid, m_strSlfName, m_strLineName); + ReloadPlot_In(m_strUuid, m_strSlfName, m_strLineName); } if (m_strLineName == "SWALL_CORE") @@ -5356,6 +5372,7 @@ void QMyCustomPlot::s_Refresh_All(QString strUuid, QString strSlfName, QString s else if (strType == "LogfaceObject") { //沉积相 + RefreshItems_Fac(true); //刷新数据 } else if (strType == "TubingstringObject") { diff --git a/logPlus/qmycustomplot.h b/logPlus/qmycustomplot.h index f085436..54a8d18 100644 --- a/logPlus/qmycustomplot.h +++ b/logPlus/qmycustomplot.h @@ -648,6 +648,7 @@ public slots: //Plot重新加载数据 void s_ReloadPlot(QString strUuid, QString strSlfName, QString strLineName); + void ReloadPlot_In(QString strUuid, QString strSlfName, QString strLineName); //刷新当前井的所有数据 void s_Refresh_All(QString strUuid, QString strSlfName, QString strWellName);