Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
wolf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile_robotics
wolf_projects
wolf_lib
wolf
Commits
c46b8e64
Commit
c46b8e64
authored
8 years ago
by
Joan Solà Ortega
Browse files
Options
Downloads
Patches
Plain Diff
Remove old commented garbish
parent
96f19280
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/capture_base.cpp
+0
-21
0 additions, 21 deletions
src/capture_base.cpp
src/capture_base.h
+0
-19
0 additions, 19 deletions
src/capture_base.h
src/examples/test_image.cpp
+0
-4
0 additions, 4 deletions
src/examples/test_image.cpp
with
0 additions
and
44 deletions
src/capture_base.cpp
+
0
−
21
View file @
c46b8e64
...
...
@@ -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
)
{
...
...
This diff is collapsed.
Click to expand it.
src/capture_base.h
+
0
−
19
View file @
c46b8e64
...
...
@@ -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
};
}
...
...
This diff is collapsed.
Click to expand it.
src/examples/test_image.cpp
+
0
−
4
View file @
c46b8e64
...
...
@@ -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
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment