Commit c6fbdcbc authored by Marius's avatar Marius

asd

parent ddd662f1
......@@ -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&#10;&#10;# Conflicts:&#10;#&#9;src/er1_driver_node/main.cpp&#10;#&#9;src/point_processing_node/main.cpp&#10;#&#9;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="265">
<caret line="72" column="39" selection-start-line="72" selection-start-column="39" selection-end-line="72" selection-end-column="39" />
<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>
......@@ -173,11 +170,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/include/comon/rosbaghelper.hpp">
<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="570">
<caret line="38" lean-forward="true" selection-start-line="38" selection-end-line="38" />
<folding>
<element signature="e#14#31#0" expanded="true" />
</folding>
......@@ -197,11 +194,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<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="51" selection-end-line="53" selection-end-column="113" />
<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#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="12197000" />
<workItem from="1548324069461" duration="12290000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="118931000" />
<option name="totallyTimeSpent" value="119024000" />
</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.cpp">
<entry file="file://$PROJECT_DIR$/include/comon/rosbaghelper.hpp">
<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="39" selection-end-line="72" selection-end-column="39" />
<state relative-caret-position="570">
<caret line="38" lean-forward="true" selection-start-line="38" 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.hpp">
<entry file="file://$PROJECT_DIR$/src/image_processing_node/main.cpp">
<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>
......
......@@ -71,7 +71,7 @@ void depthCallback(const sensor_msgs::ImageConstPtr imgPtr) {
}
}
cv::Mat sobel8Image = convert_16S1_to_8UC1(derivationImg);
cv::Mat sobel8Image = convert_16SC1_to_8UC1(derivationImg);
pubDepthSobel.publish(createImageMsg(sobel8Image));
......
......@@ -70,7 +70,7 @@ void depthCallback(const sensor_msgs::ImageConstPtr imgPtr) {
}
}
cv::Mat sobel8Image = convert_16S1_to_8UC1(derivationImg);
cv::Mat sobel8Image = convert_16SC1_to_8UC1(derivationImg);
pubDepthSobel.publish(createImageMsg(sobel8Image));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment