fix for lane_filter bug

ual-arm-ros-pkg · Nov 6, 2018 · b8ed1cf · b8ed1cf
1 parent 4b99a0c
commit b8ed1cf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -32,14 +32,3 @@ include Makefiles/Makefile.demos2017.mk
 include Makefiles/Makefile.megacity.mk
 
 
-# For Docker  
-
-branch=$(shell git rev-parse --abbrev-ref HEAD)
-
-name=duckietown/rpi-duckiebot-base:$(branch)
-
-main-docker-build:
-	docker build -t $(name) .
-
-main-docker-push:
-	docker push $(name)
diff --git a/catkin_ws/src/10-lane-control/lane_filter/src/lane_filter_node.py b/catkin_ws/src/10-lane-control/lane_filter/src/lane_filter_node.py
@@ -139,11 +139,6 @@ def processSegments(self,segment_list_msg):
         self.pub_belief_img.publish(belief_img)
 
 
-        def getDistributionImage(self, mat, stamp):
-            bridge = CvBridge()
-            img = bridge.cv2_to_imgmsg((255 * mat).astype('uint8'), "mono8")
-            img.header.stamp = stamp
-            return img
 
         # Latency of Estimation including curvature estimation
         estimation_latency_stamp = rospy.Time.now() - timestamp_now
@@ -165,6 +160,13 @@ def getDistributionImage(self, mat, stamp):
         in_lane_msg.data = True #TODO change with in_lane
         self.pub_in_lane.publish(in_lane_msg)
 
+    def getDistributionImage(self, mat, stamp):
+        bridge = CvBridge()
+        img = bridge.cv2_to_imgmsg((255 * mat).astype('uint8'), "mono8")
+        img.header.stamp = stamp
+        return img
+
+
     def cbMode(self, msg):
         return #TODO adjust self.active