remove any reference to the household database

Everything is being moved to object_recognition_ros_tabletop
wg-perception · Sep 23, 2014 · c446f51 · c446f51
1 parent 51330e6
commit c446f51
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 791 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 2.8)
 project(object_recognition_tabletop)
 
-find_package(catkin REQUIRED ecto cmake_modules household_objects_database
+find_package(catkin REQUIRED ecto cmake_modules
                              moveit_core object_recognition_core object_recognition_msgs opencv_candidate
-                             pluginlib rosconsole roscpp shape_msgs sql_database tf)
-catkin_package(INCLUDE_DIRS include)
+                             pluginlib rosconsole roscpp shape_msgs tf)
+catkin_package()
 
 # deal with Python
 catkin_python_setup()
@@ -34,13 +34,3 @@ ecto_sphinx(${CMAKE_CURRENT_SOURCE_DIR}/doc/source doc)
 install(DIRECTORY ${PROJECT_SOURCE_DIR}/conf
         DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
-
-# install the include folder
-install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/object_recognition_tabletop/
-        DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-)
-
-# install the plugin file
-install(FILES ${PROJECT_SOURCE_DIR}/db_plugin.xml
-        DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
-)
diff --git a/conf/detection.object.ork b/conf/detection.object.ork
@@ -27,10 +27,6 @@ pipeline2:
   parameters:
     object_ids: 'REDUCED_MODEL_SET'
     db:
-      type: 'ObjectDbSqlHousehold'
-      host: 'wgs36'
-      port: 5432
-      user: 'willow'
-      password: 'willow'
-      name: 'household_objects'
-      module: 'object_recognition_tabletop'
+      type: CouchDB
+      root: http://localhost:5984
+      collection: object_recognition
diff --git a/conf/detection.object.ros.ork b/conf/detection.object.ros.ork
@@ -58,13 +58,6 @@ pipeline2:
     object_ids: 'all'
     tabletop_object_ids: 'REDUCED_MODEL_SET'
     db:
-#      type: 'ObjectDbSqlHousehold'
-#      host: 'wgs36'
-#      port: 5432
-#      user: 'willow'
-#      password: 'willow'
-#      name: 'household_objects'
-#      module: 'object_recognition_tabletop'
       type: CouchDB
       root: http://localhost:5984
       collection: object_recognition
diff --git a/db_plugin.xml b/db_plugin.xml
diff --git a/include/object_recognition_tabletop/household.h b/include/object_recognition_tabletop/household.h
diff --git a/package.xml b/package.xml
@@ -13,29 +13,21 @@
   <build_depend>assimp-dev</build_depend>
   <build_depend>cmake_modules</build_depend>
   <build_depend>ecto</build_depend>
-  <build_depend>household_objects_database</build_depend>
   <build_depend>moveit_core</build_depend>
   <build_depend>object_recognition_core</build_depend>
   <build_depend>object_recognition_msgs</build_depend>
   <build_depend>opencv_candidate</build_depend>
-  <build_depend>sql_database</build_depend>
-  <build_depend>tf</build_depend>
   <build_depend>pluginlib</build_depend>
+  <build_depend>tf</build_depend>
 
   <run_depend>assimp</run_depend>
   <run_depend>ecto</run_depend>
-  <run_depend>household_objects_database</run_depend>
   <run_depend>moveit_core</run_depend>
   <run_depend>object_recognition_core</run_depend>
   <run_depend>object_recognition_msgs</run_depend>
   <run_depend>opencv_candidate</run_depend>
-  <run_depend>sql_database</run_depend>
-  <run_depend>tf</run_depend>
   <run_depend>pluginlib</run_depend>
+  <run_depend>tf</run_depend>
 
   <buildtool_depend>catkin</buildtool_depend>
-
-  <export>
-    <object_recognition_core plugin="${prefix}/db_plugin.xml" />
-  </export>
 </package>
diff --git a/python/object_recognition_tabletop/db.py b/python/object_recognition_tabletop/db.py
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,3 +1,2 @@
-add_subdirectory(db)
 add_subdirectory(object)
 add_subdirectory(table)
diff --git a/src/db/CMakeLists.txt b/src/db/CMakeLists.txt
diff --git a/src/db/db_mesh.cpp b/src/db/db_mesh.cpp