comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-26 13:48:38 -05:00
Code Issues Projects Releases Wiki Activity

Re-connect scope to demodulator output data

Browse Source
This commit is contained in:
Charles J. Cliffe 2014-11-16 19:14:15 -05:00
parent 1950c3109a
commit 82b6b67f3c
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/AppFrame.cpp
View File

@ -165,6 +165,16 @@ void AppFrame::OnDemodInput(wxThreadEvent& event) {
AudioThreadTask task = AudioThreadTask(AudioThreadTask::AUDIO_THREAD_DATA); AudioThreadTask task = AudioThreadTask(AudioThreadTask::AUDIO_THREAD_DATA);
task.setData(*new_buffer); task.setData(*new_buffer);
threadQueueAudio->addTask(task, AudioThreadQueue::AUDIO_PRIORITY_HIGHEST); threadQueueAudio->addTask(task, AudioThreadQueue::AUDIO_PRIORITY_HIGHEST);
if (scopeCanvas->waveform_points.size() != new_buffer->size() * 2) {
scopeCanvas->waveform_points.resize(new_buffer->size() * 2);
}
for (int i = 0, iMax = new_buffer->size(); i < iMax; i++) {
scopeCanvas->waveform_points[i * 2 + 1] = (*new_buffer)[i] * 0.5f;
scopeCanvas->waveform_points[i * 2] = ((double) i / (double) iMax);
}
} else { } else {
std::cout << "Incoming Demod data empty?" << std::endl; std::cout << "Incoming Demod data empty?" << std::endl;
} }

3
src/visual/ScopeCanvas.h
View File

@ -12,6 +12,8 @@
class ScopeCanvas: public wxGLCanvas { class ScopeCanvas: public wxGLCanvas {
public: public:
std::vector<float> waveform_points;
ScopeCanvas(wxWindow *parent, int *attribList = NULL); ScopeCanvas(wxWindow *parent, int *attribList = NULL);
~ScopeCanvas(); ~ScopeCanvas();
@ -23,7 +25,6 @@ private:
void OnIdle(wxIdleEvent &event); void OnIdle(wxIdleEvent &event);
wxWindow *parent; wxWindow *parent;
std::vector<float> waveform_points;
ScopeContext *glContext; ScopeContext *glContext;
// event table // event table