fix method name
trunk/libs/ranges/UrgCtrl.cpp (diff)
trunk/libs/ranges/UrgCtrl.h (diff)| @@ -505,21 +505,15 @@ | ||
| 505 | 505 | } |
| 506 | 506 | |
| 507 | 507 | |
| 508 | -double UrgCtrl::index2rad(int index) const { | |
| 508 | +double UrgCtrl::index2rad(const int index) const { | |
| 509 | 509 | |
| 510 | - // !!! sensor_parameter_ を用いて計算する | |
| 511 | - // !!! | |
| 512 | - | |
| 513 | 510 | return (index - pimpl->sensor_parameter_.area_front) |
| 514 | 511 | * 2.0*M_PI / pimpl->sensor_parameter_.area_total; |
| 515 | - | |
| 516 | - //return 0.0; | |
| 517 | 512 | } |
| 518 | 513 | |
| 519 | 514 | |
| 520 | -int UrgCtrl::rad2index(double radian) const { | |
| 515 | +int UrgCtrl::rad2index(const double radian) const { | |
| 521 | 516 | |
| 522 | - // !!! 仮実装 | |
| 523 | 517 | int index = static_cast<int>((radian * pimpl->sensor_parameter_.area_total) |
| 524 | 518 | / (2.0*M_PI)) |
| 525 | 519 | + pimpl->sensor_parameter_.area_front; |
| @@ -530,10 +524,6 @@ | ||
| 530 | 524 | index = pimpl->sensor_parameter_.area_max; |
| 531 | 525 | } |
| 532 | 526 | return index; |
| 533 | - | |
| 534 | - // !!! sensor_parameter_ を用いて計算する | |
| 535 | - // !!! | |
| 536 | - return 0; | |
| 537 | 527 | } |
| 538 | 528 | |
| 539 | 529 |
| @@ -147,8 +147,8 @@ | ||
| 147 | 147 | int getTimestamp(void); |
| 148 | 148 | |
| 149 | 149 | // 角度変換 |
| 150 | - double index2rad(int index) const; | |
| 151 | - int rad2index(double radian) const; | |
| 150 | + double index2rad(const int index) const; | |
| 151 | + int rad2index(const double radian) const; | |
| 152 | 152 | |
| 153 | 153 | /*! |
| 154 | 154 | \brief 取得バッファ数の設定 |
satofumi