Skip to content
Snippets Groups Projects
Commit c46b8e64 authored by Joan Solà Ortega's avatar Joan Solà Ortega
Browse files

Remove old commented garbish

parent 96f19280
No related branches found
No related tags found
No related merge requests found
......@@ -24,17 +24,6 @@ CaptureBase::~CaptureBase()
std::cout << "destructed -C" << id() << std::endl;
}
//void CaptureBase::process()
//{
// // Call all processors assigned to the sensor that captured this data
// auto cap = shared_from_this();
// auto sen = sensor_ptr_.lock();
// if (sen)
// for (auto prc : sen->getProcessorList())
// prc->process(cap);
//}
//<<<<<<< HEAD
void CaptureBase::remove()
{
if (!is_removing_)
......@@ -60,16 +49,6 @@ void CaptureBase::remove()
std::cout << "Removed C" << id() << std::endl;
}
}
//=======
//void CaptureBase::process()
//{
// // Call all processors assigned to the sensor that captured this data
// for (auto processor_iter = sensor_ptr_->getProcessorListPtr()->begin(); processor_iter != sensor_ptr_->getProcessorListPtr()->end(); ++processor_iter)
// {
// (*processor_iter)->process(this);
// }
//}
//>>>>>>> capture_passby_sensor
void CaptureBase::addFeatureList(FeatureBaseList& _new_ft_list)
{
......
......@@ -36,16 +36,8 @@ class CaptureBase : public NodeBase, public std::enable_shared_from_this<Capture
public:
//<<<<<<< HEAD
// CaptureBase(const std::string& _type, const TimeStamp& _ts, SensorBasePtr _sensor_ptr);
//=======
CaptureBase(const std::string& _type, const TimeStamp& _ts, SensorBasePtr _sensor_ptr = nullptr);
// /** \brief Default destructor (not recommended)
// *
// * Default destructor (please use destruct() instead of delete for guaranteeing the wolf tree integrity)
// **/
//>>>>>>> capture_passby_sensor
virtual ~CaptureBase();
void remove();
......@@ -67,22 +59,11 @@ class CaptureBase : public NodeBase, public std::enable_shared_from_this<Capture
void getConstraintList(ConstraintBaseList& _ctr_list);
SensorBasePtr getSensorPtr() const;
//<<<<<<< HEAD
StateBlockPtr getSensorPPtr() const;
StateBlockPtr getSensorOPtr() const;
// virtual void process();
//=======
virtual void setSensorPtr(const SensorBasePtr sensor_ptr);
// StateBlock* getSensorPPtr() const;
// StateBlock* getSensorOPtr() const;
//
// /** \brief Call all the processors for this Capture
// */
// //virtual void process();
//>>>>>>> capture_passby_sensor
};
}
......
......@@ -183,16 +183,12 @@ int main(int argc, char** argv)
// prc_image->process(capture_image_ptr);
// Preferred method with factory objects:
//<<<<<<< HEAD
image_ptr = make_shared<CaptureImage>(t, camera_ptr, frame[f % buffer_size]);
// image_ptr->process();
//=======
// image_ptr = new CaptureImage(t, camera_ptr, frame[f % buffer_size]);
//image_ptr->process();
camera_ptr->addCapture(image_ptr);
//cv::imshow("test",frame[f % buffer_size]);
//>>>>>>> capture_passby_sensor
std::cout << "Time: " << ((double) clock() - t1) / CLOCKS_PER_SEC << "s" << std::endl;
wolf_problem_->print();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment