From c422a3d87a773e9d694208ea42745e8bf80f8917 Mon Sep 17 00:00:00 2001
From: "DESKTOP-450PEFP\\mainc" <mainchar@163.com>
Date: Fri, 6 Feb 2026 11:55:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A2=E5=88=97=E5=B1=9E=E6=80=A7=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98Json=E6=96=87=E4=BB=B6=EF=BC=8C=E8=AF=BB?=
 =?UTF-8?q?=E5=8F=96json=E5=9B=9E=E6=98=BE=E6=95=88=E6=9E=9C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logPlus/formdraw.cpp      | 12 +++++++++++-
 logPlus/forminfo.cpp      | 14 ++++++++++++++
 logPlus/qmycustomplot.cpp |  2 +-
 logPlus/qmycustomplot.h   |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp
index f55794b..fd5230d 100644
--- a/logPlus/formdraw.cpp
+++ b/logPlus/formdraw.cpp
@@ -152,6 +152,16 @@ void FormDraw::setDrawData(QStringList listdt, QJsonObject objInfo)
 		curv->m_nMode = pInfo->getFillTypeIndex();
 		//curv->m_fmin = pInfo->getVMin();
 		//curv->m_fmax = pInfo->getVMax();
+		curv->m_nDrawType = pInfo->m_nDrawType;
+		curv->m_bDrawDepth = pInfo->m_bDrawDepth;	// 绘制波深度
+		curv->m_bDrawBase = pInfo->m_bDrawBase;		// 绘制波深度
+		curv->m_bOddEven = pInfo->m_bOddEven;		// 绘制波深度
+
+		curv->m_MaxRange = pInfo->m_fMaxAmp;		// 最大振幅
+		curv->m_Base = pInfo->m_fWaveBase;			// 波列基值
+		curv->m_nWaveJg = pInfo->m_nWaveJg;			// 波形间隔
+		curv->m_nWaveHei = pInfo->m_fWaveHei;		// 波形高度
+
 		curv->m_nColorNum = pInfo->m_nColorNum;
 		curv->m_nSchemeIndex = pInfo->m_nSchemeIndex;
 		curv->m_fScaleV = pInfo->getVMax();
@@ -164,7 +174,7 @@ void FormDraw::setDrawData(QStringList listdt, QJsonObject objInfo)
 		else
 		{
 			//curv->initWave2(m_strSlfName, strLineName);
-			curv->initWave(m_strSlfName, strLineName);
+			curv->changePropertyWaveUpdate();
 		}
 	}
     // 深度
diff --git a/logPlus/forminfo.cpp b/logPlus/forminfo.cpp
index c819582..4a9d3ea 100644
--- a/logPlus/forminfo.cpp
+++ b/logPlus/forminfo.cpp
@@ -88,6 +88,13 @@ void FormInfo::initProperty(QJsonObject obj)
 		m_fMaxAmp = obj.value("MaxAmp").toDouble();
 		m_nSchemeIndex = obj.value("SchemeIndex").toInt();
 		m_nColorNum = obj.value("ColorNum").toInt();
+
+		m_bDrawDepth = obj.value("DrawDepth").toBool();
+		m_bDrawBase = obj.value("DrawBase").toBool();
+		m_bOddEven = obj.value("OddEven").toBool();
+
+		m_nWaveJg = obj.value("WaveJg").toInt();
+		m_fWaveHei = obj.value("WaveHei").toDouble();
 	}
 }
 
@@ -141,6 +148,13 @@ QJsonObject FormInfo::makeJson()
 		rootObj["FillType"] = m_nFillType;
 		rootObj["Amp"] = m_strAmp;
 		rootObj["MaxAmp"] = m_fMaxAmp;
+
+		rootObj["DrawDepth"] = m_bDrawDepth;	// 绘制波深度
+		rootObj["DrawBase"] = m_bDrawBase;		// 绘制波基线
+		rootObj["OddEven"] = m_bOddEven;		// 奇偶配色
+
+		rootObj["WaveJg"] = m_nWaveJg;			// 波形间隔
+		rootObj["WaveHei"] = m_fWaveHei;		// 波形高度
 		
 		rootObj["SchemeIndex"] = m_nSchemeIndex;
 		rootObj["ColorNum"] = m_nColorNum;
diff --git a/logPlus/qmycustomplot.cpp b/logPlus/qmycustomplot.cpp
index 6367410..46b8c12 100644
--- a/logPlus/qmycustomplot.cpp
+++ b/logPlus/qmycustomplot.cpp
@@ -114,7 +114,7 @@ void QMyCustomPlot::changePropertyWaveUpdate()
 		clearGraphs();
 		clearItems();
 
-		if (this->m_bX2Y)
+		if (this->m_colorMap)
 		{
 			QCPAxis *yAxis = this->yAxis;
 			QCPAxis *xAxis = this->xAxis;
diff --git a/logPlus/qmycustomplot.h b/logPlus/qmycustomplot.h
index 8458f38..696dad4 100644
--- a/logPlus/qmycustomplot.h
+++ b/logPlus/qmycustomplot.h
@@ -91,7 +91,7 @@ public:
 	bool m_bDrawDepth = false;		// 绘制波深度
 	bool m_bDrawBase = false;		// 绘制波基线
 	bool m_bOddEven = false;		// 奇偶配色
-	float m_Base = 0.0f;
+	float m_Base = 0.0f;			// 波列基值
 	float m_MaxRange = 1023.0f;
 	int m_nWaveJg = 100;
 	int m_nWaveHei = 1;