image tweaks and clean up

base_station/launch/image_test.launch

@@ -29,6 +29,7 @@
     <include file="$(find base_station)/launch/remote_image_test.launch">
       <arg name="machine_name" value="nerudaKube"/>
       <arg name="machine_id" value="0"/>
+      <arg name="video_stream_provider" value="99"/>
     </include>
 
 </launch>

base_station/launch/remote_image_test.launch

@@ -7,10 +7,11 @@
 <group ns="$(arg machine_name)">
 
   <!-- run viewer on base station laptop -->
-  <node name="imageNode" pkg="base_station" type="imageNode.py">
+  <node name="imageNode" pkg="base_station" type="imageNode.py" machine="$(arg machine_name)">
     <param name="visualize" type="bool" value="false"/>
     <param name="save" type="bool" value="true"/>
-    <param name="folderName" type="string" value="/home/ssher/imageDump"/>
+    <!-- from home dir -->
+    <param name="folderName" type="string" value="imageNFS"/>
   </node>
 
   <!-- run webcam stream on remote node -->
@@ -18,7 +19,7 @@
 
 	<arg name="camera_name" default="usb_camera" />
 	<!-- video_stream_provider can be a number as a video device or a url of a video stream -->
-	<arg name="video_stream_provider" default="0" />
+	<arg name="video_stream_provider" default="99" />
 	<!-- set camera fps to -->
 	<arg name="set_camera_fps" default="30" />
 	<!-- set buffer queue size of frame capturing to -->

base_station/launch/remote_vehicle.launch

@@ -57,7 +57,7 @@
   <!-- </group> -->
 
   <!-- gui interface and imaging nodes -->
-  <node pkg="dji_osdk_ros" type="image_activation.py" name="image_activation" output="screen" machine="$(arg machine_name)"/>
+  <node pkg="dji_osdk_ros" type="imageActivation.py" name="imageActivation" output="screen" machine="$(arg machine_name)"/>
   <node pkg="database_tools" type="sqlite_upload.py" name="sql_uploader"/>
   <node name="image_handler" pkg="database_tools" type="image_handler.py"/>
 

base_station/launch/remote_vehicle_yeats.launch

@@ -53,7 +53,7 @@
   <!-- </group> -->
 
   <!-- gui interface and imaging nodes -->
-  <node pkg="bus_driver" type="image_activation.py" name="image_activation" output="screen" machine="$(arg machine_name)"/>
+  <node pkg="bus_driver" type="imageActivation.py" name="imageActivation" output="screen" machine="$(arg machine_name)"/>
   <node pkg="database_tools" type="sqlite_upload_yeats.py" name="sql_uploader"/>
   <node name="image_handler" pkg="database_tools" type="image_handler.py"/>
   <!-- <node pkg="bus_driver" type="poseFeedbackConversion.py" name="poseFeedbackConversion" output="screen" machine="$(arg machine_name)">

base_station/scripts/imageNode.py

@@ -42,11 +42,13 @@ def main():
                     # print ("File exist")
                     if windowFlag:
                         cv2.imshow("image window", iv.image)
+                        rospy.loginfo("publishing image to window seq: " + iv.seq)
                     if saveFlag:
-                        cv2.imwrite(folderName + "/camera_image_{seq}.jpeg".format(seq = iv.seq), iv.image)
+                        cv2.imwrite("/home/" + getpass.getuser() + "/" folderName + "/camera_image_{seq}.jpeg".format(seq = iv.seq), iv.image)
+                        rospy.loginfo("saving image to folder: home-> " + folderName + "-> camera_image_{seq}.jpeg".format(seq = iv.seq) + " seq: " + str(iv.seq))
                     cv2.waitKey(10)
                 else:
-                    print ("File not exist")
+                    rospy.loginfo("camera dir missing!")
 
     # cv2.destroyAllWindows()