From 8437f5d7c4cf7a70d43ba727ab0f9e6fd2b1a5eb Mon Sep 17 00:00:00 2001 From: jiayulong Date: Fri, 19 Dec 2025 16:59:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9B=B2=E7=BA=BF=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E9=BB=98=E8=AE=A4=E5=80=BC=EF=BC=8C=E5=B2=A9=E6=80=A7?= =?UTF-8?q?=E5=A1=AB=E5=85=85=E9=BB=98=E8=AE=A4=E5=9B=BE=E7=89=87=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logPlus/PropertyWidget.cpp | 10 ++++++++-- logPlus/qmycustomplot.cpp | 2 +- logPlus/qmycustomplot.h | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/logPlus/PropertyWidget.cpp b/logPlus/PropertyWidget.cpp index ce10965..d0df588 100644 --- a/logPlus/PropertyWidget.cpp +++ b/logPlus/PropertyWidget.cpp @@ -5,6 +5,7 @@ #include #include #include "CallManage.h" +#include "geometryutils.h" extern int g_iScale; extern double g_dPixelPerCm;//每厘米像素数 @@ -855,8 +856,13 @@ void PropertyWidget::initCurveProperty(FormInfo *formInfo, QStringList strListOt _CreateEnumPropertyItem("岩性填充", "填充类型", listFillType.indexOf(formInfo->m_newFillType), listFillType); _CreateEnumPropertyItem("岩性填充", "填充模式", listFillMode.indexOf(formInfo->m_newFillMode), listFillMode); _CreateVariantPropertyItem("岩性填充", "填充颜色", formInfo->m_newColor, QVariant::Color); - _CreateVariantPropertyItem("岩性填充", "填充岩性", formInfo->m_newLithosImage, VariantManager::filePathTypeId()); //"./image/胜利符号库/岩性符号/砂岩.png" - + if(formInfo->m_newLithosImage=="") + { + _CreateVariantPropertyItem("岩性填充", "填充岩性", ::GetLithSymbolDir(), VariantManager::filePathTypeId()); + } + else { + _CreateVariantPropertyItem("岩性填充", "填充岩性", formInfo->m_newLithosImage, VariantManager::filePathTypeId()); //"./image/胜利符号库/岩性符号/砂岩.png" + } _CreateVariantPropertyItem("岩性填充", "岩性前景色", formInfo->m_frontColor, QVariant::Color); _CreateVariantPropertyItem("岩性填充", "岩性背景色", formInfo->m_backColor, QVariant::Color); } diff --git a/logPlus/qmycustomplot.cpp b/logPlus/qmycustomplot.cpp index c04cc16..ea8b016 100644 --- a/logPlus/qmycustomplot.cpp +++ b/logPlus/qmycustomplot.cpp @@ -1112,7 +1112,7 @@ void QMyCustomPlot::s_ChangeFillMode(QString strUuid, QString strSlfName, QStrin void QMyCustomPlot::addRandomGraph(QVector x, QVector y, QString strSlfName, QString strLineName, QString strAliasName, QString strUnit, - double newLeftScale, double newRightScale, QString strScaleType, QColor newlineColor, double width, Qt::PenStyle lineStyle) + double newLeftScale, double newRightScale, QString strScaleType, QColor &newlineColor, double width, Qt::PenStyle lineStyle) { //AppendConsole(PAI_INFO, "FormDraw addRandomGraph"); diff --git a/logPlus/qmycustomplot.h b/logPlus/qmycustomplot.h index 8ce45a8..247d041 100644 --- a/logPlus/qmycustomplot.h +++ b/logPlus/qmycustomplot.h @@ -70,7 +70,7 @@ public: void init(QString strName, QVector x, QVector y); void addImageToPlot(double left_Low, double right_Hight, const QString imagePath); void addRandomGraph(QVector x, QVector y, QString strSlfName, QString strLineName, QString strAliasName, QString strUnit, - double newLeftScale, double newRightScale, QString strScaleType, QColor newlineColor, double width, Qt::PenStyle lineStyle); + double newLeftScale, double newRightScale, QString strScaleType, QColor &newlineColor, double width, Qt::PenStyle lineStyle); void addTextToPlot(double left_Low, double right_Hight, const QString strText);