diff --git a/src/visual/SpectrumCanvas.cpp b/src/visual/SpectrumCanvas.cpp index 65a52b2..e618cc5 100644 --- a/src/visual/SpectrumCanvas.cpp +++ b/src/visual/SpectrumCanvas.cpp @@ -27,7 +27,7 @@ EVT_MOUSEWHEEL(SpectrumCanvas::OnMouseWheelMoved) wxEND_EVENT_TABLE() SpectrumCanvas::SpectrumCanvas(wxWindow *parent, int *attribList) : - InteractiveCanvas(parent, attribList), fft_size(0), waterfallCanvas(NULL), trackingRate(0) { + InteractiveCanvas(parent, attribList), waterfallCanvas(NULL) { glContext = new SpectrumContext(this, &wxGetApp().GetContext(this)); diff --git a/src/visual/SpectrumCanvas.h b/src/visual/SpectrumCanvas.h index 636296d..eb05e79 100644 --- a/src/visual/SpectrumCanvas.h +++ b/src/visual/SpectrumCanvas.h @@ -20,7 +20,6 @@ public: std::vector spectrum_points; SpectrumCanvas(wxWindow *parent, int *attribList = NULL); -// void setup(int fft_size_in); ~SpectrumCanvas(); void attachWaterfallCanvas(WaterfallCanvas *canvas_in); @@ -40,20 +39,8 @@ private: void OnMouseReleased(wxMouseEvent& event); void OnMouseLeftWindow(wxMouseEvent& event); -// fftwf_complex *in, *out; -// fftwf_plan plan; -// -// float fft_ceil_ma, fft_ceil_maa; -// float fft_floor_ma, fft_floor_maa; -// -// std::vector fft_result; -// std::vector fft_result_ma; -// std::vector fft_result_maa; - SpectrumContext *glContext; WaterfallCanvas *waterfallCanvas; - int fft_size; - int trackingRate; SpectrumVisualDataQueue visualDataQueue; diff --git a/src/visual/WaterfallCanvas.cpp b/src/visual/WaterfallCanvas.cpp index c928d89..4efa1e6 100644 --- a/src/visual/WaterfallCanvas.cpp +++ b/src/visual/WaterfallCanvas.cpp @@ -717,16 +717,6 @@ void WaterfallCanvas::OnMouseRightReleased(wxMouseEvent& event) { mouseZoom = 1.0; } - -// -//bool WaterfallCanvas::isPolling() { -// return polling; -//} -// -//void WaterfallCanvas::setPolling(bool polling) { -// this->polling = polling; -//} - SpectrumVisualDataQueue *WaterfallCanvas::getVisualDataQueue() { return &visualDataQueue; } \ No newline at end of file