From 586cfdb77e1ae6c83cb35df4662c36dd58d682f5 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <matteo.cypriani@univ-fcomte.fr>
Date: Fri, 17 Jun 2011 12:35:14 +0200
Subject: [PATCH] [Positioning] Stock::store_calibration_request()

InputDataReader::stock_calibration_request() becomes
Stock::store_calibration_request(), so other classes can use it.
---
 owlps-positioning/src/inputdatareader.cc | 15 +++------------
 owlps-positioning/src/inputdatareader.hh |  2 --
 owlps-positioning/src/stock.cc           |  9 +++++++++
 owlps-positioning/src/stock.hh           |  4 ++++
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/owlps-positioning/src/inputdatareader.cc b/owlps-positioning/src/inputdatareader.cc
index 7c07552..0c4c9c3 100644
--- a/owlps-positioning/src/inputdatareader.cc
+++ b/owlps-positioning/src/inputdatareader.cc
@@ -193,27 +193,18 @@ void InputDataReader::read_from_reference_points_media()
       while (! (*i)->eof())
         {
           const Request &request = (*i)->get_next_request() ;
+
           if (! request)
             continue ;
+
           CalibrationRequest *calibration_request =
             dynamic_cast<CalibrationRequest*>(
               const_cast<Request*>(&request)) ;
-
           if (calibration_request == NULL)
             cerr << "Warning! Invalid calibration request at line "
                  << (*i)->get_current_line_nb() << endl ;
           else
-            stock_calibration_request(*calibration_request) ;
+            Stock::store_calibration_request(*calibration_request) ;
         }
     }
 }
-
-
-void InputDataReader::
-stock_calibration_request(const CalibrationRequest &request) const
-{
-  const CalibrationRequest &calibration_request =
-    Stock::find_create_calibration_request(request) ;
-
-  calibration_request.reference_point_backward_link() ;
-}
diff --git a/owlps-positioning/src/inputdatareader.hh b/owlps-positioning/src/inputdatareader.hh
index 3db777c..1808679 100644
--- a/owlps-positioning/src/inputdatareader.hh
+++ b/owlps-positioning/src/inputdatareader.hh
@@ -24,8 +24,6 @@ protected:
   void initialise_reference_points_media(void) ;
   void initialise_reference_points_csv(void) ;
   void read_from_reference_points_media(void) ;
-  void stock_calibration_request(
-    const CalibrationRequest &request) const ;
 
 public:
   InputDataReader(void) ;
diff --git a/owlps-positioning/src/stock.cc b/owlps-positioning/src/stock.cc
index 158c3f8..24be46c 100644
--- a/owlps-positioning/src/stock.cc
+++ b/owlps-positioning/src/stock.cc
@@ -314,6 +314,15 @@ closest_reference_point(const Request &request)
 /* *** CalibrationRequest operations *** */
 
 
+void Stock::
+store_calibration_request(const CalibrationRequest &request)
+{
+  const CalibrationRequest &calibration_request =
+    find_create_calibration_request(request) ;
+  calibration_request.reference_point_backward_link() ;
+}
+
+
 const CalibrationRequest& Stock::
 find_create_calibration_request(const CalibrationRequest &request)
 {
diff --git a/owlps-positioning/src/stock.hh b/owlps-positioning/src/stock.hh
index 86f4f1d..5f3629d 100644
--- a/owlps-positioning/src/stock.hh
+++ b/owlps-positioning/src/stock.hh
@@ -117,6 +117,10 @@ public:
   //@{
   /// Returns the number of calibration requests
   static unsigned int nb_calibration_requests(void) ;
+  /// \brief Searches for a CalibrationRequest, adds it if it does
+  /// not exist, and links it to its reference point
+  static void store_calibration_request(
+    const CalibrationRequest &request) ;
   /// Searches for a CalibrationRequest and adds it if it does not exist
   static const CalibrationRequest&
   find_create_calibration_request(const CalibrationRequest &request) ;