From 34559bf4d66834334816705baf8096e99179a2ed Mon Sep 17 00:00:00 2001 From: drowe67 Date: Thu, 2 Feb 2017 03:16:00 +0000 Subject: [PATCH] changed click to tune to double click to prevent accidental freq shifts git-svn-id: https://svn.code.sf.net/p/freetel/code@3013 01035d8c-6547-0410-b346-abe4f91aad63 --- freedv-dev/src/fdmdv2_plot_spectrum.cpp | 3 ++- freedv-dev/src/fdmdv2_plot_spectrum.h | 2 +- freedv-dev/src/fdmdv2_plot_waterfall.cpp | 4 ++-- freedv-dev/src/fdmdv2_plot_waterfall.h | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/freedv-dev/src/fdmdv2_plot_spectrum.cpp b/freedv-dev/src/fdmdv2_plot_spectrum.cpp index d9c72d03..1f5be59b 100644 --- a/freedv-dev/src/fdmdv2_plot_spectrum.cpp +++ b/freedv-dev/src/fdmdv2_plot_spectrum.cpp @@ -29,6 +29,7 @@ void fdmdv2_clickTune(float frequency); // callback to pass new click freq BEGIN_EVENT_TABLE(PlotSpectrum, PlotPanel) EVT_MOTION (PlotSpectrum::OnMouseMove) EVT_LEFT_DOWN (PlotSpectrum::OnMouseLeftDown) + EVT_LEFT_DCLICK (PlotSpectrum::OnMouseLeftDoubleClick) EVT_LEFT_UP (PlotSpectrum::OnMouseLeftUp) EVT_MOUSEWHEEL (PlotSpectrum::OnMouseWheelMoved) EVT_PAINT (PlotSpectrum::OnPaint) @@ -243,7 +244,7 @@ void PlotSpectrum::drawGraticule(wxAutoBufferedPaintDC& dc) //------------------------------------------------------------------------- // OnMouseDown() //------------------------------------------------------------------------- -void PlotSpectrum::OnMouseLeftDown(wxMouseEvent& event) +void PlotSpectrum::OnMouseLeftDoubleClick(wxMouseEvent& event) { m_mouseDown = true; wxClientDC dc(this); diff --git a/freedv-dev/src/fdmdv2_plot_spectrum.h b/freedv-dev/src/fdmdv2_plot_spectrum.h index 353f3127..271eeb98 100644 --- a/freedv-dev/src/fdmdv2_plot_spectrum.h +++ b/freedv-dev/src/fdmdv2_plot_spectrum.h @@ -42,7 +42,7 @@ class PlotSpectrum : public PlotPanel void OnShow(wxShowEvent& event); void drawGraticule(wxAutoBufferedPaintDC& dc); void draw(wxAutoBufferedPaintDC& dc); - void OnMouseLeftDown(wxMouseEvent& event); + void OnMouseLeftDoubleClick(wxMouseEvent& event); private: float m_rxFreq; diff --git a/freedv-dev/src/fdmdv2_plot_waterfall.cpp b/freedv-dev/src/fdmdv2_plot_waterfall.cpp index d3a29abd..cdbe01e0 100644 --- a/freedv-dev/src/fdmdv2_plot_waterfall.cpp +++ b/freedv-dev/src/fdmdv2_plot_waterfall.cpp @@ -28,7 +28,7 @@ void fdmdv2_clickTune(float frequency); // callback to pass new click freq BEGIN_EVENT_TABLE(PlotWaterfall, PlotPanel) EVT_PAINT (PlotWaterfall::OnPaint) EVT_MOTION (PlotWaterfall::OnMouseMove) - EVT_LEFT_DOWN (PlotWaterfall::OnMouseLeftDown) + EVT_LEFT_DCLICK (PlotWaterfall::OnMouseLeftDoubleClick) EVT_RIGHT_DOWN (PlotWaterfall::OnMouseRightDown) EVT_LEFT_UP (PlotWaterfall::OnMouseLeftUp) EVT_MOUSEWHEEL (PlotWaterfall::OnMouseWheelMoved) @@ -449,7 +449,7 @@ void PlotWaterfall::plotPixelData() //------------------------------------------------------------------------- // OnMouseLeftDown() //------------------------------------------------------------------------- -void PlotWaterfall::OnMouseLeftDown(wxMouseEvent& event) +void PlotWaterfall::OnMouseLeftDoubleClick(wxMouseEvent& event) { m_mouseDown = true; wxClientDC dc(this); diff --git a/freedv-dev/src/fdmdv2_plot_waterfall.h b/freedv-dev/src/fdmdv2_plot_waterfall.h index 77058fda..f4896c6b 100644 --- a/freedv-dev/src/fdmdv2_plot_waterfall.h +++ b/freedv-dev/src/fdmdv2_plot_waterfall.h @@ -55,7 +55,7 @@ class PlotWaterfall : public PlotPanel void drawGraticule(wxAutoBufferedPaintDC& dc); void draw(wxAutoBufferedPaintDC& dc); void plotPixelData(); - void OnMouseLeftDown(wxMouseEvent& event); + void OnMouseLeftDoubleClick(wxMouseEvent& event); void OnMouseRightDown(wxMouseEvent& event); private: -- 2.25.1