mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

GLScopeGUI: fixed QMetaObject::connectSlotsByName warnings

pull/935/head
f4exb 2021-06-16 00:19:17 +02:00
rodzic 07a81679d8
commit d9e1034f9a
2 zmienionych plików z 11 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
sdrgui/gui/glscopegui.cpp
Wyświetl plik

@ -105,9 +105,9 @@ void GLScopeGUI::setBuddies(MessageQueue* messageQueue, ScopeVis* scopeVis, GLSc
settingsTraceAdd(traceData);
setEnabled(true);
connect(m_glScope, SIGNAL(sampleRateChanged(int)), this, SLOT(on_scope_sampleRateChanged(int)));
connect(m_glScope, SIGNAL(traceSizeChanged(uint32_t)), this, SLOT(on_scope_traceSizeChanged(uint32_t)));
connect(m_glScope, SIGNAL(preTriggerChanged(uint32_t)), this, SLOT(on_scope_preTriggerChanged(uint32_t)));
connect(m_glScope, SIGNAL(sampleRateChanged(int)), this, SLOT(onScopeSampleRateChanged(int)));
connect(m_glScope, SIGNAL(traceSizeChanged(uint32_t)), this, SLOT(onScopeTraceSizeChanged(uint32_t)));
connect(m_glScope, SIGNAL(preTriggerChanged(uint32_t)), this, SLOT(onScopePreTriggerChanged(uint32_t)));
ui->traceMode->clear();
fillProjectionCombo(ui->traceMode);
@ -144,7 +144,7 @@ void GLScopeGUI::setSampleRate(int sampleRate)
m_sampleRate = sampleRate;
}
void GLScopeGUI::on_scope_sampleRateChanged(int sampleRate)
void GLScopeGUI::onScopeSampleRateChanged(int sampleRate)
{
//m_sampleRate = m_glScope->getSampleRate();
m_sampleRate = sampleRate;
@ -157,17 +157,17 @@ void GLScopeGUI::on_scope_sampleRateChanged(int sampleRate)
setTrigDelayDisplay();
}
void GLScopeGUI::on_scope_traceSizeChanged(uint32_t traceNbSamples)
void GLScopeGUI::onScopeTraceSizeChanged(uint32_t traceNbSamples)
{
qDebug("GLScopeGUI::on_scope_traceSizeChanged: %u", traceNbSamples);
qDebug("GLScopeGUI::onScopeTraceSizeChanged: %u", traceNbSamples);
m_traceLenMult = traceNbSamples / m_scopeVis->getTraceChunkSize();
ui->traceLen->setValue(m_traceLenMult);
setTraceLenDisplay();
}
void GLScopeGUI::on_scope_preTriggerChanged(uint32_t preTriggerNbSamples)
void GLScopeGUI::onScopePreTriggerChanged(uint32_t preTriggerNbSamples)
{
qDebug("GLScopeGUI::on_scope_preTriggerChanged: %u", preTriggerNbSamples);
qDebug("GLScopeGUI::onScopePreTriggerChanged: %u", preTriggerNbSamples);
ui->trigPre->setValue(preTriggerNbSamples*100 / m_glScope->getTraceSize()); // slider position is a percentage value of the trace size
setTrigPreDisplay();
}

6
sdrgui/gui/glscopegui.h
Wyświetl plik

@ -193,9 +193,9 @@ private:
void settingsTriggerMove(uint32_t triggerIndex, bool upElseDown);
private slots:
void on_scope_sampleRateChanged(int value);
void on_scope_traceSizeChanged(uint32_t value);
void on_scope_preTriggerChanged(uint32_t value);
void onScopeSampleRateChanged(int value);
void onScopeTraceSizeChanged(uint32_t value);
void onScopePreTriggerChanged(uint32_t value);
// First row
void on_onlyX_toggled(bool checked);
void on_onlyY_toggled(bool checked);