Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
PeTrack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pedestrian Dynamics Empiricism
PeTrack
Commits
e669887a
Commit
e669887a
authored
4 years ago
by
d.kilic
Browse files
Options
Downloads
Plain Diff
Merge branch '74-debout-path-name' into 'master'
Resolve "debout path name" Closes
#74
See merge request
!51
parents
f675dd6f
9f6b2d96
No related branches found
No related tags found
1 merge request
!51
Resolve "debout path name"
Pipeline
#25787
passed
4 years ago
Stage: build_environment
Stage: build
Stage: test
Changes
2
Pipelines
9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/helper.h
+13
-1
13 additions, 1 deletion
include/helper.h
src/recognition.cpp
+0
-2
0 additions, 2 deletions
src/recognition.cpp
with
13 additions
and
3 deletions
include/helper.h
+
13
−
1
View file @
e669887a
...
...
@@ -14,11 +14,23 @@ extern QString commandLineOptionsString;
// stefans ansatz steht in svt_system (nicht besser); noetig: #include "imagehlp.h"
// this ausserhalb von objekt nicht verfuegbar: #define debout cout << typeid(this).name() << "." << __func__ << " in " << __FILE__ << " line " << __LINE__ << ": "
constexpr
const
char
*
file_name
(
const
char
*
path
)
{
const
char
*
file
=
path
;
while
(
*
path
)
{
const
char
current
=
*
path
;
++
path
;
if
(
current
==
'/'
||
current
==
'\\'
)
{
file
=
path
;
}
}
return
file
;
}
// gleiche Variable wie QT benutzt, es gibt auch noch QT_NO_DEBUG and QT_NO_WARNING_OUTPUT
#ifdef QT_NO_DEBUG_OUTPUT
#define debout //
#else
#define debout std::cout << __func__ << " in " << __FILE__ << " line " << __LINE__ << ": "
#define debout std::cout << __func__ << " in " <<
file_name(
__FILE__
)
<< " line " << __LINE__ << ": "
#endif
#include
<iostream>
...
...
This diff is collapsed.
Click to expand it.
src/recognition.cpp
+
0
−
2
View file @
e669887a
...
...
@@ -1181,9 +1181,7 @@ void findCodeMarker(Mat &img, QList<TrackPoint> *crossList, Control *controlWidg
debout
<<
"start detectCodeMarkers : "
<<
getElapsedTime
()
<<
endl
;
#endif
//debout << "XXX: " << img.locateROI();
aruco
::
detectMarkers
(
img
/*copy.clone()*/
,
dictionary
,
corners
,
ids
,
detectorParams
,
rejected
);
debout
<<
"findCodeMarker: dictID: "
<<
codeMarkerWidget
->
dictList
->
currentIndex
()
<<
endl
;
// used dictionary
#ifdef TIME_MEASUREMENT
// "==========: "
...
...
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