Merge branch 'GEAR' of https://github.com/EECS-467-W20-RRRobot-Project/RRRobot into GEAR

- Move new files into rrrobot_ws in root src folder

docker_env/gear/Dockerfile

@@ -70,4 +70,7 @@ RUN sudo apt-get update && \
         ros-melodic-moveit-ros-visualization \
         ros-melodic-moveit-simple-controller-manager
 
+RUN pip3 install pyyaml
+RUN pip3 install rospkg
+
 CMD ["/bin/bash"]

src/rrrobot_ws/src/gazebo_models/model_mappings.txt

@@ -1,3 +1,3 @@
-square_trash_can,unit_box/image.jpg,plastic
+square_trash_can,/app/rrrobot_ws/src/gazebo_models/unit_box/image.png,plastic
-unit_box,unit_box/image.jpg,plastic
+unit_box,/app/rrrobot_ws/src/gazebo_models/unit_box/image.png,plastic
-plastic_bottle,plastic_bottle/image.jpg,plastic
+plastic_bottle,/app/rrrobot_ws/src/gazebo_models/plastic_bottle/images/plastic-bottle-1.jpg,plastic

src/rrrobot_ws/src/rrrobot/src/cv_model.py

@@ -26,6 +26,7 @@ class Model_v1(nn.Module):
 
 def call_back(filename):
     # prepare input file
+    filename = filename.data
     input_image = Image.open(filename)
     input_image = input_image.resize((512, 384))
     # print(input_image.size)
@@ -49,24 +50,26 @@ def call_back(filename):
     print('type: ', type_dict[predicted_label])
 
     # publish a message, name of this node is 'cv_model'
-    ​pub = rospy.Publisher('cv_model', String, queue_size=10)
+    pub = rospy.Publisher('cv_model', String, queue_size=10)
-​    ​rospy.init_node('talker', anonymous=True)
+    # rospy.init_node('talker', anonymous=True)
-​    ​rate = rospy.Rate(10) # 10hz
+    rate = rospy.Rate(10) # 10hz
 
-    ​garbage_type = type_dict[predicted_label]
+    garbage_type = type_dict[predicted_label]
-    ​rospy.loginfo(filename + ':' + garbage_type)
+    rospy.loginfo(filename + ':' + garbage_type)
-    ​pub.publish(filename + ':' + garbage_type)
+    pub.publish(filename + ':' + garbage_type)
-    ​rate.sleep()
+    rate.sleep()
 
 
 def listener():
-    rospy.init_node('listener', anonymous=True)
+    # rospy.init_node('listener', anonymous=True)
-    rospy.Subscriber('/ariac/logical_camera_1', String, callback)
+    rospy.Subscriber('/current_image', String, call_back)
     # spin() simply keeps python from exiting until this node is stopped
     rospy.spin()
 
 
 if __name__ == '__main__':
+    rospy.init_node('cv_node')
+    
     # prepare pretrained model
     model = Model_v1()
     model.load_state_dict(torch.load('v1_0.001.pt', map_location='cpu'))

src/rrrobot_ws/src/rrrobot/src/object_spawner_node.cpp

@@ -8,6 +8,7 @@
 
 #include <osrf_gear/VacuumGripperState.h>
 #include <geometry_msgs/Point.h>
+#include <std_msgs/String.h>
 #include "rrrobot/model_insertion.h"
 #include <kdl/frames.hpp>
 
@@ -25,7 +26,8 @@ public:
         // DEFAULT_SPAWN_POINT.x = 0.2516105;
         // DEFAULT_SPAWN_POINT.y = 5.474367;
         // DEFAULT_SPAWN_POINT.z = 0.935669;
-        pub = nh.advertise<rrrobot::model_insertion>("/object_to_load", 1000);
+        model_pub = nh.advertise<rrrobot::model_insertion>("/object_to_load", 1000);
+        image_pub = nh.advertise<std_msgs::String>("/current_image", 1000);
         sub = nh.subscribe("/ariac/arm1/gripper/state", 1000, &ObjectSpawner::objectPlacedCallback, this);
         srand(time(NULL));
         read_in_items(model_file);
@@ -51,13 +53,21 @@ public:
     }
 
 private:
+    struct ObjectMapping
+    {
+        std::string model_name;
+        std::string image_file;
+        std::string correct_classification;
+    };
+
     const KDL::Vector DEFAULT_SPAWN_POINT;
     const float CONVEYOR_WIDTH;
     ros::NodeHandle nh;
-    ros::Publisher pub;
+    ros::Publisher model_pub;
+    ros::Publisher image_pub;
     ros::Subscriber sub;
-    std::vector<std::string> models; // TODO: just string? or do we need
+    std::vector<ObjectMapping> models; // TODO: just string? or do we need
-                                     //to store the correct classification too?
+                                       //to store the correct classification too?
 
     void read_in_items(const std::string &model_file)
     {
@@ -67,10 +77,13 @@ private:
         {
             // cout << "cur: " << cur << " cur.find(,): " << cur.find(",") << endl;
             // line format: model_name, image_file, model_classification
-            std::string model_name = cur.substr(0, cur.find(","));
+            ObjectMapping cur_model;
-            // cur.erase(0, s.find(",") + 1);
+            cur_model.model_name = cur.substr(0, cur.find(","));
-            // cur.erase(0, s.find(",") + 1);
+            cur.erase(0, cur.find(",") + 1);
-            models.push_back(model_name);
+            cur_model.image_file = cur.substr(0, cur.find(","));
+            cur.erase(0, cur.find(",") + 1);
+            cur_model.correct_classification = cur;
+            models.push_back(cur_model);
         }
     }
 
@@ -79,9 +92,11 @@ private:
         if (ros::ok())
         {
             rrrobot::model_insertion msg;
+            std_msgs::String image_file_msg;
 
             int rand_idx = rand() % models.size();
-            msg.model_name = models[rand_idx];
+            msg.model_name = models[rand_idx].model_name;
+            image_file_msg.data = models[rand_idx].image_file;
             cout << "Spawning " << msg.model_name << endl;
 
             // TODO: Determine position to spawn items
@@ -94,7 +109,8 @@ private:
             msg.pose.position.y = DEFAULT_SPAWN_POINT.y();
             msg.pose.position.z = DEFAULT_SPAWN_POINT.z() + 1.0;
 
-            pub.publish(msg);
+            model_pub.publish(msg);
+            image_pub.publish(image_file_msg);
             ros::spinOnce();
         }
     }