VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 01:39:05 -05:00
Code Issues Projects Releases Wiki Activity

ScopeVisNG: more memory traces

Browse Source
This commit is contained in:
f4exb 2018-05-21 18:00:10 +02:00
parent 25e1439dcd
commit 35c4d5a325
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sdrgui/dsp/scopevisng.cpp
View File

@ -546,8 +546,6 @@ void ScopeVisNG::stop()
bool ScopeVisNG::handleMessage(const Message& message) bool ScopeVisNG::handleMessage(const Message& message)
{ {
qDebug() << "ScopeVisNG::handleMessage" << message.getIdentifier();
if (DSPSignalNotification::match(message)) if (DSPSignalNotification::match(message))
{ {
DSPSignalNotification& notif = (DSPSignalNotification&) message; DSPSignalNotification& notif = (DSPSignalNotification&) message;
@ -624,6 +622,7 @@ bool ScopeVisNG::handleMessage(const Message& message)
} }
else if (MsgScopeVisNGAddTrigger::match(message)) else if (MsgScopeVisNGAddTrigger::match(message))
{ {
qDebug() << "ScopeVisNG::handleMessage: MsgScopeVisNGAddTrigger";
QMutexLocker configLocker(&m_mutex); QMutexLocker configLocker(&m_mutex);
MsgScopeVisNGAddTrigger& conf = (MsgScopeVisNGAddTrigger&) message; MsgScopeVisNGAddTrigger& conf = (MsgScopeVisNGAddTrigger&) message;
m_triggerConditions.push_back(new TriggerCondition(conf.getTriggerData())); m_triggerConditions.push_back(new TriggerCondition(conf.getTriggerData()));
@ -635,6 +634,7 @@ bool ScopeVisNG::handleMessage(const Message& message)
QMutexLocker configLocker(&m_mutex); QMutexLocker configLocker(&m_mutex);
MsgScopeVisNGChangeTrigger& conf = (MsgScopeVisNGChangeTrigger&) message; MsgScopeVisNGChangeTrigger& conf = (MsgScopeVisNGChangeTrigger&) message;
uint32_t triggerIndex = conf.getTriggerIndex(); uint32_t triggerIndex = conf.getTriggerIndex();
qDebug() << "ScopeVisNG::handleMessage: MsgScopeVisNGChangeTrigger: " << triggerIndex;
if (triggerIndex < m_triggerConditions.size()) if (triggerIndex < m_triggerConditions.size())
{ {
@ -655,6 +655,7 @@ bool ScopeVisNG::handleMessage(const Message& message)
QMutexLocker configLocker(&m_mutex); QMutexLocker configLocker(&m_mutex);
MsgScopeVisNGRemoveTrigger& conf = (MsgScopeVisNGRemoveTrigger&) message; MsgScopeVisNGRemoveTrigger& conf = (MsgScopeVisNGRemoveTrigger&) message;
uint32_t triggerIndex = conf.getTriggerIndex(); uint32_t triggerIndex = conf.getTriggerIndex();
qDebug() << "ScopeVisNG::handleMessage: MsgScopeVisNGRemoveTrigger: " << triggerIndex;
if (triggerIndex < m_triggerConditions.size()) if (triggerIndex < m_triggerConditions.size())
{ {
@ -670,6 +671,7 @@ bool ScopeVisNG::handleMessage(const Message& message)
QMutexLocker configLocker(&m_mutex); QMutexLocker configLocker(&m_mutex);
MsgScopeVisNGMoveTrigger& conf = (MsgScopeVisNGMoveTrigger&) message; MsgScopeVisNGMoveTrigger& conf = (MsgScopeVisNGMoveTrigger&) message;
int triggerIndex = conf.getTriggerIndex(); int triggerIndex = conf.getTriggerIndex();
qDebug() << "ScopeVisNG::handleMessage: MsgScopeVisNGMoveTrigger: " << triggerIndex;
if (!conf.getMoveUp() && (triggerIndex == 0)) { if (!conf.getMoveUp() && (triggerIndex == 0)) {
return true; return true;
@ -691,6 +693,7 @@ bool ScopeVisNG::handleMessage(const Message& message)
{ {
MsgScopeVisNGFocusOnTrigger& conf = (MsgScopeVisNGFocusOnTrigger&) message; MsgScopeVisNGFocusOnTrigger& conf = (MsgScopeVisNGFocusOnTrigger&) message;
uint32_t triggerIndex = conf.getTriggerIndex(); uint32_t triggerIndex = conf.getTriggerIndex();
qDebug() << "ScopeVisNG::handleMessage: MsgScopeVisNGFocusOnTrigger: " << triggerIndex;
if (triggerIndex < m_triggerConditions.size()) if (triggerIndex < m_triggerConditions.size())
{ {
@ -704,6 +707,7 @@ bool ScopeVisNG::handleMessage(const Message& message)
} }
else if (MsgScopeVisNGAddTrace::match(message)) else if (MsgScopeVisNGAddTrace::match(message))
{ {
qDebug() << "ScopeVisNG::handleMessage: MsgScopeVisNGAddTrace";
QMutexLocker configLocker(&m_mutex); QMutexLocker configLocker(&m_mutex);
MsgScopeVisNGAddTrace& conf = (MsgScopeVisNGAddTrace&) message; MsgScopeVisNGAddTrace& conf = (MsgScopeVisNGAddTrace&) message;
m_traces.addTrace(conf.getTraceData(), m_traceSize); m_traces.addTrace(conf.getTraceData(), m_traceSize);
@ -718,7 +722,9 @@ bool ScopeVisNG::handleMessage(const Message& message)
QMutexLocker configLocker(&m_mutex); QMutexLocker configLocker(&m_mutex);
MsgScopeVisNGChangeTrace& conf = (MsgScopeVisNGChangeTrace&) message; MsgScopeVisNGChangeTrace& conf = (MsgScopeVisNGChangeTrace&) message;
bool doComputeTriggerLevelsOnDisplay = m_traces.isVerticalDisplayChange(conf.getTraceData(), conf.getTraceIndex()); bool doComputeTriggerLevelsOnDisplay = m_traces.isVerticalDisplayChange(conf.getTraceData(), conf.getTraceIndex());
m_traces.changeTrace(conf.getTraceData(), conf.getTraceIndex()); uint32_t traceIndex = conf.getTraceIndex();
qDebug() << "ScopeVisNG::handleMessage: MsgScopeVisNGChangeTrace: " << traceIndex;
m_traces.changeTrace(conf.getTraceData(), traceIndex);
updateMaxTraceDelay(); updateMaxTraceDelay();
if (doComputeTriggerLevelsOnDisplay) computeDisplayTriggerLevels(); if (doComputeTriggerLevelsOnDisplay) computeDisplayTriggerLevels();
updateGLScopeDisplay(); updateGLScopeDisplay();
@ -728,7 +734,9 @@ bool ScopeVisNG::handleMessage(const Message& message)
{ {
QMutexLocker configLocker(&m_mutex); QMutexLocker configLocker(&m_mutex);
MsgScopeVisNGRemoveTrace& conf = (MsgScopeVisNGRemoveTrace&) message; MsgScopeVisNGRemoveTrace& conf = (MsgScopeVisNGRemoveTrace&) message;
m_traces.removeTrace(conf.getTraceIndex()); uint32_t traceIndex = conf.getTraceIndex();
qDebug() << "ScopeVisNG::handleMessage: MsgScopeVisNGRemoveTrace: " << traceIndex;
m_traces.removeTrace(traceIndex);
updateMaxTraceDelay(); updateMaxTraceDelay();
computeDisplayTriggerLevels(); computeDisplayTriggerLevels();
updateGLScopeDisplay(); updateGLScopeDisplay();
@ -738,7 +746,9 @@ bool ScopeVisNG::handleMessage(const Message& message)
{ {
QMutexLocker configLocker(&m_mutex); QMutexLocker configLocker(&m_mutex);
MsgScopeVisNGMoveTrace& conf = (MsgScopeVisNGMoveTrace&) message; MsgScopeVisNGMoveTrace& conf = (MsgScopeVisNGMoveTrace&) message;
m_traces.moveTrace(conf.getTraceIndex(), conf.getMoveUp()); uint32_t traceIndex = conf.getTraceIndex();
qDebug() << "ScopeVisNG::handleMessage: MsgScopeVisNGMoveTrace: " << traceIndex;
m_traces.moveTrace(traceIndex, conf.getMoveUp());
//updateMaxTraceDelay(); //updateMaxTraceDelay();
computeDisplayTriggerLevels(); computeDisplayTriggerLevels();
updateGLScopeDisplay(); updateGLScopeDisplay();
@ -748,6 +758,7 @@ bool ScopeVisNG::handleMessage(const Message& message)
{ {
MsgScopeVisNGFocusOnTrace& conf = (MsgScopeVisNGFocusOnTrace&) message; MsgScopeVisNGFocusOnTrace& conf = (MsgScopeVisNGFocusOnTrace&) message;
uint32_t traceIndex = conf.getTraceIndex(); uint32_t traceIndex = conf.getTraceIndex();
qDebug() << "ScopeVisNG::handleMessage: MsgScopeVisNGFocusOnTrace: " << traceIndex;
if (traceIndex < m_traces.m_tracesData.size()) if (traceIndex < m_traces.m_tracesData.size())
{ {
@ -761,6 +772,7 @@ bool ScopeVisNG::handleMessage(const Message& message)
} }
else if (MsgScopeVisNGOneShot::match(message)) else if (MsgScopeVisNGOneShot::match(message))
{ {
qDebug() << "ScopeVisNG::handleMessage: MsgScopeVisNGOneShot";
MsgScopeVisNGOneShot& conf = (MsgScopeVisNGOneShot&) message; MsgScopeVisNGOneShot& conf = (MsgScopeVisNGOneShot&) message;
bool oneShot = conf.getOneShot(); bool oneShot = conf.getOneShot();
m_triggerOneShot = oneShot; m_triggerOneShot = oneShot;
@ -771,6 +783,7 @@ bool ScopeVisNG::handleMessage(const Message& message)
{ {
MsgScopeVisNGMemoryTrace& conf = (MsgScopeVisNGMemoryTrace&) message; MsgScopeVisNGMemoryTrace& conf = (MsgScopeVisNGMemoryTrace&) message;
uint32_t memoryIndex = conf.getMemoryIndex(); uint32_t memoryIndex = conf.getMemoryIndex();
qDebug() << "ScopeVisNG::handleMessage: MsgScopeVisNGMemoryTrace: " << memoryIndex;
if (memoryIndex != m_currentTraceMemoryIndex) if (memoryIndex != m_currentTraceMemoryIndex)
{ {
@ -784,6 +797,7 @@ bool ScopeVisNG::handleMessage(const Message& message)
} }
else else
{ {
qDebug() << "ScopeVisNG::handleMessage" << message.getIdentifier() << " not handled";
return false; return false;
} }
} }

2
sdrgui/dsp/scopevisng.h
View File

@ -145,7 +145,7 @@ public:
static const uint32_t m_traceChunkSize; static const uint32_t m_traceChunkSize;
static const uint32_t m_maxNbTriggers = 10; static const uint32_t m_maxNbTriggers = 10;
static const uint32_t m_maxNbTraces = 10; static const uint32_t m_maxNbTraces = 10;
static const uint32_t m_nbTraceMemories = 16; static const uint32_t m_nbTraceMemories = 50;
ScopeVisNG(GLScopeNG* glScope = 0); ScopeVisNG(GLScopeNG* glScope = 0);
virtual ~ScopeVisNG(); virtual ~ScopeVisNG();

4
sdrgui/gui/glscopenggui.ui
View File

@ -248,7 +248,7 @@
</colorrole> </colorrole>
</disabled> </disabled>
</palette> </palette>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Display XY traces and polar trace</string> <string>Display XY traces and polar trace</string>
</property> </property>
@ -1131,7 +1131,7 @@ kS/s</string>
<string>Select trace memory (0 is live)</string> <string>Select trace memory (0 is live)</string>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>15</number> <number>49</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>