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

Merge branch 'main' of http://git.hivekion.com:3000/jiayulong/logplus

Browse Source
This commit is contained in:
crqiqi77 2026-03-24 14:49:00 +08:00
commit 9988666605
7 changed files with 244 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

398
logPlus/PropertyWidget.cpp
View File

@ -1408,13 +1408,11 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant
listCond << variant;
emit CallManage::getInstance()->sig_changeDepthProperty(listCond);
}
if("深度比例尺" == m_propertyData[pProperty])
else if(m_strCurrentProperty == Widget_Property)
{
//qDebug() << "深度比例尺->改变";
//当前属性类型
if(m_strCurrentProperty == Widget_Property)
if("深度比例尺" == m_propertyData[pProperty])
{
//qDebug() << "深度比例尺->改变";
int iScale = 200;
QString newScale = pProperty->valueText();
//qDebug() << "深度比例尺->" << newScale;
@ -1446,19 +1444,15 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant
//通知界面缩放
emit CallManage::getInstance()->sig_changeScale(m_strUuid, iScale);
}
}
else if("自定义比例尺" == m_propertyData[pProperty])
{
if(m_bSelfChange==true)
else if("自定义比例尺" == m_propertyData[pProperty])
{
m_bSelfChange=false;
return;
}
if(m_bSelfChange==true)
{
m_bSelfChange=false;
return;
}
//qDebug() << "自定义比例尺->改变";
//当前属性类型
if(m_strCurrentProperty == Widget_Property)
{
//qDebug() << "自定义比例尺->改变";
int iScale = 200;
QString newScale = variant.value<QString>();
//qDebug() << "自定义比例尺->" << newScale;
@ -1489,20 +1483,17 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant
//不合规
return;
}
//
m_iScale = iScale;
//通知界面缩放
emit CallManage::getInstance()->sig_changeScale(m_strUuid, iScale);
}
}
else if("开始深度(m)" == m_propertyData[pProperty])
else if(m_strCurrentProperty == Well_Property)
{
//qDebug() << "开始深度(m)->改变";
//当前属性类型
if(m_strCurrentProperty == Well_Property)
if("开始深度(m)" == m_propertyData[pProperty])
{
//qDebug() << "开始深度(m)->改变";
double newStartDepth = variant.value<double>();
m_iY2 = 0 - newStartDepth;
if(m_iY2 < m_iY1)
@ -1512,13 +1503,9 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant
//通知界面
emit CallManage::getInstance()->sig_changeDepth(m_strUuid, m_strSlfName, m_strWellName, m_iY1, m_iY2);
}
}
else if("终止深度(m)" == m_propertyData[pProperty])
{
//qDebug() << "终止深度(m)->改变";
//当前属性类型
if(m_strCurrentProperty == Well_Property)
else if("终止深度(m)" == m_propertyData[pProperty])
{
//qDebug() << "终止深度(m)->改变";
double newEndDepth = variant.value<double>();
m_iY1 = 0 - newEndDepth;
if(m_iY2 < m_iY1)
@ -1529,114 +1516,113 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant
emit CallManage::getInstance()->sig_changeDepth(m_strUuid, m_strSlfName, m_strWellName, m_iY1, m_iY2);
}
}
//曲线---------------------------
else if("显示名称" == m_propertyData[pProperty])
else if(m_strCurrentProperty == Curve_Property)
{
//qDebug() << "显示名称->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
//曲线---------------------------
if("选择井曲线" == m_propertyData[pProperty])
{
QString sFilePath = variant.value<QString>();
if(sFilePath.indexOf("@")>-1)
{
int ind=sFilePath.indexOf("@");
QString strLineName = sFilePath.left(ind);
sFilePath=sFilePath.mid(ind+1);
sFilePath.trimmed();
//只支持以下名称
{
QString strOldLineName = m_formInfo->m_strLineName;
QString strOldSlfName = m_formInfo->m_strSlfName;
//暂时不允许改变slf井次名称，不然不在同一口井绘制
if(strOldSlfName != sFilePath)
{
QMessageBox::information(nullptr,"提示","不允许改变slf井次名称");
return;
}
//名称不变
if(strOldLineName == strLineName)
{
return;
}
//
m_formInfo->m_strLineName = strLineName;
//m_formInfo->m_strSlfName = sFilePath;
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);
}
}
}
else if("显示名称" == m_propertyData[pProperty])
{
//qDebug() << "显示名称->改变";
QString newAliasName = variant.value<QString>();
m_formInfo->m_strAliasName = newAliasName;
m_formInfo->update();
}
}
else if("显示单位" == m_propertyData[pProperty])
{
//qDebug() << "显示单位->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
else if("显示单位" == m_propertyData[pProperty])
{
//qDebug() << "显示单位->改变";
QString newUnit = variant.value<QString>();
m_formInfo->m_strUnit = newUnit;
m_formInfo->update();
}
}
else if("左刻度" == m_propertyData[pProperty])
{
//qDebug() << "左刻度->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
else if("左刻度" == m_propertyData[pProperty])
{
//qDebug() << "左刻度->改变";
double newLeftScale = variant.value<double>();
m_formInfo->m_vmin = newLeftScale;
m_formInfo->m_vmin = newLeftScale;
emit CallManage::getInstance()->sig_ChangeLeftScale(m_strUuid, m_strSlfName, m_strWellName, m_strTrackName, m_strLineName, newLeftScale);
emit CallManage::getInstance()->sig_ChangeCross(m_strUuid, m_strTrackUuid);
emit CallManage::getInstance()->sig_ChangeCross(m_strUuid, m_strTrackUuid);
//更新填充
ChangFillProperty();
}
}
else if("右刻度" == m_propertyData[pProperty])
{
//qDebug() << "右刻度->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
else if("右刻度" == m_propertyData[pProperty])
{
//qDebug() << "右刻度->改变";
double newRightScale = variant.value<double>();
m_formInfo->m_vmax = newRightScale;
m_formInfo->m_vmax = newRightScale;
emit CallManage::getInstance()->sig_ChangeRightScale(m_strUuid, m_strSlfName, m_strWellName, m_strTrackName, m_strLineName, newRightScale);
emit CallManage::getInstance()->sig_ChangeCross(m_strUuid, m_strTrackUuid);
emit CallManage::getInstance()->sig_ChangeCross(m_strUuid, m_strTrackUuid);
//更新填充
ChangFillProperty();
}
}
else if("刻度类型" == m_propertyData[pProperty])
{
//qDebug() << "刻度类型->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
else if("刻度类型" == m_propertyData[pProperty])
{
//qDebug() << "刻度类型->改变";
QString newScaleType = pProperty->valueText();
emit CallManage::getInstance()->sig_ChangeScaleType(m_strUuid, m_strSlfName, m_strWellName, m_strTrackName, m_strLineName, newScaleType);
//更新填充
ChangFillProperty();
}
}
else if ("左跨道个数" == m_propertyData[pProperty])
{
if (m_strCurrentProperty == Curve_Property)
{
m_formInfo->m_nLeftCross = variant.toInt();
emit CallManage::getInstance()->sig_ChangeCross(m_strUuid, m_strTrackUuid);
}
}
else if ("右跨道个数" == m_propertyData[pProperty])
{
if (m_strCurrentProperty == Curve_Property)
{
m_formInfo->m_nRightCross = variant.toInt();
emit CallManage::getInstance()->sig_ChangeCross(m_strUuid, m_strTrackUuid);
}
}
else if("颜色" == m_propertyData[pProperty])
{
//qDebug() << "颜色->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
else if ("左跨道个数" == m_propertyData[pProperty])
{
m_formInfo->m_nLeftCross = variant.toInt();
emit CallManage::getInstance()->sig_ChangeCross(m_strUuid, m_strTrackUuid);
}
else if ("右跨道个数" == m_propertyData[pProperty])
{
m_formInfo->m_nRightCross = variant.toInt();
emit CallManage::getInstance()->sig_ChangeCross(m_strUuid, m_strTrackUuid);
}
else if("颜色" == m_propertyData[pProperty])
{
//qDebug() << "颜色->改变";
//曲线颜色
// 假设variant已经被设置为包含QColor
QColor newColor = variant.value<QColor>();
emit CallManage::getInstance()->sig_ChangeLineColor(m_strUuid, m_strSlfName, m_strWellName, m_strTrackName, m_strLineName, newColor);
}
}
else if("线宽" == m_propertyData[pProperty])
{
//qDebug() << "线宽->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
else if("线宽" == m_propertyData[pProperty])
{
//qDebug() << "线宽->改变";
double newWidth = variant.value<double>();
emit CallManage::getInstance()->sig_ChangeLineWidth(m_strUuid, m_strSlfName, m_strWellName, m_strTrackName, m_strLineName, newWidth);
}
}
else if("线型" == m_propertyData[pProperty])
{
//qDebug() << "线型->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
else if("线型" == m_propertyData[pProperty])
{
//qDebug() << "线型->改变";
Qt::PenStyle newStyle = Qt::SolidLine;
int iStyle = variant.value<int>();
switch(iStyle)
@ -1668,168 +1654,76 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant
default:
break;
}
emit CallManage::getInstance()->sig_ChangeLineStyle(m_strUuid, m_strSlfName, m_strWellName, m_strTrackName, m_strLineName, newStyle);
}
}
else if("曲线" == m_propertyData[pProperty])
{
//qDebug() << "曲线->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
else if("曲线" == m_propertyData[pProperty])
{
//qDebug() << "曲线->改变";
bool bDraw = variant.value<bool>();
emit CallManage::getInstance()->sig_ChangeDrawLine(m_strUuid, m_strSlfName, m_strWellName, m_strTrackName, m_strLineName, bDraw);
}
}
else if("杆状" == m_propertyData[pProperty])
{
//qDebug() << "杆状->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
else if("杆状" == m_propertyData[pProperty])
{
//qDebug() << "杆状->改变";
bool bDraw = variant.value<bool>();
emit CallManage::getInstance()->sig_ChangeDrawGan(m_strUuid, m_strSlfName, m_strWellName, m_strTrackName, m_strLineName, bDraw);
}
}
else if("点状" == m_propertyData[pProperty])
{
//qDebug() << "点状->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
else if("点状" == m_propertyData[pProperty])
{
//qDebug() << "点状->改变";
bool bDraw = variant.value<bool>();
emit CallManage::getInstance()->sig_ChangeDrawPoint(m_strUuid, m_strSlfName, m_strWellName, m_strTrackName, m_strLineName, bDraw);
}
}
else if("绘制对称曲线" == m_propertyData[pProperty])
{
//qDebug() << "绘制对称曲线->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
else if("绘制对称曲线" == m_propertyData[pProperty])
{
//qDebug() << "绘制对称曲线->改变";
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() << "填充模式->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
else if("填充模式" == m_propertyData[pProperty] ||
"填充类型" == m_propertyData[pProperty] ||
"目标曲线" == m_propertyData[pProperty] ||
"填充颜色" == m_propertyData[pProperty] ||
"填充岩性" == m_propertyData[pProperty] ||
"岩性前景色" == m_propertyData[pProperty] ||
"岩性背景色" == m_propertyData[pProperty] ||
"头部图例" == m_propertyData[pProperty])
{
ChangFillProperty();
}
}
else if("填充类型" == m_propertyData[pProperty])
else if(m_strCurrentProperty == Head_Property)
{
//qDebug() << "填充类型->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
{
ChangFillProperty();
}
}
else if("目标曲线" == m_propertyData[pProperty])
{
//qDebug() << "目标曲线->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
{
ChangFillProperty();
}
}
else if("填充颜色" == m_propertyData[pProperty])
{
//qDebug() << "填充颜色->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
{
ChangFillProperty();
}
}
else if("填充岩性" == m_propertyData[pProperty])
{
//qDebug() << "填充岩性->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
{
ChangFillProperty();
}
}
else if("岩性前景色" == m_propertyData[pProperty])
{
//qDebug() << "岩性前景色->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
{
ChangFillProperty();
}
}
else if("岩性背景色" == m_propertyData[pProperty])
{
//qDebug() << "岩性背景色->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
{
ChangFillProperty();
}
}
else if("头部图例" == m_propertyData[pProperty])
{
//qDebug() << "头部图例->改变";
//当前属性类型
if(m_strCurrentProperty == Curve_Property)
{
ChangFillProperty();
}
}
//图头---------------------------
else if("图例" == m_propertyData[pProperty])
{
//qDebug() << "图例->改变";
//当前属性类型
if(m_strCurrentProperty == Head_Property)
//图头---------------------------
if("图例" == m_propertyData[pProperty])
{
//qDebug() << "图例->改变";
QString newSvg = variant.value<QString>();
m_item->setData(Qt::UserRole+1, newSvg); // 图片路径
//图头项改变
ChangHeadItemProperty();
}
}
else if("图例宽(cm)" == m_propertyData[pProperty])
{
//qDebug() << "图例宽(cm)->改变";
//当前属性类型
if(m_strCurrentProperty == Head_Property)
else if("图例宽(cm)" == m_propertyData[pProperty])
{
//qDebug() << "图例宽(cm)->改变";
double newWidth = variant.value<double>();
m_item->setData(Qt::UserRole+2, newWidth); // 图片路径
m_colWidth_Img = newWidth;
//图头项改变
ChangHeadItemProperty();
}
}
else if("图例高(cm)" == m_propertyData[pProperty])
{
//qDebug() << "图例高(cm)->改变";
//当前属性类型
if(m_strCurrentProperty == Head_Property)
else if("图例高(cm)" == m_propertyData[pProperty])
{
//qDebug() << "图例高(cm)->改变";
double newHight = variant.value<double>();
m_item->setData(Qt::UserRole+3, newHight); // 图片路径
m_rowHeight_Img = newHight;
//图头项改变
ChangHeadItemProperty();
}
}
else if("背景颜色" == m_propertyData[pProperty])
{
//qDebug() << "背景颜色->改变";
//当前属性类型
if(m_strCurrentProperty == Head_Property)
else if("背景颜色" == m_propertyData[pProperty])
{
//qDebug() << "背景颜色->改变";
//背景颜色
// 假设variant已经被设置为包含QColor
QColor newColor = variant.value<QColor>();
@ -1838,13 +1732,9 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant
m_formHead->m_bRefresh=false;
m_item->setBackground(brush);
}
}
else if("列宽(cm)" == m_propertyData[pProperty])
{
//qDebug() << "列宽(cm)->改变";
//当前属性类型
if(m_strCurrentProperty == Head_Property)
else if("列宽(cm)" == m_propertyData[pProperty])
{
//qDebug() << "列宽(cm)->改变";
double newWidth = variant.value<double>();
m_colWidth = newWidth;
m_formHead->m_bRefresh=false;
@ -1853,13 +1743,9 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant
m_tableWidget->update();
m_formHead->resizeWindow();
}
}
else if("行高(cm)" == m_propertyData[pProperty])
{
//qDebug() << "行高(cm)->改变";
//当前属性类型
if(m_strCurrentProperty == Head_Property)
else if("行高(cm)" == m_propertyData[pProperty])
{
//qDebug() << "行高(cm)->改变";
double newHight = variant.value<double>();
m_rowHeight = newHight;
m_formHead->m_bRefresh=false;
@ -1868,40 +1754,26 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant
m_tableWidget->update();
m_formHead->resizeWindow();
}
}
else if("内容" == m_propertyData[pProperty])
{
//qDebug() << "内容->改变";
//当前属性类型
if(m_strCurrentProperty == Head_Property)
else if("内容" == m_propertyData[pProperty])
{
//qDebug() << "内容->改变";
QString newText = variant.value<QString>();
m_formHead->m_bRefresh=false;
m_item->setText(newText);
}
}
else if("方向" == m_propertyData[pProperty])
{
//qDebug() << "方向->改变";
//当前属性类型
if(m_strCurrentProperty == Head_Property)
else if("方向" == m_propertyData[pProperty])
{
//qDebug() << "方向->改变";
QString newDirection = pProperty->valueText();
if(newDirection=="垂直")
{
}
else{
//m_item->
}
}
}
else if("字体颜色" == m_propertyData[pProperty])
{
//qDebug() << "字体颜色->改变";
//当前属性类型
if(m_strCurrentProperty == Head_Property)
else if("字体颜色" == m_propertyData[pProperty])
{
//qDebug() << "字体颜色->改变";
//字体颜色
// 假设variant已经被设置为包含QColor
QColor newColor = variant.value<QColor>();
@ -1910,13 +1782,9 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant
m_formHead->m_bRefresh=false;
m_item->setForeground(brush);
}
}
else if("字体" == m_propertyData[pProperty])
{
//qDebug() << "字体->改变";
//当前属性类型
if(m_strCurrentProperty == Head_Property)
else if("字体" == m_propertyData[pProperty])
{
//qDebug() << "字体->改变";
//字体
// 假设variant已经被设置为包含QColor
QFont newFont = variant.value<QFont>();
@ -1925,10 +1793,11 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant
m_item->setFont(newFont);
}
}
else if("间隔" == m_propertyData[pProperty])
{
}
}
void PropertyWidget::SlotPropertyChanged(QtProperty *property, const int &val, bool islinestyle)
@ -2406,7 +2275,7 @@ void PropertyWidget::initCurveProperty(FormInfo *formInfo, QStringList strListOt
listScaleType.append("对数");
//
_CreateVariantPropertyItem("通常", "井曲线", m_strLineName + "@"+m_strSlfName, QVariant::String);
_CreateVariantPropertyItem("通常", "选择井曲线", m_strLineName + "@"+m_strSlfName, QVariant::String);
_CreateVariantPropertyItem("通常", "显示名称", formInfo->m_strAliasName, QVariant::String);
_CreateVariantPropertyItem("通常", "显示单位", formInfo->m_strUnit, QVariant::String);
//
@ -3375,8 +3244,8 @@ void PropertyWidget::initTubingProperty(FormInfo *formInfo)
_CreateVariantPropertyItem("对象", "颜色", formInfo->m_lineColor, QVariant::Color);
_CreateVariantPropertyItem("显示设置", "显示单位", formInfo->m_strUnit, QVariant::String);
_CreateVariantPropertyItem("显示设置", "左刻度", formInfo->m_vmin, QVariant::Double);
_CreateVariantPropertyItem("显示设置", "右刻度", formInfo->m_vmax, QVariant::Double);
// _CreateVariantPropertyItem("显示设置", "左刻度", formInfo->m_vmin, QVariant::Double);
// _CreateVariantPropertyItem("显示设置", "右刻度", formInfo->m_vmax, QVariant::Double);
_CreateVariantPropertyItem("绘制方式", "绘制结构", formInfo->m_bDrawStruct_Tubing, QVariant::Bool);
_CreateVariantPropertyItem("绘制方式", "绘制管柱", formInfo->m_bDrawTubing_Tubing, QVariant::Bool);
@ -3417,9 +3286,18 @@ void PropertyWidget::initTubingItemProperty(TransparentDraggableGuan* tdGuan, do
_CreateVariantPropertyItem("对象", "颜色", formInfo->m_lineColor, QVariant::Color);
_CreateVariantPropertyItem("显示设置", "显示单位", formInfo->m_strUnit, QVariant::String);
_CreateVariantPropertyItem("显示设置", "左刻度", formInfo->m_vmin, QVariant::Double);
_CreateVariantPropertyItem("显示设置", "右刻度", formInfo->m_vmax, QVariant::Double);
// _CreateVariantPropertyItem("显示设置", "左刻度", formInfo->m_vmin, QVariant::Double);
// _CreateVariantPropertyItem("显示设置", "右刻度", formInfo->m_vmax, QVariant::Double);
_CreateVariantPropertyItem("绘制方式", "绘制结构", formInfo->m_bDrawStruct_Tubing, QVariant::Bool);
_CreateVariantPropertyItem("绘制方式", "绘制管柱", formInfo->m_bDrawTubing_Tubing, QVariant::Bool);
_CreateVariantPropertyItem("绘制方式", "绘制工具", formInfo->m_bDrawTools_Tubing, QVariant::Bool);
_CreateVariantPropertyItem("绘制方式", "标注工具", formInfo->m_bDrawSPTool_Tubing, QVariant::Bool);
_CreateVariantPropertyItem("绘制方式", "绘制接箍", formInfo->m_bDrawCCL_Tubing, QVariant::Bool);
_CreateVariantPropertyItem("绘制方式", "油管外径", formInfo->m_Oguan_Tubing, QVariant::Double);
_CreateVariantPropertyItem("绘制方式", "套管内径", formInfo->m_inD_Tubing, QVariant::Double);
_CreateVariantPropertyItem("绘制方式", "套管外径", formInfo->m_OutD_Tubing, QVariant::Double);
}
//当前属性类型

47
logPlus/formdraw.cpp
View File

@ -1087,6 +1087,27 @@ void FormDraw::DisplayTubing_One(QJsonObject lineObjInfo)
}
}
//左刻度，右刻度
double newLeftScale = 0;//左刻度
double newRightScale = 500;//右刻度
//
if (lineObjInfo.contains("vmin"))
{
QJsonValue value = lineObjInfo.value("vmin");
if (value.isDouble()) {
newLeftScale = value.toDouble();
//qDebug() << "vmin:" << QString::number(newLeftScale);
}
}
if (lineObjInfo.contains("vmax"))
{
QJsonValue value = lineObjInfo.value("vmax");
if (value.isDouble()) {
newRightScale = value.toDouble();
//qDebug() << "vmax:" << QString::number(newRightScale);
}
}
QString folderPath = GetLogdataPath();
folderPath = folderPath + g_prjname;
strSlfName = folderPath + "/" + "#" + strWellName + "/" + strSlfName;
@ -1154,6 +1175,9 @@ void FormDraw::DisplayTubing_One(QJsonObject lineObjInfo)
listOtherProperty.append(QString::number(Oguan_Tubing));//油管外径
listOtherProperty.append(QString::number(inD_Tubing));//套管内径
listOtherProperty.append(QString::number(OutD_Tubing));//套管外径
//
listOtherProperty.append(QString::number(newLeftScale));//左刻度
listOtherProperty.append(QString::number(newRightScale));//右刻度
//套管組件
this->s_addTubingstring(m_strUuid, strSlfName, strWellName, m_strTrackName, strLineName, 0, listOtherProperty); //
}
@ -3979,7 +4003,9 @@ void FormDraw::s_addTubingstring(QString strUuid, QString strSlfName, QString st
//-------------------
int iMyWidth = curv->m_OutD_Tubing; //暂时按照套管外径 //curv->axisRect(0)->width();
if(listOtherProperty.size()>=14)
//
if(listOtherProperty.size()>=16)
{
//
if(listOtherProperty[6]=="DrawStruct")
@ -4032,13 +4058,19 @@ void FormDraw::s_addTubingstring(QString strUuid, QString strSlfName, QString st
curv->m_OutD_Tubing = listOtherProperty[13].toDouble();
//
iMyWidth = listOtherProperty[13].toDouble();
// m_LeftVal = listOtherProperty[14].toDouble();
// m_RightVal = listOtherProperty[15].toDouble();
//
// vmin = m_LeftVal;
// vmax = m_RightVal;
}
//
float vmin = 0;
float vmax = iMyWidth;
//
m_LeftVal = 0;
m_RightVal = iMyWidth;
float vmax = iMyWidth;
float vmin = 0;
//
curv->m_iX1 = vmin;
curv->m_iX2 = vmax;
curv->m_iY1 = m_iY1;
@ -4066,6 +4098,11 @@ void FormDraw::s_addTubingstring(QString strUuid, QString strSlfName, QString st
//套管组件
//QString strWaveName = "TUBTOOLS";
curv->LoadFromSLF_Tubing(strSlfName, strLineName);
// //先画图，再改变左右刻度
// curv->m_iX1 = m_LeftVal;
// curv->m_iX2 = m_RightVal;
// curv->yAxis->setRange(curv->m_iX1, curv->m_iX2);
// curv->replot();
//
connect(curv, SIGNAL(mouseWheel(QWheelEvent*)), this, SLOT(s_mouseWheel(QWheelEvent*)));

8
logPlus/forminfo.cpp
View File

@ -244,7 +244,9 @@ QJsonObject FormInfo::makeJson()
rootObj["Oguan"] = m_Oguan_Tubing;
rootObj["inD"] = m_inD_Tubing;
rootObj["OutD"] = m_OutD_Tubing;
//
rootObj["vmax"] = m_vmax;//右刻度
rootObj["vmin"] = m_vmin;//左刻度
//item属性写入slf文件，不需要此次记录
return rootObj;
}
@ -252,8 +254,8 @@ QJsonObject FormInfo::makeJson()
rootObj["Unit"] = m_strUnit;
rootObj["Width"] = m_dWidth;
rootObj["lineStyle"] = m_lineStyle;
rootObj["vmax"] = m_vmax;
rootObj["vmin"] = m_vmin;
rootObj["vmax"] = m_vmax;//右刻度
rootObj["vmin"] = m_vmin;//左刻度
rootObj["ScaleType"] = m_strScaleType;
rootObj["ShowScale"] = m_bShowScale;

2
logPlus/mainwindow.cpp
View File

@ -224,7 +224,7 @@ void MainWindow::initToolBar()
//add QAction to Widget.
ui->mainToolBar->addAction(m_newprojectAc);
ui->mainToolBar->addAction(m_openprojectAc);
ui->mainToolBar->addAction(m_saveprojectAc);
//ui->mainToolBar->addAction(m_saveprojectAc);
ui->mainToolBar->addSeparator();//添加分隔符
//
ui->mainToolBar->addAction(m_wellogAc);

2
logPlus/mainwindowcurve.cpp
View File

@ -419,7 +419,7 @@ void MainWindowCurve::initToolBar()
ui->toolBar->addAction(m_logfaceAc);
ui->toolBar->addAction(m_TubingstringAc);
ui->toolBar->addAction(m_TDTAc);
ui->toolBar->addAction(m_LogMudAc);
//ui->toolBar->addAction(m_LogMudAc);
connect(m_blankTrackAc, &QAction::triggered, this, &MainWindowCurve::s_NewTrack);
connect(m_depthAc, &QAction::triggered, this, &MainWindowCurve::s_NewDepth);//深度

65
logPlus/qmycustomplot.cpp
View File

@ -6468,23 +6468,41 @@ void QMyCustomPlot::DrawStruct()
//绘制套管
float upper = this->xAxis->range().upper;
float lower = this->xAxis->range().lower;
double lY1 = this->yAxis->range().lower;
double lY2 = this->yAxis->range().upper;
// double lY1 = 0;//this->yAxis->range().lower;
// double lY2 = m_OutD_Tubing;//this->yAxis->range().upper - this->yAxis->range().lower; //this->yAxis->range().upper;
// 创建矩形
mRect_Tubing = new QCPItemRect(this);
mRect_Tubing->setLayer("overlay"); // 确保在最上层
mRect_Tubing->setBrush(QBrush(QColor(0, 0, 0, 255)));
mRect_Tubing->setPen(QPen(QColor(0, 0, 0, 255)));
mRect_Tubing->topLeft->setCoords(lower, lY1 + (lY2-lY1-m_OutD_Tubing)/2.0);
mRect_Tubing->bottomRight->setCoords(upper, lY1 + (lY2-lY1-m_inD_Tubing)/2.0);
//
double lyTmp = 0; //lY1 + (lY2-lY1-m_OutD_Tubing)/2.0;
if(lyTmp<0)
{
lyTmp=0;
}
mRect_Tubing->topLeft->setCoords(lower, lyTmp);
//
double lyTmp2 = (m_OutD_Tubing-m_inD_Tubing)/2.0; //lY1 + (lY2-lY1-m_inD_Tubing)/2.0;
if(lyTmp2<0)
{
lyTmp2=0;
}
mRect_Tubing->bottomRight->setCoords(upper, lyTmp2);
// 创建矩形
mRect2_Tubing = new QCPItemRect(this);
mRect2_Tubing->setLayer("overlay"); // 确保在最上层
mRect2_Tubing->setBrush(QBrush(QColor(0, 0, 0, 255)));
mRect2_Tubing->setPen(QPen(QColor(0, 0, 0, 255)));
mRect2_Tubing->topLeft->setCoords(lower, lY2 - (lY2-lY1-m_OutD_Tubing)/2.0);
mRect2_Tubing->bottomRight->setCoords(upper, lY2 - (lY2-lY1-m_inD_Tubing)/2.0);
lyTmp = m_OutD_Tubing/2.0 + m_inD_Tubing/2.0; //lY2 - (lY2-lY1-m_OutD_Tubing)/2.0
mRect2_Tubing->topLeft->setCoords(lower, lyTmp);
//
lyTmp2 = m_OutD_Tubing; //lY2 - (lY2-lY1-m_inD_Tubing)/2.0;
mRect2_Tubing->bottomRight->setCoords(upper, lyTmp2);
//
}
}
@ -6501,8 +6519,8 @@ void QMyCustomPlot::DrawTubing()
{
QString shotimgfile=GetSymbolDir()+"\\管柱组件\\管柱.png";
double lY1 = this->yAxis->range().lower;//+10
double lY2 = this->yAxis->range().upper;
double lY1 = 0;//this->yAxis->range().lower;//+10
double lY2 = m_OutD_Tubing;//this->yAxis->range().upper - this->yAxis->range().lower; //this->yAxis->range().upper;
//
mPixmap_Tubing = new QCPItemPixmap(this);
@ -6517,7 +6535,7 @@ void QMyCustomPlot::DrawTubing()
}
}
//改变沉积相属性，是否显示
//改变套管组件属性，是否显示
void QMyCustomPlot::s_changeGuanShow(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString propertyData, bool bShow)
{
if(m_strUuid == strUuid &&
@ -6621,7 +6639,7 @@ void QMyCustomPlot::s_changeGuanShow(QString strUuid, QString strSlfName, QStrin
//不清空属性窗口
}
//改变沉积相属性，是否显示
//改变套管组件属性，是否显示
void QMyCustomPlot::s_changeGuanD(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString propertyData, double newD)
{
if(m_strUuid == strUuid &&
@ -6698,6 +6716,33 @@ void QMyCustomPlot::s_changeGuanD(QString strUuid, QString strSlfName, QString s
m_OutD_Tubing = newD;
//绘制结构
DrawStruct();
//先画图，再改变左右刻度
this->m_iX1 = 0;
this->m_iX2 = m_OutD_Tubing;
this->yAxis->setRange(this->m_iX1, this->m_iX2);
//绘制管柱
DrawTubing();
//绘制工具
TransparentDraggableGuan *pDraggableRect =NULL;
QMap<QString,QObject *>::Iterator it = m_mapDraggable_Guan.begin();
while( it != m_mapDraggable_Guan.end() )
{
pDraggableRect = (TransparentDraggableGuan*)it.value();
it++;
//刷新
QCPRange tmpRange = pDraggableRect->getRange();
// if(m_bDrawCCL_Tubing)
// {
// pDraggableRect->mIn = m_inD_Tubing+1;
// }
// else
// {
// pDraggableRect->mIn = m_Oguan_Tubing+1;
// }
pDraggableRect->setRange(tmpRange.lower, tmpRange.upper, false);
}
//刷新
replot();
}

4
logPlus/transparentdraggableGuan.cpp
View File

@ -194,8 +194,8 @@ void TransparentDraggableGuan::setRange(double left_Low, double right_Hight, boo
//套管组件高度
mH = right_Hight-left_Low;
double lY1 = mPlot->yAxis->range().lower;//+10
double lY2 = mPlot->yAxis->range().upper;
double lY1 = 0;//mPlot->yAxis->range().lower;//+10
double lY2 = mPlot->m_OutD_Tubing;//mPlot->yAxis->range().upper - mPlot->yAxis->range().lower; //mPlot->yAxis->range().upper;
mRect->topLeft->setCoords(left_Low, lY1 + (lY2-lY1-mIn)/2.0);
mRect->bottomRight->setCoords(right_Hight, lY2 - (lY2-lY1-mIn)/2.0);