comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-08-13 02:52:26 -04:00
Code Issues Projects Releases Wiki Activity

Fix spectrum scale control in Windows

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-11-01 12:41:13 -05:00
parent 8878a22bd2
commit ba067bcc24
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/visual/SpectrumCanvas.cpp
View File

@ -34,7 +34,6 @@ SpectrumCanvas::SpectrumCanvas(wxWindow *parent, int *attribList) :
glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this)); glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
mouseTracker.setVertDragLock(true);
visualDataQueue.set_max_num_items(1); visualDataQueue.set_max_num_items(1);
SetCursor(wxCURSOR_SIZEWE); SetCursor(wxCURSOR_SIZEWE);
@ -214,6 +213,7 @@ void SpectrumCanvas::OnMouseMoved(wxMouseEvent& event) {
} }
void SpectrumCanvas::OnMouseDown(wxMouseEvent& event) { void SpectrumCanvas::OnMouseDown(wxMouseEvent& event) {
mouseTracker.setVertDragLock(true);
InteractiveCanvas::OnMouseDown(event); InteractiveCanvas::OnMouseDown(event);
SetCursor(wxCURSOR_CROSS); SetCursor(wxCURSOR_CROSS);
} }
@ -223,7 +223,8 @@ void SpectrumCanvas::OnMouseWheelMoved(wxMouseEvent& event) {
} }
void SpectrumCanvas::OnMouseReleased(wxMouseEvent& event) { void SpectrumCanvas::OnMouseReleased(wxMouseEvent& event) {
InteractiveCanvas::OnMouseReleased(event); mouseTracker.setVertDragLock(false);
InteractiveCanvas::OnMouseReleased(event);
SetCursor(wxCURSOR_SIZEWE); SetCursor(wxCURSOR_SIZEWE);
} }
@ -246,11 +247,13 @@ SpectrumVisualDataQueue *SpectrumCanvas::getVisualDataQueue() {
} }
void SpectrumCanvas::OnMouseRightDown(wxMouseEvent& event) { void SpectrumCanvas::OnMouseRightDown(wxMouseEvent& event) {
mouseTracker.setHorizDragLock(true);
mouseTracker.OnMouseRightDown(event); mouseTracker.OnMouseRightDown(event);
scaleFactor = wxGetApp().getSpectrumProcessor()->getScaleFactor(); scaleFactor = wxGetApp().getSpectrumProcessor()->getScaleFactor();
} }
void SpectrumCanvas::OnMouseRightReleased(wxMouseEvent& event) { void SpectrumCanvas::OnMouseRightReleased(wxMouseEvent& event) {
mouseTracker.setHorizDragLock(false);
if (!mouseTracker.getOriginDeltaMouseY()) { if (!mouseTracker.getOriginDeltaMouseY()) {
resetScaleFactor = true; resetScaleFactor = true;
} }