mcy
/
owlps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Positioning] Stock::store_calibration_request() 

InputDataReader::stock_calibration_request() becomes
Stock::store_calibration_request(), so other classes can use it.
This commit is contained in:
Matteo Cypriani 2011-06-17 12:35:14 +02:00
parent de9513e4b4
commit 586cfdb77e
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
owlps-positioning/src/inputdatareader.cc
View File

@ -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() ;
}

2
owlps-positioning/src/inputdatareader.hh
View File

@ -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) ;

9
owlps-positioning/src/stock.cc
View File

@ -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)
{

4
owlps-positioning/src/stock.hh
View File

@ -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) ;