diff --git a/logPlus/PropertyWidget.cpp b/logPlus/PropertyWidget.cpp
index 3ffe682..538d423 100644
--- a/logPlus/PropertyWidget.cpp
+++ b/logPlus/PropertyWidget.cpp
@@ -128,7 +128,7 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant
 		bool bDraw = false;
 		QStringList slist;
 		slist << "显示名称" << "显示单位" << "曲线名称" << "曲线单位" << "曲线刻度"
-			<< "方式" << "左刻度" << "右刻度" << "幅度刻度" << "最大振幅" << "显示刻度" << "色板" << "变密度颜色级数";
+			<< "类型" << "方式" << "左刻度" << "右刻度" << "幅度刻度" << "最大振幅" << "显示刻度" << "色板" << "变密度颜色级数";
 		for (int i = 0; i < slist.length(); i++)
 		{
 			if (slist.at(i) == m_propertyData[pProperty])
@@ -1185,13 +1185,13 @@ void PropertyWidget::initWaveProperty(FormInfo *formInfo)
 	drawType.append("自选阵列");
 	drawType.append("三维图像");
 	drawType.append("多臂井径");
-	_CreateEnumPropertyItem("绘图类型", "类型", drawType.indexOf(formInfo->m_strDrawType), drawType);
+	_CreateEnumPropertyItem("绘图类型", "类型", formInfo->m_nDrawType, drawType);
 
 	QStringList fillType;
 	fillType.append("全周");
 	fillType.append("正半周");
 	fillType.append("负半周");
-	_CreateEnumPropertyItem("填充方式", "方式", formInfo->m_strFillType.toInt(), fillType);
+	_CreateEnumPropertyItem("填充方式", "方式", formInfo->m_nFillType, fillType);
 
 	//_CreateVariantPropertyItem("波形绘制参数", "自动平滑", true, QVariant::Bool);
 	_CreateVariantPropertyItem("波形绘制参数", "左刻度", formInfo->m_vmin, QVariant::Double);