diff --git a/logPlus/PropertyWidget.cpp b/logPlus/PropertyWidget.cpp index 4999894..3663296 100644 --- a/logPlus/PropertyWidget.cpp +++ b/logPlus/PropertyWidget.cpp @@ -2282,7 +2282,11 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant m_item->setFont(newFont); } } - + else if(m_strCurrentProperty == PL_OBJECT_PROPERTY) // 频率统计图 + { + CommonPropertyChanged(pProperty, variant); + changedPlObjectProperty(m_propertyData[pProperty], variant); + } @@ -4106,9 +4110,14 @@ void PropertyWidget::initPlObjectProperty(FormInfo *formInfo) _CreateVariantPropertyItem("分类", "自定义2", formInfo->m_strAliasName, QVariant::String); } -void PropertyWidget::changedPlObjectProperty(QString strProName, QVariant val) +void PropertyWidget::changedPlObjectProperty(QString strProperty, QVariant varVal) { - + if ("名称" == strProperty) + { + QFont newFont = varVal.value(); + m_formInfo->m_curveNameFont = newFont; + this->m_formInfo->repaint(); + } } void PropertyWidget::changedDepthProperty(QString strProperty, QVariant varVal) diff --git a/logPlus/PropertyWidget.h b/logPlus/PropertyWidget.h index c77f357..d18ee43 100644 --- a/logPlus/PropertyWidget.h +++ b/logPlus/PropertyWidget.h @@ -52,7 +52,7 @@ #define CORE_PHYSICS_ITEM_PROPERTY "CORE_PHYSICS_ITEM_PROPERTY" // 岩心分析item #define Depth_Property "Depth_Property" // 深度 -#define PL_OBJECT_PROPERTY "PL_OBJECT_PROPERTY" // 深度 +#define PL_OBJECT_PROPERTY "PL_OBJECT_PROPERTY" // 频率统计图 #define SwallCore_Property "SwallCore_Property" //井壁取心 #define SwallCoreItem_Property "SwallCoreItem_Property" //井壁取心item diff --git a/logPlus/YxzpDialog.cpp b/logPlus/YxzpDialog.cpp index 9909dd6..cf2ab9f 100644 --- a/logPlus/YxzpDialog.cpp +++ b/logPlus/YxzpDialog.cpp @@ -1,4 +1,4 @@ -#include "YxzpDialog.h" +#include "YxzpDialog.h" YxzpDialog::YxzpDialog(QWidget *parent) : QDialog(parent) diff --git a/logPlus/YxzpDialog.h b/logPlus/YxzpDialog.h index 6402322..841e761 100644 --- a/logPlus/YxzpDialog.h +++ b/logPlus/YxzpDialog.h @@ -1,4 +1,4 @@ -#ifndef YXZPDIALOG_H +#ifndef YXZPDIALOG_H #define YXZPDIALOG_H // 岩心照片 自定义 dialog #include @@ -8,10 +8,10 @@ #include #include #include - - #include +#pragma execution_character_set("utf-8") + class YxzpDialog : public QDialog { Q_OBJECT