jiayulong/logplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

沉积相属性记录到json模板

Browse Source
This commit is contained in:
jiayulong 2026-03-18 10:17:11 +08:00
parent 3b32c2ed8e
commit e65b5681d9
11 changed files with 344 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CallManage/CallManage.h
View File

@ -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);

26
logPlus/PropertyWidget.cpp
View File

@ -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<bool>();
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;
}

14
logPlus/TransparentDraggableFac.cpp
View File

@ -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();
}

56
logPlus/TransparentDraggableMFac.cpp
View File

@ -37,7 +37,15 @@ void TransparentDraggableMFac::setMinWidth(double minWidth)
void TransparentDraggableMFac::setTitle(QString strTitle)
{
mstrTitle = strTitle;
//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);
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;
if(mPlot->m_bDrawFac && mPlot->m_bDrawPhase)
{
//画2条竖线
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);
}
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();

33
logPlus/TransparentDraggablePhase.cpp
View File

@ -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;
if(mPlot->m_bDrawFac)
{
//绘制相
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); // 设置文本在矩形中心位置
}
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;
if(mPlot->m_bDrawFac)
{
//绘制相
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);
}
else
{
//不绘制相
mItemTitle->position->setCoords(mPlot->xAxis->pixelToCoord(flNewPos),
7*(lY1 + lY2)/8.0); // 设置文本在矩形中心位置
}
updateHandles();
mPlot->replot();

84
logPlus/formdraw.cpp
View File

@ -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);

4
logPlus/forminfo.cpp
View File

@ -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;
}

5
logPlus/forminfo.h
View File

@ -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();

30
logPlus/formtrack.cpp
View File

@ -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);
//单元格委托

108
logPlus/qmycustomplot.cpp
View File

@ -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<QString,QObject *>::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<QString,QObject *>::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<QString,QObject *>::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,8 +7777,10 @@ bool QMyCustomPlot::LoadFromSLF_Fac(QString strSlfName, QString csCurve, bool bA
removeItem(m_qcpItemLine2);
}
//画2条竖线
int iMyWidth = this->axisRect(0)->width();
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);//位置
@ -7693,6 +7789,14 @@ bool QMyCustomPlot::LoadFromSLF_Fac(QString strSlfName, QString csCurve, bool bA
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();
@ -7920,5 +8024,5 @@ void QMyCustomPlot::RefreshItems_Fac(bool bAdd)
LoadFromSLF_Fac(m_strSlfName, m_strLineName, bAdd);
//属性清空
PropertyService()->InitCurrentViewInfo();
//PropertyService()->InitCurrentViewInfo();
}

7
logPlus/qmycustomplot.h
View File

@ -259,6 +259,10 @@ public:
QList <FAC_TABLE> 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;