[dasher] Set the limits of the range of the non-uniformity of boxes to



commit 4b6930440763313f8f65afe28a49b831ae21ef4e
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Thu May 14 17:46:20 2009 +0100

    Set the limits of the range of the non-uniformity of boxes to
    +/-89, which should correspond to a factor of 2 difference in
    the heights of adjacent boxes. This is calculated from the
    "standard" programme which says that r is in units of 128,
    so r = 128 ln(2) if I want a factor of 2. The code however
    looks as though it using a quite different definition of the
    meaning of ratio.
---
 ChangeLog                        |    4 ++++
 Src/DasherCore/DasherButtons.cpp |    6 +++++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3678cea..924c1c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-14  Patrick Welche  <prlw1 cam ac uk>
+
+	* DasherButtons.cpp: Change box non-uniformity range again.
+
 2009-05-14  Alan Lawrence <acl33 inf phy cam ac uk>
 
 	* Carry on excision of Factories, renaming Create{,Local}Factories
diff --git a/Src/DasherCore/DasherButtons.cpp b/Src/DasherCore/DasherButtons.cpp
index f55eafb..733c423 100644
--- a/Src/DasherCore/DasherButtons.cpp
+++ b/Src/DasherCore/DasherButtons.cpp
@@ -28,7 +28,11 @@ static SModuleSettings sSettings[] = {
   {LP_B, T_LONG, 2, 10, 1, 1, _("Number of boxes")},
   {LP_S, T_LONG, 0, 256, 1, 1, _("Safety margin")},
   /* TRANSLATORS: The boxes (zoom targets) in button mode can either be the same size, or different sizes - this is the extent to which the sizes are allowed to differ from each other. */
-  {LP_R, T_LONG, -80, 80, 1, 10, _("Box non-uniformity")},
+  /* XXX PRLW: 128 log(2) = 89, where 2 is the ratio of adjacent boxes
+   * however the code seems to use ratio = (129/127)^-r, instead of
+   * ratio = exp(r/128) used in the design document
+   */
+  {LP_R, T_LONG, -89, 89, 1, 10, _("Box non-uniformity")},
   /* TRANSLATORS: Intercept keyboard events for 'special' keys even when the Dasher window doesn't have keyboard focus.*/
   {BP_GLOBAL_KEYBOARD, T_BOOL, -1, -1, -1, -1, _("Global keyboard grab")}
 };



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