Fix #215

keesverruijt · Aug 25, 2016 · f3e534e · f3e534e
1 parent 14c888d
commit f3e534e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/RadarCanvas.cpp b/src/RadarCanvas.cpp
@@ -466,9 +466,9 @@ void RadarCanvas::OnMouseClick(wxMouseEvent &event) {
   } else if ((x >= center_x - m_zoom_size.x / 2) && (x <= center_x + m_zoom_size.x / 2) &&
              (y > h - m_zoom_size.y + MENU_ROUNDING)) {
     if (x > center_x) {
-      m_ri->AdjustRange(-1);
-    } else {
       m_ri->AdjustRange(+1);
+    } else {
+      m_ri->AdjustRange(-1);
     }
 
   } else {
@@ -508,11 +508,11 @@ void RadarCanvas::OnMouseWheel(wxMouseEvent &event) {
     }
     if (rotation > ZOOM_SENSITIVITY && m_last_mousewheel_zoom_in < now - ZOOM_TIME) {
       LOG_INFO(wxT("BR24radar_pi: %s Mouse zoom in"), m_ri->m_name.c_str());
-      m_ri->AdjustRange(-1);
+      m_ri->AdjustRange(+1);
       m_last_mousewheel_zoom_in = now;
     } else if (rotation < -1 * ZOOM_SENSITIVITY && m_last_mousewheel_zoom_out < now - ZOOM_TIME) {
       LOG_INFO(wxT("BR24radar_pi: %s Mouse zoom out"), m_ri->m_name.c_str());
-      m_ri->AdjustRange(+1);
+      m_ri->AdjustRange(-1);
       m_last_mousewheel_zoom_out = now;
     }
   }

diff --git a/src/RadarInfo.cpp b/src/RadarInfo.cpp
@@ -739,11 +739,11 @@ void RadarInfo::AdjustRange(int adjustment) {
       max--;  // only 4G has longest ranges
     }
 
-    if (adjustment < 0 && m_range.range > min) {
+    if (adjustment > 0 && m_range.range > min) {
       LOG_VERBOSE(wxT("BR24radar_pi: Change radar range from %d/%d to %d/%d"), m_range.range[0].meters,
                   m_range.range[0].actual_meters, m_range.range[-1].meters, m_range.range[-1].actual_meters);
       m_transmit->SetRange(m_range.range[-1].meters);
-    } else if (adjustment > 0 && m_range.range < max) {
+    } else if (adjustment < 0 && m_range.range < max) {
       LOG_VERBOSE(wxT("BR24radar_pi: Change radar range from %d/%d to %d/%d"), m_range.range[0].meters,
                   m_range.range[0].actual_meters, m_range.range[+1].meters, m_range.range[+1].actual_meters);
       m_transmit->SetRange(m_range.range[+1].meters);