From 9b245ce1527ba6155058b36203e343acda19a432 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <matteo.cypriani@univ-fcomte.fr>
Date: Sat, 23 Jul 2011 18:08:54 +0200
Subject: [PATCH] [Positioning] Add option generated-meshing-grain

The option positioning.generated-meshing-grain allows to set the
grain of the generated reference points' meshing.
---
 owlps-positioning/cfg/owlps-positioning.cfg | 4 ++++
 owlps-positioning/src/stock.cc              | 3 ++-
 owlps-positioning/src/userinterface.cc      | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/owlps-positioning/cfg/owlps-positioning.cfg b/owlps-positioning/cfg/owlps-positioning.cfg
index e585c08..2a57570 100644
--- a/owlps-positioning/cfg/owlps-positioning.cfg
+++ b/owlps-positioning/cfg/owlps-positioning.cfg
@@ -67,6 +67,10 @@ csv-file = /tmp/owlps-positioning.log
 # received.
 #generate-reference-points = false
 
+# When the above option is activated, the reference points are generated
+# with the specified distance (in meters) between one another.
+#generated-meshing-grain = 0.5
+
 # This option allows the calibration requests sent during the
 # positioning phase to be added to the calibration request's list. They
 # are added to the calibration requests read by InputDataReader during
diff --git a/owlps-positioning/src/stock.cc b/owlps-positioning/src/stock.cc
index 37944f7..53cf043 100644
--- a/owlps-positioning/src/stock.cc
+++ b/owlps-positioning/src/stock.cc
@@ -437,7 +437,8 @@ void Stock::regenerate_reference_points()
     Configuration::string_value("positioning.minmax-start")) ;
   Point3D stop(
     Configuration::string_value("positioning.minmax-stop")) ;
-  float step = 0.5 ; // FIXME
+  float step =
+    Configuration::float_value("positioning.generated-meshing-grain") ;
   float z = 1 ; // FIXME
   for (float x = start.get_x() ; x <= stop.get_x() ; x += step)
     for (float y = start.get_y() ; y <= stop.get_y() ; y += step)
diff --git a/owlps-positioning/src/userinterface.cc b/owlps-positioning/src/userinterface.cc
index e5d7393..375a150 100644
--- a/owlps-positioning/src/userinterface.cc
+++ b/owlps-positioning/src/userinterface.cc
@@ -197,6 +197,10 @@ void UserInterface::fill_positioning_options()
    po::value<bool>()->default_value(false),
    "Generate reference points from the (auto)calibration requests"
    " received.")
+  ("positioning.generated-meshing-grain",
+   po::value<float>()->default_value(0.5),
+   "When generating reference points, this distance (in meters) will"
+   " separate each point to the next.")
   ("positioning.accept-new-calibration-requests",
    po::value<bool>()->default_value(false),
    "Add the calibration requests received during the run-time to"