jiayulong/logplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

波列属性，保存Json文件，读取json回显效果。

Browse Source
This commit is contained in:
DESKTOP-450PEFP\mainc 2026-02-06 11:55:29 +08:00
parent 24af1f53a7
commit c422a3d87a
4 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
logPlus/formdraw.cpp
View File

@ -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();
}
}
// 深度

14
logPlus/forminfo.cpp
View File

@ -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;

2
logPlus/qmycustomplot.cpp
View File

@ -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;

2
logPlus/qmycustomplot.h
View File

@ -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;