Merge branch 'main' of http://git.hivekion.com:3000/jiayulong/logplus
This commit is contained in:
commit
e510af2405
|
|
@ -644,7 +644,7 @@ QCPColorMap * QMyCustomPlot::updateWave()
|
||||||
int ny = m_nSamples;
|
int ny = m_nSamples;
|
||||||
|
|
||||||
m_colorMap->data()->setSize(nx, ny); // 我们希望彩色地图有nx*ny的数据点
|
m_colorMap->data()->setSize(nx, ny); // 我们希望彩色地图有nx*ny的数据点
|
||||||
float f = 264 / 269.0f;
|
float f = 0.99;// 264 / 269.0f;
|
||||||
m_colorMap->data()->setRange(QCPRange(0 - m_EDep, 0 - m_SDep), QCPRange(this->m_iX1, this->m_iX2*f));
|
m_colorMap->data()->setRange(QCPRange(0 - m_EDep, 0 - m_SDep), QCPRange(this->m_iX1, this->m_iX2*f));
|
||||||
|
|
||||||
for (int xIndex = 0; xIndex < nx; ++xIndex)
|
for (int xIndex = 0; xIndex < nx; ++xIndex)
|
||||||
|
|
@ -5125,7 +5125,12 @@ void QMyCustomPlot::s_changeDrawProperty(QVariantList vlist)
|
||||||
}
|
}
|
||||||
else if ("左刻度" == strProperty)
|
else if ("左刻度" == strProperty)
|
||||||
{
|
{
|
||||||
|
if (m_colorMap)
|
||||||
|
{
|
||||||
|
m_iX1 = varVal.toFloat();
|
||||||
|
float f = 264 / m_fScaleV;
|
||||||
|
m_colorMap->data()->setValueRange(QCPRange(m_iX1, m_iX2*f));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if ("右刻度" == strProperty)
|
else if ("右刻度" == strProperty)
|
||||||
{
|
{
|
||||||
|
|
@ -5133,7 +5138,7 @@ void QMyCustomPlot::s_changeDrawProperty(QVariantList vlist)
|
||||||
{
|
{
|
||||||
m_fScaleV = varVal.toFloat();
|
m_fScaleV = varVal.toFloat();
|
||||||
float f = 264 / m_fScaleV;
|
float f = 264 / m_fScaleV;
|
||||||
m_colorMap->data()->setValueRange(QCPRange(m_fmin, m_fmax*f));
|
m_colorMap->data()->setValueRange(QCPRange(m_iX1, m_iX2*f));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ("最大振幅" == strProperty)
|
else if ("最大振幅" == strProperty)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user