Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Marius Bock
crs
Commits
c6fbdcbc
Commit
c6fbdcbc
authored
Jan 24, 2019
by
Marius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
asd
parent
ddd662f1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
30 deletions
+27
-30
.idea/workspace.xml
.idea/workspace.xml
+25
-28
src/image_processing_node/main.cpp
src/image_processing_node/main.cpp
+1
-1
src/image_processing_node_student/main.cpp
src/image_processing_node_student/main.cpp
+1
-1
No files found.
.idea/workspace.xml
View file @
c6fbdcbc
...
...
@@ -134,9 +134,6 @@
</component>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"70f5d2b5-e1c9-415f-bbb3-eae2e165b096"
name=
"Default Changelist"
comment=
"Merge branch 'master' of https://fsstud.is.uni-due.de:8090/sfmabock/crs # Conflicts: #	src/er1_driver_node/main.cpp #	src/point_processing_node/main.cpp #	src/point_processing_node_student/main.cpp"
>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/include/comon/rosbaghelper.hpp"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/include/comon/rosbaghelper.hpp"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/comon/rosbaghelper.cpp"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/comon/rosbaghelper.cpp"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/image_processing_node/main.cpp"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/image_processing_node/main.cpp"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/src/image_processing_node_student/main.cpp"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/src/image_processing_node_student/main.cpp"
afterDir=
"false"
/>
</list>
...
...
@@ -155,8 +152,8 @@
<file
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/src/image_processing_node_student/main.cpp"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"2
65
"
>
<caret
line=
"7
2
"
column=
"
39
"
selection-start-line=
"7
2
"
selection-start-column=
"
39
"
selection-end-line=
"7
2
"
selection-end-column=
"
39
"
/>
<state
relative-caret-position=
"2
80
"
>
<caret
line=
"7
0
"
column=
"
5"
lean-forward=
"true
"
selection-start-line=
"7
0
"
selection-start-column=
"
5
"
selection-end-line=
"7
0
"
selection-end-column=
"
5
"
/>
<folding>
<element
signature=
"e#0#20#0"
expanded=
"true"
/>
</folding>
...
...
@@ -173,11 +170,11 @@
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/include/comon/rosbaghelper.hpp"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"5
4
0"
>
<caret
line=
"3
6"
column=
"20"
selection-start-line=
"36
"
selection-start-
column=
"20
"
selection-end-line=
"3
6"
selection-end-column=
"20
"
/>
<state
relative-caret-position=
"5
7
0"
>
<caret
line=
"3
8"
lean-forward=
"true
"
selection-start-
line=
"38
"
selection-end-line=
"3
8
"
/>
<folding>
<element
signature=
"e#14#31#0"
expanded=
"true"
/>
</folding>
...
...
@@ -197,11 +194,11 @@
</provider>
</entry>
</file>
<file
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
pinned=
"false"
current-in-tab=
"
tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/src/image_processing_node/main.cpp"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
331
"
>
<caret
line=
"
51
"
selection-start-line=
"
5
1"
selection-end-line=
"
53
"
selection-end-column=
"
113
"
/>
<state
relative-caret-position=
"
235
"
>
<caret
line=
"
71"
column=
"5"
lean-forward=
"true
"
selection-start-line=
"
7
1"
selection-start-column=
"5"
selection-end-line=
"
71
"
selection-end-column=
"
5
"
/>
<folding>
<element
signature=
"e#0#20#0"
expanded=
"true"
/>
</folding>
...
...
@@ -275,9 +272,9 @@
<option
value=
"$PROJECT_DIR$/CMakeLists.txt"
/>
<option
value=
"$PROJECT_DIR$/src/point_processing_node/main.cpp"
/>
<option
value=
"$PROJECT_DIR$/src/comon/rosbaghelper.cpp"
/>
<option
value=
"$PROJECT_DIR$/src/image_processing_node/main.cpp"
/>
<option
value=
"$PROJECT_DIR$/src/image_processing_node_student/main.cpp"
/>
<option
value=
"$PROJECT_DIR$/include/comon/rosbaghelper.hpp"
/>
<option
value=
"$PROJECT_DIR$/src/image_processing_node_student/main.cpp"
/>
<option
value=
"$PROJECT_DIR$/src/image_processing_node/main.cpp"
/>
</list>
</option>
</component>
...
...
@@ -1137,18 +1134,18 @@
<workItem
from=
"1548150250653"
duration=
"27082000"
/>
<workItem
from=
"1548322288446"
duration=
"364000"
/>
<workItem
from=
"1548323225730"
duration=
"42000"
/>
<workItem
from=
"1548324069461"
duration=
"12
197
000"
/>
<workItem
from=
"1548324069461"
duration=
"12
290
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"11
8931
000"
/>
<option
name=
"totallyTimeSpent"
value=
"11
9024
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"1919"
y=
"0"
width=
"1922"
height=
"1175"
extended-state=
"6"
/>
<editor
active=
"true"
/>
<layout>
<window_info
active=
"true"
content_ui=
"combo"
id=
"Project"
order=
"0"
visible=
"true"
weight=
"0.31043664"
/>
<window_info
content_ui=
"combo"
id=
"Project"
order=
"0"
visible=
"true"
weight=
"0.31043664"
/>
<window_info
id=
"Structure"
order=
"1"
side_tool=
"true"
weight=
"0.25"
/>
<window_info
id=
"Favorites"
order=
"2"
side_tool=
"true"
/>
<window_info
anchor=
"bottom"
id=
"Message"
order=
"0"
/>
...
...
@@ -1159,7 +1156,7 @@
<window_info
anchor=
"bottom"
id=
"Inspection"
order=
"5"
weight=
"0.4"
/>
<window_info
anchor=
"bottom"
id=
"TODO"
order=
"6"
/>
<window_info
anchor=
"bottom"
id=
"Database Changes"
order=
"7"
/>
<window_info
anchor=
"bottom"
id=
"Messages"
order=
"8"
sideWeight=
"0.49574015"
visible=
"true"
weight=
"0.19179389"
/>
<window_info
active=
"true"
anchor=
"bottom"
id=
"Messages"
order=
"8"
sideWeight=
"0.49574015"
visible=
"true"
weight=
"0.19179389"
/>
<window_info
anchor=
"bottom"
id=
"Terminal"
order=
"9"
/>
<window_info
anchor=
"bottom"
id=
"Event Log"
order=
"10"
sideWeight=
"0.5042598"
side_tool=
"true"
visible=
"true"
weight=
"0.19179389"
/>
<window_info
anchor=
"bottom"
id=
"Version Control"
order=
"11"
/>
...
...
@@ -1444,22 +1441,22 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/src/image_processing_node/main.cpp"
>
<entry
file=
"file://$PROJECT_DIR$/src/image_processing_node
_student
/main.cpp"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
331
"
>
<caret
line=
"
51"
selection-start-line=
"51
"
selection-end-line=
"
53
"
selection-end-column=
"
113
"
/>
<state
relative-caret-position=
"
280
"
>
<caret
line=
"
70"
column=
"5"
lean-forward=
"true"
selection-start-line=
"70"
selection-start-column=
"5
"
selection-end-line=
"
70
"
selection-end-column=
"
5
"
/>
<folding>
<element
signature=
"e#0#20#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
src/image_processing_node_student/main.c
pp"
>
<entry
file=
"file://$PROJECT_DIR$/
include/comon/rosbaghelper.h
pp"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
265
"
>
<caret
line=
"
72"
column=
"39"
selection-start-line=
"72
"
selection-start-
column
=
"3
9
"
selection-end-line=
"
72"
selection-end-column=
"39
"
/>
<state
relative-caret-position=
"
570
"
>
<caret
line=
"
38"
lean-forward=
"true
"
selection-start-
line
=
"3
8
"
selection-end-line=
"
38
"
/>
<folding>
<element
signature=
"e#
0#20
#0"
expanded=
"true"
/>
<element
signature=
"e#
14#31
#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
...
...
@@ -1474,12 +1471,12 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
include/comon/rosbaghelper.h
pp"
>
<entry
file=
"file://$PROJECT_DIR$/
src/image_processing_node/main.c
pp"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
540
"
>
<caret
line=
"
36
"
column=
"
20
"
selection-start-line=
"
36
"
selection-start-column=
"
20
"
selection-end-line=
"
36
"
selection-end-column=
"
20
"
/>
<state
relative-caret-position=
"
235
"
>
<caret
line=
"
71
"
column=
"
5"
lean-forward=
"true
"
selection-start-line=
"
71
"
selection-start-column=
"
5
"
selection-end-line=
"
71
"
selection-end-column=
"
5
"
/>
<folding>
<element
signature=
"e#
14#31
#0"
expanded=
"true"
/>
<element
signature=
"e#
0#20
#0"
expanded=
"true"
/>
</folding>
</state>
</provider>
...
...
src/image_processing_node/main.cpp
View file @
c6fbdcbc
...
...
@@ -71,7 +71,7 @@ void depthCallback(const sensor_msgs::ImageConstPtr imgPtr) {
}
}
cv
::
Mat
sobel8Image
=
convert_16S1_to_8UC1
(
derivationImg
);
cv
::
Mat
sobel8Image
=
convert_16S
C
1_to_8UC1
(
derivationImg
);
pubDepthSobel
.
publish
(
createImageMsg
(
sobel8Image
));
...
...
src/image_processing_node_student/main.cpp
View file @
c6fbdcbc
...
...
@@ -70,7 +70,7 @@ void depthCallback(const sensor_msgs::ImageConstPtr imgPtr) {
}
}
cv
::
Mat
sobel8Image
=
convert_16S1_to_8UC1
(
derivationImg
);
cv
::
Mat
sobel8Image
=
convert_16S
C
1_to_8UC1
(
derivationImg
);
pubDepthSobel
.
publish
(
createImageMsg
(
sobel8Image
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment