diff --git a/logPlus/PropertyWidget.cpp b/logPlus/PropertyWidget.cpp index 66014e0..a75da4c 100644 --- a/logPlus/PropertyWidget.cpp +++ b/logPlus/PropertyWidget.cpp @@ -1253,6 +1253,12 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant //先处理通用属性 CommonPropertyChanged(pProperty, variant); } + else if (m_strCurrentProperty == Depth_Property) // 深度 + { + //先处理通用属性 + CommonPropertyChanged(pProperty, variant); + changedDepthProperty(pProperty, variant); + } if("深度比例尺" == m_propertyData[pProperty]) { @@ -2372,12 +2378,35 @@ void PropertyWidget::initTableProperty(FormInfo *formInfo) void PropertyWidget::initDepthProperty(FormInfo *formInfo) { - // _CreateVariantPropertyItem("通常", "显示名称", formInfo->m_strAliasName, QVariant::String); - // + _CreateVariantPropertyItem("通常", "头部高度(cm)", formInfo->m_nJg, QVariant::String); + _CreateVariantPropertyItem("通常", "垂向绘制", formInfo->m_nJg, QVariant::String); + _CreateVariantPropertyItem("通常", "旋转角度(°)", formInfo->m_nJg, QVariant::String); + _CreateVariantPropertyItem("通常", "显示单位", formInfo->m_nJg, QVariant::String); + _CreateVariantPropertyItem("通常", "标尺颜色", formInfo->m_nJg, QVariant::String); + + _CreateVariantPropertyItem("字体", "名称", formInfo->m_nJg, QVariant::String); + _CreateVariantPropertyItem("字体", "单位", formInfo->m_nJg, QVariant::String); + _CreateVariantPropertyItem("深度标注", "间隔", formInfo->m_nJg, QVariant::String); + _CreateVariantPropertyItem("深度标注", "字体", formInfo->m_strAliasName, QVariant::String); + _CreateVariantPropertyItem("深度标注", "旋转", formInfo->m_nJg, QVariant::String); + _CreateVariantPropertyItem("深度标注", "绘制起点深度", formInfo->m_nJg, QVariant::String); + _CreateVariantPropertyItem("深度标注", "绘制终点深度", formInfo->m_nJg, QVariant::String); + _CreateVariantPropertyItem("深度标注", "斜深", formInfo->m_nJg, QVariant::String); + _CreateVariantPropertyItem("深度标注", "海拔垂深", formInfo->m_nJg, QVariant::String); + _CreateVariantPropertyItem("深度标注", "垂深", formInfo->m_strAliasName, QVariant::String); + _CreateVariantPropertyItem("深度标注", "斜深位置", formInfo->m_nJg, QVariant::String); + _CreateVariantPropertyItem("深度标注", "垂深位置", formInfo->m_nJg, QVariant::String); + _CreateVariantPropertyItem("深度标注", "海拔垂深位置", formInfo->m_nJg, QVariant::String); + _CreateVariantPropertyItem("主刻度线", "长度", formInfo->m_nJg, QVariant::String); + _CreateVariantPropertyItem("主刻度线", "宽度", formInfo->m_nJg, QVariant::String); + _CreateVariantPropertyItem("次刻度线", "长度", formInfo->m_nJg, QVariant::String); + _CreateVariantPropertyItem("次刻度线", "宽度", formInfo->m_nJg, QVariant::String); + + m_strCurrentProperty = Depth_Property; } void PropertyWidget::initProperty(FormInfo *formInfo) @@ -3187,3 +3216,8 @@ void PropertyWidget::initTubingProperty(FormInfo *formInfo) m_strCurrentProperty = Tubing_Property; } + +void PropertyWidget::changedDepthProperty(QtProperty *pProperty, const QVariant &variant) +{ + +} diff --git a/logPlus/PropertyWidget.h b/logPlus/PropertyWidget.h index f9bf87e..7360ee9 100644 --- a/logPlus/PropertyWidget.h +++ b/logPlus/PropertyWidget.h @@ -47,6 +47,8 @@ #define Image_Property "Image_Property" // 岩心图片 #define ImageItem_Property "ImageItem_Property" // 岩心图片item +#define Depth_Property "Depth_Property" // 深度 + #define SwallCore_Property "SwallCore_Property" //井壁取心 #define SwallCoreItem_Property "SwallCoreItem_Property" //井壁取心item @@ -165,7 +167,7 @@ public: void initHeadProperty(FormHead *formHead, QTableWidget *tableWidget, QTableWidgetItem* item, int row, int col); void initTableProperty(FormInfo *formInfo); - + // 深度 void initDepthProperty(FormInfo *formInfo); void initProperty(FormInfo *formInfo); @@ -221,9 +223,13 @@ public: //处理通用属性 void CommonPropertyChanged(QtProperty *pProperty, const QVariant &variant); + // 岩心照片 void changedYxzpProperty(QtProperty *pProperty, const QVariant &variant); void changedYxzpItemProperty(QtProperty *pProperty, const QVariant &variant); + // 深度 + void changedDepthProperty(QtProperty *pProperty, const QVariant &variant); + public slots: void SlotPropertyChanged(QtProperty *property, const QVariant &variant); void SlotPropertyChanged(QtProperty *property, const int &val, bool islinestyle);