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

1.曲线支持改名 2.解决道宽存储json模板变形问题，由int改为double 3.曲线的数据点形状属性可配置，支持圆圈、星形、三角形等

Browse Source
This commit is contained in:
jiayulong 2026-03-25 09:28:47 +08:00
parent 9988666605
commit 1f5caff6ee
9 changed files with 263 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
logPlus/PropertyWidget.cpp
View File

@ -1550,7 +1550,7 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant
m_formInfo->update();
//改变曲线名
//emit CallManage::getInstance()->sig_changeJiegutextLine(m_formInfo->m_strUuid, m_formInfo->m_strSlfName, m_formInfo->m_strWellName, m_formInfo->m_strTrackName, strOldLineName, strLineName);
emit CallManage::getInstance()->sig_changeLineName(m_formInfo->m_strUuid, m_formInfo->m_strSlfName, m_formInfo->m_strWellName, m_formInfo->m_strTrackName, strOldLineName, strLineName);
}
}
}
@ -1680,6 +1680,80 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant
bool bDraw = variant.value<bool>();
emit CallManage::getInstance()->sig_ChangeDrawSymmetry(m_strUuid, m_strSlfName, m_strWellName, m_strTrackName, m_strLineName, bDraw);
}
else if("符号类型" == m_propertyData[pProperty])
{
//qDebug() << "符号类型->改变";
QCPScatterStyle::ScatterShape newStyle=QCPScatterStyle::ssCircle;//数据点，符号类型，圆，三角等
QString newStyleTxt = pProperty->valueText();
//
if(newStyleTxt=="无")
{
newStyle=QCPScatterStyle::ssNone;
}
else if(newStyleTxt=="点")
{
newStyle=QCPScatterStyle::ssDot;
}
else if(newStyleTxt=="十字")
{
newStyle=QCPScatterStyle::ssCross;
}
else if(newStyleTxt=="加号")
{
newStyle=QCPScatterStyle::ssPlus;
}
else if(newStyleTxt=="圆形")
{
newStyle=QCPScatterStyle::ssCircle;
}
else if(newStyleTxt=="圆盘")
{
newStyle=QCPScatterStyle::ssDisc;
}
else if(newStyleTxt=="正方形")
{
newStyle=QCPScatterStyle::ssSquare;
}
else if(newStyleTxt=="菱形")
{
newStyle=QCPScatterStyle::ssDiamond;
}
else if(newStyleTxt=="星形")
{
newStyle=QCPScatterStyle::ssStar;
}
else if(newStyleTxt=="正三角形")
{
newStyle=QCPScatterStyle::ssTriangle;
}
else if(newStyleTxt=="倒三角形")
{
newStyle=QCPScatterStyle::ssTriangleInverted;
}
else if(newStyleTxt=="十字正方形")
{
newStyle=QCPScatterStyle::ssCrossSquare;
}
else if(newStyleTxt=="加号正方形")
{
newStyle=QCPScatterStyle::ssPlusSquare;
}
else if(newStyleTxt=="十字圆形")
{
newStyle=QCPScatterStyle::ssCrossCircle;
}
else if(newStyleTxt=="加号圆形")
{
newStyle=QCPScatterStyle::ssPlusCircle;
}
else if(newStyleTxt=="和平标志")
{
newStyle=QCPScatterStyle::ssPeace;
}
emit CallManage::getInstance()->sig_ChangePointStyle(m_strUuid, m_strSlfName, m_strWellName, m_strTrackName, m_strLineName, newStyle);
}
else if("填充模式" == m_propertyData[pProperty] ||
"填充类型" == m_propertyData[pProperty] ||
"目标曲线" == m_propertyData[pProperty] ||
@ -2273,6 +2347,24 @@ void PropertyWidget::initCurveProperty(FormInfo *formInfo, QStringList strListOt
QStringList listScaleType;
listScaleType.append("线性");
listScaleType.append("对数");
//
QStringList listPointStyle;
listPointStyle.append("无");
listPointStyle.append("点");
listPointStyle.append("十字");
listPointStyle.append("加号");
listPointStyle.append("圆形");
listPointStyle.append("圆盘");
listPointStyle.append("正方形");
listPointStyle.append("菱形");
listPointStyle.append("星形");
listPointStyle.append("正三角形");
listPointStyle.append("倒三角形");
listPointStyle.append("十字正方形");
listPointStyle.append("加号正方形");
listPointStyle.append("十字圆形");
listPointStyle.append("加号圆形");
listPointStyle.append("和平标志");
//
_CreateVariantPropertyItem("通常", "选择井曲线", m_strLineName + "@"+m_strSlfName, QVariant::String);
@ -2294,6 +2386,8 @@ void PropertyWidget::initCurveProperty(FormInfo *formInfo, QStringList strListOt
_CreateVariantPropertyItem("绘制方式", "杆状", formInfo->m_bDrawGan, QVariant::Bool);
_CreateVariantPropertyItem("绘制方式", "点状", formInfo->m_bDrawPoint, QVariant::Bool);
_CreateEnumPropertyItem("数据点", "符号类型", (int)formInfo->m_pointStyle, listPointStyle);
//
_CreateEnumPropertyItem("岩性填充", "头部图例", listHeadFill.indexOf(formInfo->m_newHeadFill), listHeadFill);
_CreateEnumPropertyItem("岩性填充", "目标曲线", listTargetLine.indexOf(formInfo->m_newTargetLine), listTargetLine);

39
logPlus/formdraw.cpp
View File

@ -57,6 +57,8 @@ FormDraw::FormDraw(QWidget *parent, QString strWellName, QString strTrackName) :
connect(CallManage::getInstance(), SIGNAL(sig_AddLine_Property(QString, QString, QString, QString, QString, double, double, QString, QColor, double, Qt::PenStyle, QStringList)),
this, SLOT(s_AddLine_Property(QString, QString, QString, QString, QString, double, double, QString, QColor, double, Qt::PenStyle, QStringList)));
connect(CallManage::getInstance(), SIGNAL(sig_delLine(QString, QString, QString, QString)), this, SLOT(s_delLine(QString, QString, QString, QString)));
//改变曲线名
connect(CallManage::getInstance(), SIGNAL(sig_changeLineName(QString, QString, QString, QString, QString, QString)), this, SLOT(s_changeLineName(QString, QString, QString, QString, QString, QString)));
connect(CallManage::getInstance(), SIGNAL(sig_MouseMove(QString, QString, QString, float)), this, SLOT(s_MouseMove(QString, QString, QString, float)));
//波列
@ -2606,7 +2608,7 @@ void FormDraw::s_addWave(QString strUuid, QString strSlfName, QString strWellNam
//curv->setMaximumHeight((int)dHight);
//curv->setViewport(QRect(0, 0, g_iOneWidth, (int)dHight));//7500-3184
int nW = m_nTrackW;
double nW = m_nTrackW;
if (nW < 0)
nW = g_iOneWidth;
curv->setGeometry(0, 0, nW, (int)dHight);//7500-3184
@ -4222,7 +4224,9 @@ void FormDraw::initForm(QMyCustomPlot *widget, QString strSlfName, QString strLi
}
//最大值，最小值
vmax=vmin=val[0];
bool bFistValue=false;
vmax = -9999;//(float)_nSamples;
vmin = -9999;
//slf文件读取曲线
QVector<double> x, y;
@ -4230,6 +4234,17 @@ void FormDraw::initForm(QMyCustomPlot *widget, QString strSlfName, QString strLi
{
if(newLeftScale==-9999)
{
if(val[i]==-9999)
{
continue;
}
if(bFistValue==false)
{
//最大值，最小值默认采用第一个有效值
bFistValue=true;
vmax = vmin = val[i];
}
if(vmax<val[i])vmax=val[i];
if(vmin>val[i])vmin=val[i];
}
@ -7782,3 +7797,23 @@ void FormDraw::s_changeJiegutextLine(QString strUuid, QString strSlfName, QStrin
}
m_listLineName.push_back(strNewLineName);
}
void FormDraw::s_changeLineName(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString strNewLineName)
{
//井名&道名不一致
if(strUuid == m_strUuid && m_strWellName == strWellName && m_strTrackName == strTrackName)
{
}
else
{
return;
}
if(m_listLineName.contains(strLineName))
{
m_listLineName.removeOne(strLineName);
//qDebug() << "FormDraw strLineName already exist! " << strLineName;
//return;
}
m_listLineName.push_back(strNewLineName);
}

4
logPlus/formdraw.h
View File

@ -106,7 +106,7 @@ public:
QString m_strSlfName = "";
QString m_strWellName;
QString m_strTrackName;
int m_nTrackW = 0;
double m_nTrackW = 0;
int m_iScale=200;
double m_iY1=0;
@ -245,6 +245,8 @@ public slots:
void s_addLine(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName);
void s_AddLine_Property(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName,
double newLeftScale, double newRightScale, QString strScaleType, QColor lineColor, double width, Qt::PenStyle lineStyle, QStringList listOtherProperty);//新建曲线，带属性
//改变曲线名
void s_changeLineName(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString strNewLineName);
void s_delLine(QString strUuid, QString strWellName, QString strTrackName, QString strLineName);
void s_MouseMove(QString strUuid, QString strWellName, QString strTrackName, float dep);

16
logPlus/forminfo.cpp
View File

@ -63,6 +63,8 @@ FormInfo::FormInfo(QWidget *parent, QString strSlfName, QString strWellName, QSt
connect(CallManage::getInstance(), SIGNAL(sig_ChangeDrawPoint(QString, QString, QString, QString, QString, bool)), this, SLOT(s_ChangeDrawPoint(QString, QString, QString, QString, QString, bool)));
//绘制对称曲线
connect(CallManage::getInstance(), SIGNAL(sig_ChangeDrawSymmetry(QString, QString, QString, QString, QString, bool)), this, SLOT(s_ChangeDrawSymmetry(QString, QString, QString, QString, QString, bool)));
//数据点 符号类型
connect(CallManage::getInstance(), SIGNAL(sig_ChangePointStyle(QString, QString, QString, QString, QString, QCPScatterStyle::ScatterShape)), this, SLOT(s_ChangePointStyle(QString, QString, QString, QString, QString, QCPScatterStyle::ScatterShape)));
//斜井三图一表
connect(CallManage::getInstance(), SIGNAL(sig_ChangeTvdProperty(QString, QString, QString, QString, QString, QObject *)),
@ -1155,6 +1157,20 @@ void FormInfo::s_ChangeLineStyle(QString strUuid, QString strSlfName, QString st
}
}
//数据点 符号类型
void FormInfo::s_ChangePointStyle(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QCPScatterStyle::ScatterShape pointStyle)
{
if(m_strUuid == strUuid &&
m_strSlfName == strSlfName &&
m_strWellName == strWellName &&
m_strTrackName == strTrackName &&
m_strLineName == strLineName)
{
m_pointStyle = pointStyle;
//update();
}
}
//曲线
void FormInfo::s_ChangeDrawLine(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, bool bDrawLine)
{

6
logPlus/forminfo.h
View File

@ -9,6 +9,7 @@
#include <QJsonObject>
#include <QJsonArray>
#include "DrawTvd.h"
#include "qcustomplot.h"
#pragma execution_character_set("utf-8")
@ -59,6 +60,10 @@ public slots:
void s_ChangeDrawPoint(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, bool bDrawPoint);
//绘制对称曲线
void s_ChangeDrawSymmetry(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, bool bDrawSymmetry);
//数据点 符号类型
void s_ChangePointStyle(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QCPScatterStyle::ScatterShape pointStyle);
//斜井三图一表
void s_ChangeTvdProperty(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName,
QObject *pTvd);
@ -111,6 +116,7 @@ public:
bool m_bDrawGan = false; // 杆状
bool m_bDrawPoint = false; // 点状
bool m_bDrawSymmetry = false; // 绘制对称曲线
QCPScatterStyle::ScatterShape m_pointStyle=QCPScatterStyle::ssCircle;//数据点，符号类型，圆，三角等
//岩性填充
QString m_newHeadFill;//头部图例

2
logPlus/formtracktop.h
View File

@ -45,7 +45,7 @@ public:
QString m_strLineName;
QString m_strType;
int m_nTrackW;
double m_nTrackW;
QFont m_font;
QColor m_fontColor;//颜色

2
logPlus/formwell.cpp
View File

@ -85,7 +85,7 @@ QVector<QWidget *> FormWell::new_track(QStringList listdt, QString strTrackName)
QString strSlfName = listdt.at(2);
QString strLineName = listdt.at(3);
QString strType = listdt.at(4);
int nW = listdt.at(5).toInt();
double nW = listdt.at(5).toDouble();
//判断当前井是否与自己同名
if(strUuid != m_strUuid || strWellName != m_strWellName)

104
logPlus/qmycustomplot.cpp
View File

@ -108,6 +108,10 @@ QMyCustomPlot::QMyCustomPlot(QWidget *parent, QString strSlfName, QString strWel
connect(CallManage::getInstance(), SIGNAL(sig_ChangeDrawPoint(QString, QString, QString, QString, QString, bool)), this, SLOT(s_ChangeDrawPoint(QString, QString, QString, QString, QString, bool)));
//绘制对称曲线
connect(CallManage::getInstance(), SIGNAL(sig_ChangeDrawSymmetry(QString, QString, QString, QString, QString, bool)), this, SLOT(s_ChangeDrawSymmetry(QString, QString, QString, QString, QString, bool)));
//改变曲线名
connect(CallManage::getInstance(), SIGNAL(sig_changeLineName(QString, QString, QString, QString, QString, QString)), this, SLOT(s_changeLineName(QString, QString, QString, QString, QString, QString)));
//数据点 符号类型
connect(CallManage::getInstance(), SIGNAL(sig_ChangePointStyle(QString, QString, QString, QString, QString, QCPScatterStyle::ScatterShape)), this, SLOT(s_ChangePointStyle(QString, QString, QString, QString, QString, QCPScatterStyle::ScatterShape)));
//岩性填充-不填充
connect(CallManage::getInstance(), SIGNAL(sig_ClearFillMode(QString, QString, QString, QString, QString)), this, SLOT(s_ClearFillMode(QString, QString, QString, QString, QString)));
@ -5198,6 +5202,67 @@ void QMyCustomPlot::s_ChangeLineStyle(QString strUuid, QString strSlfName, QStri
}
}
//数据点 符号类型
void QMyCustomPlot::s_ChangePointStyle(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QCPScatterStyle::ScatterShape pointStyle)
{
if(m_strUuid == strUuid &&
m_strSlfName == strSlfName &&
m_strWellName == strWellName &&
m_strTrackName == strTrackName &&
m_strLineName == strLineName)
{
m_pointStyle = pointStyle;
QCPGraph* graph =this->graph(0);
if(graph)
{
//勾选3个
if(m_bDrawLine && m_bDrawGan && m_bDrawPoint)
{
graph->setLineStyle((QCPGraph::LineStyle)(QCPGraph::lsImpulse));//杆状线
graph->setScatterStyle(QCPScatterStyle(m_pointStyle));//圆圈(QCPScatterStyle::ScatterShape)(QCPScatterStyle::ssCircle)
}
//勾选2个
else if(m_bDrawLine && m_bDrawGan && !m_bDrawPoint){//曲线+杆状
graph->setLineStyle((QCPGraph::LineStyle)(QCPGraph::lsImpulse));
graph->setScatterStyle(QCPScatterStyle((QCPScatterStyle::ScatterShape)(QCPScatterStyle::ssDot)));
}
else if(m_bDrawLine && !m_bDrawGan && m_bDrawPoint){//曲线+点状
graph->setLineStyle((QCPGraph::LineStyle)(QCPGraph::lsLine));
graph->setScatterStyle(QCPScatterStyle(m_pointStyle));//圆圈(QCPScatterStyle::ScatterShape)(QCPScatterStyle::ssCircle)
}
else if(!m_bDrawLine && m_bDrawGan && m_bDrawPoint){//杆状+点状
graph->setLineStyle((QCPGraph::LineStyle)(QCPGraph::lsImpulse));
graph->setScatterStyle(QCPScatterStyle(m_pointStyle));//圆圈(QCPScatterStyle::ScatterShape)(QCPScatterStyle::ssCircle)
}
//勾选1个
else if(m_bDrawLine && !m_bDrawGan && !m_bDrawPoint)//曲线
{
graph->setLineStyle((QCPGraph::LineStyle)(QCPGraph::lsLine));
graph->setScatterStyle(QCPScatterStyle((QCPScatterStyle::ScatterShape)(QCPScatterStyle::ssDot)));
}
else if(!m_bDrawLine && m_bDrawGan && !m_bDrawPoint)//杆状
{
graph->setLineStyle((QCPGraph::LineStyle)(QCPGraph::lsImpulse));
graph->setScatterStyle(QCPScatterStyle((QCPScatterStyle::ScatterShape)(QCPScatterStyle::ssDot)));
}
else if(!m_bDrawLine && !m_bDrawGan && m_bDrawPoint)//点状
{
graph->setLineStyle((QCPGraph::LineStyle)(QCPGraph::lsNone));
graph->setScatterStyle(QCPScatterStyle(m_pointStyle));//圆圈 (QCPScatterStyle::ScatterShape)(QCPScatterStyle::ssCircle)
}
//勾选0个
else if(!m_bDrawLine && !m_bDrawGan && !m_bDrawPoint)//曲线
{
graph->setLineStyle((QCPGraph::LineStyle)(QCPGraph::lsNone));
graph->setScatterStyle(QCPScatterStyle((QCPScatterStyle::ScatterShape)(QCPScatterStyle::ssNone)));
}
//
replot();
}
}
}
//绘制方式
void QMyCustomPlot::ChangeDrawMethod(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName)
{
@ -5214,7 +5279,7 @@ void QMyCustomPlot::ChangeDrawMethod(QString strUuid, QString strSlfName, QStrin
if(m_bDrawLine && m_bDrawGan && m_bDrawPoint)
{
graph->setLineStyle((QCPGraph::LineStyle)(QCPGraph::lsImpulse));//杆状线
graph->setScatterStyle(QCPScatterStyle((QCPScatterStyle::ScatterShape)(QCPScatterStyle::ssCircle)));//圆圈
graph->setScatterStyle(QCPScatterStyle(m_pointStyle));//圆圈(QCPScatterStyle::ScatterShape)(QCPScatterStyle::ssCircle)
}
//勾选2个
else if(m_bDrawLine && m_bDrawGan && !m_bDrawPoint){//曲线+杆状
@ -5223,11 +5288,11 @@ void QMyCustomPlot::ChangeDrawMethod(QString strUuid, QString strSlfName, QStrin
}
else if(m_bDrawLine && !m_bDrawGan && m_bDrawPoint){//曲线+点状
graph->setLineStyle((QCPGraph::LineStyle)(QCPGraph::lsLine));
graph->setScatterStyle(QCPScatterStyle((QCPScatterStyle::ScatterShape)(QCPScatterStyle::ssCircle)));//圆圈
graph->setScatterStyle(QCPScatterStyle(m_pointStyle));//圆圈(QCPScatterStyle::ScatterShape)(QCPScatterStyle::ssCircle)
}
else if(!m_bDrawLine && m_bDrawGan && m_bDrawPoint){//杆状+点状
graph->setLineStyle((QCPGraph::LineStyle)(QCPGraph::lsImpulse));
graph->setScatterStyle(QCPScatterStyle((QCPScatterStyle::ScatterShape)(QCPScatterStyle::ssCircle)));//圆圈
graph->setScatterStyle(QCPScatterStyle(m_pointStyle));//圆圈(QCPScatterStyle::ScatterShape)(QCPScatterStyle::ssCircle)
}
//勾选1个
else if(m_bDrawLine && !m_bDrawGan && !m_bDrawPoint)//曲线
@ -5243,7 +5308,7 @@ void QMyCustomPlot::ChangeDrawMethod(QString strUuid, QString strSlfName, QStrin
else if(!m_bDrawLine && !m_bDrawGan && m_bDrawPoint)//点状
{
graph->setLineStyle((QCPGraph::LineStyle)(QCPGraph::lsNone));
graph->setScatterStyle(QCPScatterStyle((QCPScatterStyle::ScatterShape)(QCPScatterStyle::ssCircle)));//圆圈
graph->setScatterStyle(QCPScatterStyle(m_pointStyle));//圆圈 (QCPScatterStyle::ScatterShape)(QCPScatterStyle::ssCircle)
}
//勾选0个
else if(!m_bDrawLine && !m_bDrawGan && !m_bDrawPoint)//曲线
@ -5436,10 +5501,16 @@ void QMyCustomPlot::s_ClearFillMode(QString strUuid, QString strSlfName, QString
m_strLineName == strLineName)
{
//清空填充
if(this->graphCount() > 1)
if(graph_Fill)
{
this->removeGraph(1);
//this->removeGraph(1);
this->removeGraph(graph_Fill);
graph_Fill=nullptr;
}
// if(this->graphCount() > 1)
// {
// this->removeGraph(1);
// }
if(graph(0))
{
graph(0)->setBrush(Qt::NoBrush);
@ -9286,3 +9357,24 @@ void QMyCustomPlot::RefreshItems_Tubing()
PropertyService()->InitCurrentViewInfo();
}
//改变曲线名
void QMyCustomPlot::s_changeLineName(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString strNewLineName)
{
if(m_strUuid == strUuid &&
m_strSlfName == strSlfName &&
m_strWellName == strWellName &&
m_strTrackName == strTrackName &&
m_strLineName == strLineName)
{
}
else
{
return;
}
m_strLineName = strNewLineName;
//刷新数据
s_ReloadPlot(strUuid, strSlfName, strNewLineName);
//RefreshItems_Jiegutext();
}

5
logPlus/qmycustomplot.h
View File

@ -120,6 +120,7 @@ public:
bool m_bDrawGan = false; // 杆状
bool m_bDrawPoint = false; // 点状
bool m_bDrawSymmetry = false; // 绘制对称曲线
QCPScatterStyle::ScatterShape m_pointStyle=QCPScatterStyle::ssCircle;//数据点，符号类型，圆，三角等
QColor m_frontColor;//岩性前景色
QColor m_backColor;//岩性背景色
@ -394,6 +395,10 @@ public slots:
void s_ChangeDrawPoint(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, bool bDrawPoint);
//绘制对称曲线
void s_ChangeDrawSymmetry(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, bool bDrawSymmetry);
//改变曲线名
void s_changeLineName(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString strNewLineName);
//数据点 符号类型
void s_ChangePointStyle(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QCPScatterStyle::ScatterShape pointStyle);
//岩性填充-不填充
void s_ClearFillMode(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName);