[dasher: 26/28] Fix bug w/ ClickFilter guidelines by only applying safety margin to zoom-_in_



commit 067ad0c3f7555710c6444c9d1e3c0fe9ce15efe2
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date:   Wed Oct 12 17:32:38 2011 +0100

    Fix bug w/ ClickFilter guidelines by only applying safety margin to zoom-_in_

 Src/DasherCore/ClickFilter.cpp |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/Src/DasherCore/ClickFilter.cpp b/Src/DasherCore/ClickFilter.cpp
index e9aa0dd..b78df9d 100644
--- a/Src/DasherCore/ClickFilter.cpp
+++ b/Src/DasherCore/ClickFilter.cpp
@@ -62,6 +62,10 @@ CZoomAdjuster::CZoomAdjuster(CSettingsUser *pCreateFrom) : CSettingsUser(pCreate
 }
 
 void CZoomAdjuster::AdjustZoomCoords(myint &iDasherX, myint &iDasherY, CDasherView *pView) {
+  //these equations don't work well for iDasherX just slightly over ORIGIN_X;
+  // this is probably due to rounding error, but the "safety margin" doesn't
+  // really seem helpful when zooming out (or translating) anyway...
+  if (iDasherX >= CDasherModel::ORIGIN_X) return;
   const myint safety(GetLongParameter(LP_S));
   //safety param. Used to be just added onto DasherX,
   // but comments suggested should be interpreted as a fraction. Hence...



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]