提交: 1f4a9b8acfa01eba0f6a62d4a36287208628c74e - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• 修订版: 1f4a9b8acfa01eba0f6a62d4a36287208628c74e (tree)
• 时间: 2012-06-27 04:59:28
• 作者: Tias Guns <tias@ulys...>
• Commiter: Tias Guns

Log Message

calib calculation: move min/max correction before transformation

更改概述

• modified: src/calibrator.cpp

差异

--- a/src/calibrator.cpp
+++ b/src/calibrator.cpp
@@ -160,15 +160,6 @@ bool Calibrator::finish(int width, int height)
     new_axis.y.min = round( (clicked.y[UL] + clicked.y[UR])/2.0 );
     new_axis.y.max = round( (clicked.y[LL] + clicked.y[LR])/2.0 );
 
-    // Compute min/max coordinates.
-    // These are scaled using the values of old_axys
-    const float scale_x = (old_axys.x.max - old_axys.x.min)/(float)width;
-    new_axis.x.min = (new_axis.x.min * scale_x) + old_axys.x.min;
-    new_axis.x.max = (new_axis.x.max * scale_x) + old_axys.x.min;
-    const float scale_y = (old_axys.y.max - old_axys.y.min)/(float)height;
-    new_axis.y.min = (new_axis.y.min * scale_y) + old_axys.y.min;
-    new_axis.y.max = (new_axis.y.max * scale_y) + old_axys.y.min;
-
     // Add/subtract the offset that comes from not having the points in the
     // corners (using the same coordinate system they are currently in)
     const int delta_x = (new_axis.x.max - new_axis.x.min) / (float)(num_blocks - 2);
@@ -178,6 +169,15 @@ bool Calibrator::finish(int width, int height)
     new_axis.y.min -= delta_y;
     new_axis.y.max += delta_y;
 
+    // Compute min/max coordinates.
+    // These are scaled using the values of old_axys
+    const float scale_x = (old_axys.x.max - old_axys.x.min)/(float)width;
+    new_axis.x.min = (new_axis.x.min * scale_x) + old_axys.x.min;
+    new_axis.x.max = (new_axis.x.max * scale_x) + old_axys.x.min;
+    const float scale_y = (old_axys.y.max - old_axys.y.min)/(float)height;
+    new_axis.y.min = (new_axis.y.min * scale_y) + old_axys.y.min;
+    new_axis.y.max = (new_axis.y.max * scale_y) + old_axys.y.min;
+
 
     // If x and y has to be swapped we also have to swap the parameters
     if (do_swap_xy) {