From e65b5681d9b1d166cd8c0fe1ad350f2d66343d9e Mon Sep 17 00:00:00 2001 From: jiayulong Date: Wed, 18 Mar 2026 10:17:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=89=E7=A7=AF=E7=9B=B8=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=B0json=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CallManage/CallManage.h | 3 + logPlus/PropertyWidget.cpp | 26 ++++++ logPlus/TransparentDraggableFac.cpp | 14 --- logPlus/TransparentDraggableMFac.cpp | 64 +++++++++---- logPlus/TransparentDraggablePhase.cpp | 41 +++++---- logPlus/formdraw.cpp | 84 +++++++++++++++++ logPlus/forminfo.cpp | 4 +- logPlus/forminfo.h | 5 ++ logPlus/formtrack.cpp | 30 +++++++ logPlus/qmycustomplot.cpp | 124 +++++++++++++++++++++++--- logPlus/qmycustomplot.h | 7 ++ 11 files changed, 344 insertions(+), 58 deletions(-) diff --git a/CallManage/CallManage.h b/CallManage/CallManage.h index 19fa70d..ca62f92 100644 --- a/CallManage/CallManage.h +++ b/CallManage/CallManage.h @@ -217,6 +217,9 @@ signals: //是否显示 void sig_changeGeoLithShow(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString propertyData, bool bShow); + //改变沉积相属性，是否显示 + void sig_changeFacShow(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString propertyData, bool bShow); + // //void sig_addImageToPlot(QMyCustomPlot* customPlot, double left_Low, double right_Hight, QString imagePath); diff --git a/logPlus/PropertyWidget.cpp b/logPlus/PropertyWidget.cpp index dd67ad1..7a7b4ba 100644 --- a/logPlus/PropertyWidget.cpp +++ b/logPlus/PropertyWidget.cpp @@ -1184,6 +1184,28 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant { //先处理通用属性 CommonPropertyChanged(pProperty, variant); + + if("绘制相" == m_propertyData[pProperty] || + "绘制亚相" == m_propertyData[pProperty] || + "微相名称" == m_propertyData[pProperty]) + { + bool bShow = variant.value(); + if(m_propertyData[pProperty] == "绘制相") + { + m_formInfo->m_bDrawFac = bShow; + } + else if(m_propertyData[pProperty] == "绘制亚相") + { + m_formInfo->m_bDrawPhase = bShow; + } + else if(m_propertyData[pProperty] == "微相名称") + { + m_formInfo->m_bDrawMFacName = bShow; + } + + //改变沉积相属性，是否显示 + emit CallManage::getInstance()->sig_changeFacShow(m_formInfo->m_strUuid, m_formInfo->m_strSlfName, m_formInfo->m_strWellName, m_formInfo->m_strTrackName, m_formInfo->m_strLineName, m_propertyData[pProperty], bShow); + } } if("深度比例尺" == m_propertyData[pProperty]) @@ -2949,6 +2971,10 @@ void PropertyWidget::initFacProperty(FormInfo *formInfo) _CreateVariantPropertyItem("对象", "显示名称", formInfo->m_strAliasName, QVariant::String); _CreateVariantPropertyItem("对象", "字体", formInfo->m_curveNameFont, QVariant::Font); _CreateVariantPropertyItem("对象", "颜色", formInfo->m_lineColor, QVariant::Color); + //显示 + _CreateVariantPropertyItem("数据", "绘制相", formInfo->m_bDrawFac, QVariant::Bool); + _CreateVariantPropertyItem("数据", "绘制亚相", formInfo->m_bDrawPhase, QVariant::Bool); + _CreateVariantPropertyItem("数据", "微相名称", formInfo->m_bDrawMFacName, QVariant::Bool); m_strCurrentProperty = Fac_Property; } diff --git a/logPlus/TransparentDraggableFac.cpp b/logPlus/TransparentDraggableFac.cpp index 353bb53..d4d4eb4 100644 --- a/logPlus/TransparentDraggableFac.cpp +++ b/logPlus/TransparentDraggableFac.cpp @@ -44,23 +44,9 @@ void TransparentDraggableFac::setRange(double left_Low, double right_Hight) mRect->topLeft->setCoords(left_Low, 3*(lY1+lY2)/4.0); mRect->bottomRight->setCoords(right_Hight, lY2); - //位置与rect不一样，否则图像反转 -// mPixmap->topLeft->setCoords(right_Hight, lY1); -// mPixmap->bottomRight->setCoords(left_Low, (lY1+lY2)/2.0); - - //mItemTitle->position->setCoords(0.5, 0.5); - // 设置父锚点，定位点 - //mItemTitle->position->setParentAnchor(mRect->bottom); -// mItemTitle->position->setCoords((mRect->topLeft->coords().x() + mRect->bottomRight->coords().x())/2, -// (mRect->topLeft->coords().y() + mRect->bottomRight->coords().y())/2); // 设置文本在矩形中心位置 - float flNewPos = mPlot->xAxis->coordToPixel((left_Low + right_Hight)/2.0) - 15; mItemTitle->position->setCoords(mPlot->xAxis->pixelToCoord(flNewPos), 7*(lY1 + lY2)/8.0); // 设置文本在矩形中心位置 - - //mRect->topLeft->setCoords(left, mPlot->yAxis->range().upper); - //mRect->bottomRight->setCoords(right, mPlot->yAxis->range().lower); - updateHandles(); mPlot->replot(); } diff --git a/logPlus/TransparentDraggableMFac.cpp b/logPlus/TransparentDraggableMFac.cpp index 44ba2f7..999fae9 100644 --- a/logPlus/TransparentDraggableMFac.cpp +++ b/logPlus/TransparentDraggableMFac.cpp @@ -37,7 +37,15 @@ void TransparentDraggableMFac::setMinWidth(double minWidth) void TransparentDraggableMFac::setTitle(QString strTitle) { mstrTitle = strTitle; - mItemTitle->setText(mstrTitle); + //mItemTitle->setText(mstrTitle); + // + if(mPlot->m_bDrawMFacName)// 微相名称 + { + mItemTitle->setText(mstrTitle); + } + else{ + mItemTitle->setText(""); + } //mPlot->replot(); } @@ -49,24 +57,48 @@ void TransparentDraggableMFac::setRange(double left_Low, double right_Hight) double lY1 = mPlot->yAxis->range().lower;//+10 double lY2 = mPlot->yAxis->range().upper; mRect->topLeft->setCoords(left_Low, lY1); - mRect->bottomRight->setCoords(right_Hight, (lY1+lY2)/2.0); + if(mPlot->m_bDrawFac && mPlot->m_bDrawPhase) + { + //画2条竖线 + mRect->bottomRight->setCoords(right_Hight, (lY1+lY2)/2.0); + } + else if(mPlot->m_bDrawFac || mPlot->m_bDrawPhase) + { + //画1条竖线 + mRect->bottomRight->setCoords(right_Hight, 3*(lY1+lY2)/4.0); + } + else + { + mRect->bottomRight->setCoords(right_Hight, lY2); + } - //位置与rect不一样，否则图像反转 -// mPixmap->topLeft->setCoords(right_Hight, lY1); -// mPixmap->bottomRight->setCoords(left_Low, (lY1+lY2)/2.0); - - //mItemTitle->position->setCoords(0.5, 0.5); - // 设置父锚点，定位点 - //mItemTitle->position->setParentAnchor(mRect->bottom); -// mItemTitle->position->setCoords((mRect->topLeft->coords().x() + mRect->bottomRight->coords().x())/2, -// (mRect->topLeft->coords().y() + mRect->bottomRight->coords().y())/2); // 设置文本在矩形中心位置 + // + if(mPlot->m_bDrawMFacName)// 微相名称 + { + mItemTitle->setText(mstrTitle); + } + else{ + mItemTitle->setText(""); + } float flNewPos = mPlot->xAxis->coordToPixel((left_Low + right_Hight)/2.0) - 15; - mItemTitle->position->setCoords(mPlot->xAxis->pixelToCoord(flNewPos), - (lY1 + lY2)/4.0); // 设置文本在矩形中心位置 - - //mRect->topLeft->setCoords(left, mPlot->yAxis->range().upper); - //mRect->bottomRight->setCoords(right, mPlot->yAxis->range().lower); + if(mPlot->m_bDrawFac && mPlot->m_bDrawPhase) + { + //画2条竖线 + mItemTitle->position->setCoords(mPlot->xAxis->pixelToCoord(flNewPos), + (lY1 + lY2)/4.0); // 设置文本在矩形中心位置 + } + else if(mPlot->m_bDrawFac || mPlot->m_bDrawPhase) + { + //画1条竖线 + mItemTitle->position->setCoords(mPlot->xAxis->pixelToCoord(flNewPos), + 3*(lY1 + lY2)/8.0); // 设置文本在矩形中心位置 + } + else + { + mItemTitle->position->setCoords(mPlot->xAxis->pixelToCoord(flNewPos), + (lY1 + lY2)/2.0); // 设置文本在矩形中心位置 + } updateHandles(); mPlot->replot(); diff --git a/logPlus/TransparentDraggablePhase.cpp b/logPlus/TransparentDraggablePhase.cpp index eb7fb9a..8d1d9a6 100644 --- a/logPlus/TransparentDraggablePhase.cpp +++ b/logPlus/TransparentDraggablePhase.cpp @@ -41,25 +41,32 @@ void TransparentDraggablePhase::setRange(double left_Low, double right_Hight) double lY1 = mPlot->yAxis->range().lower;//+10 double lY2 = mPlot->yAxis->range().upper; - mRect->topLeft->setCoords(left_Low, (lY1+lY2)/2.0); - mRect->bottomRight->setCoords(right_Hight, 3*(lY1+lY2)/4.0); - - //位置与rect不一样，否则图像反转 -// mPixmap->topLeft->setCoords(right_Hight, lY1); -// mPixmap->bottomRight->setCoords(left_Low, (lY1+lY2)/2.0); - - //mItemTitle->position->setCoords(0.5, 0.5); - // 设置父锚点，定位点 - //mItemTitle->position->setParentAnchor(mRect->bottom); -// mItemTitle->position->setCoords((mRect->topLeft->coords().x() + mRect->bottomRight->coords().x())/2, -// (mRect->topLeft->coords().y() + mRect->bottomRight->coords().y())/2); // 设置文本在矩形中心位置 + if(mPlot->m_bDrawFac) + { + //绘制相 + mRect->topLeft->setCoords(left_Low, (lY1+lY2)/2.0); + mRect->bottomRight->setCoords(right_Hight, 3*(lY1+lY2)/4.0); + } + else + { + //不绘制相 + mRect->topLeft->setCoords(left_Low, 3*(lY1+lY2)/4.0); + mRect->bottomRight->setCoords(right_Hight, lY2); + } float flNewPos = mPlot->xAxis->coordToPixel((left_Low + right_Hight)/2.0) - 15; - mItemTitle->position->setCoords(mPlot->xAxis->pixelToCoord(flNewPos), - 5*(lY1 + lY2)/8.0); // 设置文本在矩形中心位置 - - //mRect->topLeft->setCoords(left, mPlot->yAxis->range().upper); - //mRect->bottomRight->setCoords(right, mPlot->yAxis->range().lower); + if(mPlot->m_bDrawFac) + { + //绘制相 + mItemTitle->position->setCoords(mPlot->xAxis->pixelToCoord(flNewPos), + 5*(lY1 + lY2)/8.0); // 设置文本在矩形中心位置 + } + else + { + //不绘制相 + mItemTitle->position->setCoords(mPlot->xAxis->pixelToCoord(flNewPos), + 7*(lY1 + lY2)/8.0); // 设置文本在矩形中心位置 + } updateHandles(); mPlot->replot(); diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp index 8cf9b19..60ee674 100644 --- a/logPlus/formdraw.cpp +++ b/logPlus/formdraw.cpp @@ -470,6 +470,7 @@ void FormDraw::DisplayTable_One(QJsonObject lineObjInfo) } } + QString folderPath = GetLogdataPath(); folderPath = folderPath + g_prjname; strSlfName = folderPath + "/" + "#" + strWellName + "/" + strSlfName; @@ -540,6 +541,7 @@ void FormDraw::DisplayTable_One(QJsonObject lineObjInfo) else{ listOtherProperty.append("0"); } + //结论 this->addTableLine(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName, listOtherProperty); } @@ -694,6 +696,32 @@ void FormDraw::DisplayFac_One(QJsonObject lineObjInfo) lineColor.setNamedColor(lineObjInfo.value("lineColor").toString()); } + //沉积相 + bool bDrawFac = true; // 绘制相 + bool bDrawPhase = true; // 绘制亚相 + bool bDrawMFacName = true; // 微相名称 + if (lineObjInfo.contains("DrawFac")) + { + QJsonValue value = lineObjInfo.value("DrawFac"); + if (value.isBool()) { + bDrawFac = value.toBool(); + } + } + if (lineObjInfo.contains("DrawPhase")) + { + QJsonValue value = lineObjInfo.value("DrawPhase"); + if (value.isBool()) { + bDrawPhase = value.toBool(); + } + } + if (lineObjInfo.contains("DrawMFacName")) + { + QJsonValue value = lineObjInfo.value("DrawMFacName"); + if (value.isBool()) { + bDrawMFacName = value.toBool(); + } + } + QString folderPath = GetLogdataPath(); folderPath = folderPath + g_prjname; strSlfName = folderPath + "/" + "#" + strWellName + "/" + strSlfName; @@ -704,6 +732,31 @@ void FormDraw::DisplayFac_One(QJsonObject lineObjInfo) listOtherProperty.append(strAliasName);//别名 listOtherProperty.append(lineColor.name());//名称颜色 listOtherProperty.append(curveNameFont.toString());//名称字体 + + //沉积相 + if(bDrawFac) + { + listOtherProperty.append("DrawFac"); + } + else{ + listOtherProperty.append("0"); + } + // + if(bDrawPhase) + { + listOtherProperty.append("DrawPhase"); + } + else{ + listOtherProperty.append("0"); + } + // + if(bDrawMFacName) + { + listOtherProperty.append("DrawMFacName"); + } + else{ + listOtherProperty.append("0"); + } //沉积相 this->s_addLogface(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName, 0, listOtherProperty); // } @@ -2649,6 +2702,37 @@ void FormDraw::s_addLogface(QString strUuid, QString strSlfName, QString strWell curv->xAxis = yAxis; curv->yAxis = xAxis; + if(listOtherProperty.size()>=6) + { + // + if(listOtherProperty[3]=="DrawFac") + { + curv->m_bDrawFac = true; + } + else + { + curv->m_bDrawFac = false; + } + // + if(listOtherProperty[4]=="DrawPhase") + { + curv->m_bDrawPhase = true; + } + else + { + curv->m_bDrawPhase = false; + } + // + if(listOtherProperty[5]=="DrawMFacName") + { + curv->m_bDrawMFacName = true; + } + else + { + curv->m_bDrawMFacName = false; + } + } + //沉积相 //QString strWaveName = "LITHA"; curv->LoadFromSLF_Fac(strSlfName, strLineName); diff --git a/logPlus/forminfo.cpp b/logPlus/forminfo.cpp index 69a91a5..66bbc89 100644 --- a/logPlus/forminfo.cpp +++ b/logPlus/forminfo.cpp @@ -171,7 +171,9 @@ QJsonObject FormInfo::makeJson() else if (m_strType == "LogfaceObject") { //沉积相 - + rootObj["DrawFac"] = m_bDrawFac; + rootObj["DrawPhase"] = m_bDrawPhase; + rootObj["DrawMFacName"] = m_bDrawMFacName; //item属性写入slf文件，不需要此次记录 return rootObj; } diff --git a/logPlus/forminfo.h b/logPlus/forminfo.h index 6b41bc2..9665fa0 100644 --- a/logPlus/forminfo.h +++ b/logPlus/forminfo.h @@ -181,6 +181,11 @@ public: //气测/FMT/射孔/文本 QStringList m_FieldNameList; + //沉积相 + bool m_bDrawFac = true; // 绘制相 + bool m_bDrawPhase = true; // 绘制亚相 + bool m_bDrawMFacName = true; // 微相名称 + public: void setLineWidth(double dWidth); double getLineWidth(); diff --git a/logPlus/formtrack.cpp b/logPlus/formtrack.cpp index a34367f..2a678cb 100644 --- a/logPlus/formtrack.cpp +++ b/logPlus/formtrack.cpp @@ -1005,6 +1005,36 @@ void FormTrack::s_addLogface(QString strSlfName, QString strWellName, QString st curveNameFont.fromString(listOtherProperty[2]); formInfo->m_curveNameFont = curveNameFont; } + if(listOtherProperty.size()>=6) + { + // + if(listOtherProperty[3]=="DrawFac") + { + formInfo->m_bDrawFac = true; + } + else + { + formInfo->m_bDrawFac = false; + } + // + if(listOtherProperty[4]=="DrawPhase") + { + formInfo->m_bDrawPhase = true; + } + else + { + formInfo->m_bDrawPhase = false; + } + // + if(listOtherProperty[5]=="DrawMFacName") + { + formInfo->m_bDrawMFacName = true; + } + else + { + formInfo->m_bDrawMFacName = false; + } + } //设置高度 ui->tableWidget->setRowHeight(row, 100); //单元格委托 diff --git a/logPlus/qmycustomplot.cpp b/logPlus/qmycustomplot.cpp index 1d707e0..693bcf2 100644 --- a/logPlus/qmycustomplot.cpp +++ b/logPlus/qmycustomplot.cpp @@ -139,6 +139,8 @@ QMyCustomPlot::QMyCustomPlot(QWidget *parent, QString strSlfName, QString strWel connect(CallManage::getInstance(), SIGNAL(sig_changeGeoLithLine(QString, QString, QString, QString, QString, double)), this, SLOT(s_changeGeoLithLine(QString, QString, QString, QString, QString, double))); //是否显示 connect(CallManage::getInstance(), SIGNAL(sig_changeGeoLithShow(QString, QString, QString, QString, QString, QString, bool)), this, SLOT(s_changeGeoLithShow(QString, QString, QString, QString, QString, QString, bool))); + //改变沉积相属性，是否显示 + connect(CallManage::getInstance(), SIGNAL(sig_changeFacShow(QString, QString, QString, QString, QString, QString, bool)), this, SLOT(s_changeFacShow(QString, QString, QString, QString, QString, QString, bool))); } void QMyCustomPlot::initGeometry(QString strUuid, int nscale, int nW) @@ -6088,6 +6090,83 @@ void QMyCustomPlot::s_changeGeoLithShow(QString strUuid, QString strSlfName, QSt //不清空属性窗口 } +//改变沉积相属性，是否显示 +void QMyCustomPlot::s_changeFacShow(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString propertyData, bool bShow) +{ + if(m_strUuid == strUuid && + m_strSlfName == strSlfName && + m_strWellName == strWellName && + m_strTrackName == strTrackName && + m_strLineName == strLineName) + { + + } + else + { + return; + } + + if(propertyData == "绘制相") + { + m_bDrawFac = bShow; + RefreshItems_Fac(false); //刷新数据 + { + //微相 + TransparentDraggableMFac *pDraggableRect =NULL; + QMap::Iterator it = m_mapDraggable_MFac.begin(); + while( it != m_mapDraggable_MFac.end() ) + { + pDraggableRect = (TransparentDraggableMFac*)it.value(); + it++; + //刷新 + QCPRange tmpRange = pDraggableRect->getRange(); + pDraggableRect->setRange(tmpRange.lower, tmpRange.upper); + //pDraggableRect->setTitle(pDraggableRect->mstrTitle); + } + } + } + else if(propertyData == "绘制亚相") + { + m_bDrawPhase = bShow; + RefreshItems_Fac(false); //刷新数据 + { + //微相 + TransparentDraggableMFac *pDraggableRect =NULL; + QMap::Iterator it = m_mapDraggable_MFac.begin(); + while( it != m_mapDraggable_MFac.end() ) + { + pDraggableRect = (TransparentDraggableMFac*)it.value(); + it++; + //刷新 + QCPRange tmpRange = pDraggableRect->getRange(); + pDraggableRect->setRange(tmpRange.lower, tmpRange.upper); + //pDraggableRect->setTitle(pDraggableRect->mstrTitle); + } + } + } + else if(propertyData == "微相名称") + { + m_bDrawMFacName = bShow; + { + //微相 + TransparentDraggableMFac *pDraggableRect =NULL; + QMap::Iterator it = m_mapDraggable_MFac.begin(); + while( it != m_mapDraggable_MFac.end() ) + { + pDraggableRect = (TransparentDraggableMFac*)it.value(); + it++; + //刷新 + QCPRange tmpRange = pDraggableRect->getRange(); + pDraggableRect->setRange(tmpRange.lower, tmpRange.upper); + //pDraggableRect->setTitle(pDraggableRect->mstrTitle); + } + } + } + + + //不清空属性窗口 +} + bool QMyCustomPlot::LoadFromSLF_Layer(QString strSlfName, QString strLineName) { LAYER_DATA m_Result; @@ -7554,6 +7633,21 @@ void QMyCustomPlot::ReadData_Fac(QString strSlfName, QString csCurve, bool bAdd) void QMyCustomPlot::DrawFac(int iType) { + //判读是否绘制 相/亚相 + if(m_bDrawFac && iType==1) + { + //相 + } + else if(m_bDrawPhase && iType==2) + { + //亚相 + } + else + { + return; + } + + int j; float dep1,dep2; float top,bottom; @@ -7683,16 +7777,26 @@ bool QMyCustomPlot::LoadFromSLF_Fac(QString strSlfName, QString csCurve, bool bA removeItem(m_qcpItemLine2); } - //画2条竖线 int iMyWidth = this->axisRect(0)->width(); - m_qcpItemLine = new QCPItemStraightLine(this); - m_qcpItemLine->point1->setCoords(-1, iMyWidth/2);//位置 - m_qcpItemLine->point2->setCoords(-2, iMyWidth/2);//位置 - //qcpItemLine->setPen(pPenStraightLine); + if(m_bDrawFac && m_bDrawPhase) + { + //画2条竖线 + m_qcpItemLine = new QCPItemStraightLine(this); + m_qcpItemLine->point1->setCoords(-1, iMyWidth/2);//位置 + m_qcpItemLine->point2->setCoords(-2, iMyWidth/2);//位置 + //qcpItemLine->setPen(pPenStraightLine); - m_qcpItemLine2 = new QCPItemStraightLine(this); - m_qcpItemLine2->point1->setCoords(-1, 3*iMyWidth/4);//位置 - m_qcpItemLine2->point2->setCoords(-2, 3*iMyWidth/4);//位置 + m_qcpItemLine2 = new QCPItemStraightLine(this); + m_qcpItemLine2->point1->setCoords(-1, 3*iMyWidth/4);//位置 + m_qcpItemLine2->point2->setCoords(-2, 3*iMyWidth/4);//位置 + } + else if(m_bDrawFac || m_bDrawPhase) + { + //画1条竖线 + m_qcpItemLine2 = new QCPItemStraightLine(this); + m_qcpItemLine2->point1->setCoords(-1, 3*iMyWidth/4);//位置 + m_qcpItemLine2->point2->setCoords(-2, 3*iMyWidth/4);//位置 + } ReadFracDef(); @@ -7917,8 +8021,8 @@ void QMyCustomPlot::RefreshItems_Fac(bool bAdd) } //重新加载 - LoadFromSLF_Fac(m_strSlfName, m_strLineName, bAdd); + LoadFromSLF_Fac(m_strSlfName, m_strLineName, bAdd); //属性清空 - PropertyService()->InitCurrentViewInfo(); + //PropertyService()->InitCurrentViewInfo(); } diff --git a/logPlus/qmycustomplot.h b/logPlus/qmycustomplot.h index 0cebaf8..128aee7 100644 --- a/logPlus/qmycustomplot.h +++ b/logPlus/qmycustomplot.h @@ -259,6 +259,10 @@ public: QList m_ObjList_Fac; QCPItemStraightLine *m_qcpItemLine=nullptr; QCPItemStraightLine *m_qcpItemLine2=nullptr; + //沉积相 + bool m_bDrawFac = true; // 绘制相 + bool m_bDrawPhase = true; // 绘制亚相 + bool m_bDrawMFacName = true; // 微相名称 void ReadFracDef(); void ReadData_Fac(QString strSlfName, QString csCurve, bool bAdd=true); void DrawFac(int iType); @@ -489,6 +493,9 @@ public slots: //是否显示 void s_changeGeoLithShow(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString propertyData, bool bShow); + //改变沉积相属性，是否显示 + void s_changeFacShow(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString propertyData, bool bShow); + public: //蝌蚪图重绘网格线 bool mKedou = false;