diff --git a/logPlus/PropertyWidget.cpp b/logPlus/PropertyWidget.cpp index e9ddff1..9d9c1dd 100644 --- a/logPlus/PropertyWidget.cpp +++ b/logPlus/PropertyWidget.cpp @@ -2889,6 +2889,21 @@ void PropertyWidget::initCurveProperty(FormInfo *formInfo, QStringList strListOt _CreateVariantPropertyItem("显示设置", "单比例连续折返", formInfo->m_bConBackAndForth, QVariant::Bool); + _CreateVariantPropertyItem("曲线第二比例", "线宽", formInfo->m_twoBLWidth, QVariant::Int); + _CreateVariantPropertyItem("曲线第二比例", "颜色", formInfo->m_twoBLlineColor, QVariant::Color); + _CreateEnumPropertyItem("曲线第二比例", "线型", (int)formInfo->m_twoBLlineStyle, listStyle); + _CreateVariantPropertyItem("曲线第二比例", "第二比例大小", formInfo->m_twoBLSize, QVariant::Int); + _CreateVariantPropertyItem("曲线第二比例", "自动计算二比例", formInfo->m_twoBLAuto, QVariant::Bool); + _CreateVariantPropertyItem("曲线第二比例", "绘制左二比例", formInfo->m_twoBLDrawLeft, QVariant::Bool); + _CreateVariantPropertyItem("曲线第二比例", "左二比例连续折返", formInfo->m_twoBLLeftConBackAndForth, QVariant::Bool); + _CreateVariantPropertyItem("曲线第二比例", "左二比例左刻度", formInfo->m_twoBLLeftLeft, QVariant::String); + _CreateVariantPropertyItem("曲线第二比例", "左二比例右刻度", formInfo->m_twoBLLeftRight, QVariant::String); + _CreateVariantPropertyItem("曲线第二比例", "绘制右二比例", formInfo->m_twoBLDrawRight, QVariant::Bool); + _CreateVariantPropertyItem("曲线第二比例", "右二比例连续折返", formInfo->m_twoBLRightConBackAndForth, QVariant::Bool); + _CreateVariantPropertyItem("曲线第二比例", "右二比例左刻度", formInfo->m_twoBLRightLeft, QVariant::String); + _CreateVariantPropertyItem("曲线第二比例", "右二比例右刻度", formInfo->m_twoBLRightRight, QVariant::String); + + //绘制方式 _CreateVariantPropertyItem("绘制方式", "曲线", formInfo->m_bDrawLine, QVariant::Bool); _CreateVariantPropertyItem("绘制方式", "绘制对称曲线", formInfo->m_bDrawSymmetry, QVariant::Bool); diff --git a/logPlus/forminfo.h b/logPlus/forminfo.h index 4d55e5b..26c1abf 100644 --- a/logPlus/forminfo.h +++ b/logPlus/forminfo.h @@ -116,6 +116,21 @@ public: bool m_bConBackAndForth = false; // 单比例连续折返 + // 曲线第二比例 + int m_twoBLWidth = 3; // 线宽 + QColor m_twoBLlineColor; // 颜色 + Qt::PenStyle m_twoBLlineStyle= Qt::SolidLine; // 线形 + int m_twoBLSize = 0; // 第二比例大小 + bool m_twoBLAuto = true; // 自动计算二比例 + bool m_twoBLDrawLeft = true; // 绘制左二比例 + bool m_twoBLLeftConBackAndForth = true; // 左二比例连续折返 + QString m_twoBLLeftLeft = ""; // 左二比例左刻度 + QString m_twoBLLeftRight = ""; // 左二比例右刻度 + bool m_twoBLDrawRight = false; // 绘制右二比例 + bool m_twoBLRightConBackAndForth = false; // 右二比例连续折返 + QString m_twoBLRightLeft = ""; // 右二比例左刻度 + QString m_twoBLRightRight = ""; // 右二比例右刻度 + //绘制方式 bool m_bDrawLine = true; // 曲线 bool m_bDrawGan = false; // 杆状