Renamed or_interactivemarker to or_rviz.

Michael Koval · Michael Koval · commit ee1bd0881906 · 2015-02-17T20:58:00.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.4.6)
-project(or_interactivemarker)
+project(or_rviz)
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
 find_package(catkin REQUIRED COMPONENTS
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# or_interactivemarker #
+# or_rviz #
 
-**or_interactivemarker** is an OpenRAVE plugin that provides two ROS-friendly OpenRAVE
+**or_rviz** is an OpenRAVE plugin that provides two ROS-friendly OpenRAVE
 viewers that publish an OpenRAVE environment as
 [interactive markers](http://wiki.ros.org/interactive_markers)
 to be visualized in
@@ -19,12 +19,12 @@ to be visualized in
 > ROS Groovy or Hydro, you must checkout and build the `indigo-devel` branch of
 > `interactive_markers`.**
 
-**or_interactivemarker** is a ROS package that can be installed into any ROS
+**or_rviz** is a ROS package that can be installed into any ROS
 Catkin workspace.  It requires the helper package
 [`openrave_catkin`](https://github.com/personalrobotics/openrave_catkin) to be
 automatically added to the `OPENRAVE_PLUGIN` path.
 
-You can try running `rosrun or_interactivemarker test.py` to test your
+You can try running `rosrun or_rviz test.py` to test your
 installation. This script loads the `wamtest1.env.xml` environment, which is
 one of the default environments shipped with OpenRAVE, into the `RViz`
 in-process viewer.
@@ -105,7 +105,7 @@ The following functions are unimplemented:
 
 ## Brief Overview of Features ##
 
-or_interactivemarker publishes a separate `InteractiveMarker` for each of a
+or_rviz publishes a separate `InteractiveMarker` for each of a
 robot's links. You can right click on any link of a robot to access the
 following functionality:
 
@@ -143,9 +143,9 @@ You may get the following error message when running a standalone RViz instance
 after using the in-process viewer:
 
 > [ERROR] PluginlibFactory: The plugin for class
-> 'or_interactivemarker::rviz::EnvironmentDisplay' failed to load.  Error:
+> 'or_rviz::rviz::EnvironmentDisplay' failed to load.  Error:
 > Could not find library corresponding to plugin
-> or_interactivemarker::rviz::EnvironmentDisplay. Make sure the plugin
+> or_rviz::rviz::EnvironmentDisplay. Make sure the plugin
 > description XML file has the correct name of the library and that the library
 > actually exists.
 
@@ -157,20 +157,20 @@ prevent this error from printing in the future by deleting the offending
 `EnvironmentDisplay` component from RViz and re-saving your configuration.
 
 We are interested in finding a more elegant workaround for this problem. Please
-[open an issue](https://github.com/personalrobotics/or_interactivemarker/issues) or
-[send us a pull request](https://github.com/personalrobotics/or_interactivemarker/compare)
+[open an issue](https://github.com/personalrobotics/or_rviz/issues) or
+[send us a pull request](https://github.com/personalrobotics/or_rviz/compare)
 if you have any suggestions.
 
 
 ## License ##
 
-or_interactivemarker is licensed under a BSD license. See [LICENSE](LICENSE) for more
+or_rviz is licensed under a BSD license. See [LICENSE](LICENSE) for more
 information.
 
 
 ## Contributors ##
 
-or_interactivemarker is developed by the
+or_rviz is developed by the
 [Personal Robotics Lab](https://personalrobotics.ri.cmu.edu) in the [Robotics
 Institute](https://www.ri.cmu.edu) at [Carnegie Mellon
 University](http://www.cmu.edu). The out-of-process `InteractiveMarker` viewer
diff --git a/include/or_rviz/InteractiveMarkerViewer.h b/include/or_rviz/InteractiveMarkerViewer.h
@@ -38,7 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "markers/KinBodyMarker.h"
 #include "util/InteractiveMarkerGraphHandle.h"
 
-namespace or_interactivemarker {
+namespace or_rviz {
 
 class InteractiveMarkerViewer : public OpenRAVE::ViewerBase {
 public:
diff --git a/include/or_rviz/RVizViewer.h b/include/or_rviz/RVizViewer.h
@@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "rviz/EnvironmentDisplay.h"
 #include "InteractiveMarkerViewer.h"
 
-namespace or_interactivemarker {
+namespace or_rviz {
 
 namespace detail {
 
diff --git a/include/or_rviz/markers/JointMarker.h b/include/or_rviz/markers/JointMarker.h
@@ -34,7 +34,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <openrave/openrave.h>
 #include <interactive_markers/interactive_marker_server.h>
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace markers {
 
 class JointMarker;
diff --git a/include/or_rviz/markers/KinBodyJointMarker.h b/include/or_rviz/markers/KinBodyJointMarker.h
@@ -35,7 +35,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <interactive_markers/interactive_marker_server.h>
 #include "JointMarker.h"
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace markers {
 
 class KinBodyJointMarker;
diff --git a/include/or_rviz/markers/KinBodyLinkMarker.h b/include/or_rviz/markers/KinBodyLinkMarker.h
@@ -34,7 +34,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <interactive_markers/interactive_marker_server.h>
 #include "LinkMarker.h"
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace markers {
 
 class KinBodyLinkMarker;
diff --git a/include/or_rviz/markers/KinBodyMarker.h b/include/or_rviz/markers/KinBodyMarker.h
@@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "KinBodyJointMarker.h"
 #include "ManipulatorMarker.h"
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace markers {
 
 class KinBodyMarker;
diff --git a/include/or_rviz/markers/LinkMarker.h b/include/or_rviz/markers/LinkMarker.h
@@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <interactive_markers/menu_handler.h>
 #include <interactive_markers/interactive_marker_server.h>
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace markers {
 
 class LinkMarker;
diff --git a/include/or_rviz/markers/ManipulatorMarker.h b/include/or_rviz/markers/ManipulatorMarker.h
@@ -37,7 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "LinkMarker.h"
 #include "JointMarker.h"
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace markers {
 
 class ManipulatorMarker;
diff --git a/include/or_rviz/rviz/EnvironmentDisplay.h b/include/or_rviz/rviz/EnvironmentDisplay.h
@@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <rviz/properties/tf_frame_property.h>
 #include <openrave/openrave.h>
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace rviz {
 
 class EnvironmentDisplay : public ::rviz::Display
diff --git a/include/or_rviz/rviz/KinBodyDisplay.h b/include/or_rviz/rviz/KinBodyDisplay.h
diff --git a/include/or_rviz/rviz/KinBodyVisual.h b/include/or_rviz/rviz/KinBodyVisual.h
diff --git a/include/or_rviz/rviz/LinkVisual.h b/include/or_rviz/rviz/LinkVisual.h
diff --git a/include/or_rviz/util/InteractiveMarkerGraphHandle.h b/include/or_rviz/util/InteractiveMarkerGraphHandle.h
@@ -4,7 +4,7 @@
 #include <openrave/openrave.h>
 #include <interactive_markers/interactive_marker_server.h>
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace util {
 
 class InteractiveMarkerGraphHandle : public OpenRAVE::GraphHandle {
diff --git a/include/or_rviz/util/ScopedConnection.h b/include/or_rviz/util/ScopedConnection.h
@@ -3,7 +3,7 @@
 #include <boost/signals2.hpp>
 #include <openrave/openrave.h>
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace util {
 
 class ScopedConnection : public OpenRAVE::UserData {
diff --git a/include/or_rviz/util/ogre_conversions.h b/include/or_rviz/util/ogre_conversions.h
@@ -36,7 +36,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <geometry_msgs/Pose.h>
 #include <openrave/geometry.h>
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace util {
 
 template <class Scalar>
diff --git a/include/or_rviz/util/ros_conversions.h b/include/or_rviz/util/ros_conversions.h
@@ -38,7 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <geometry_msgs/Vector3.h>
 #include <openrave/openrave.h>
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace util {
 
 extern std::string const kDefaultWorldFrameId;
diff --git a/package.xml b/package.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0"?>
 <package format="2">
-  <name>or_interactivemarker</name>
+  <name>or_rviz</name>
   <version>0.1.0</version>
   <description>
     OpenRAVE viewer plugin that publishes the environment as InteractiveMarkers
     that can be visualized in RViz.
   </description>
-  <url type="repository">https://github.com/mkoval/or_interactivemarker</url>
+  <url type="website">https://github.com/mkoval/or_rviz</url>
+  <url type="repository">https://github.com/mkoval/or_rviz.git</url>
+  <url type="bugtracker">https://github.com/mkoval/or_rviz/issues</url>
   <maintainer email="mkoval@cs.cmu.edu">Michael Koval</maintainer>
   <author email="mkoval@cs.cmu.edu">Michael Koval</author>
   <author email="mklingen@cs.cmu.edu">Matthew Klingensmith</author>
diff --git a/plugins.xml b/plugins.xml
@@ -1,5 +1,5 @@
-<library path="lib/or_interactivemarker_rviz">
-    <class type="or_interactivemarker::rviz::EnvironmentDisplay"
+<library path="lib/or_rviz_rviz">
+    <class type="or_rviz::rviz::EnvironmentDisplay"
            base_class_type="rviz::Display">
         <description>
             Display information about an OpenRAVE environment.
diff --git a/src/InteractiveMarkerViewer.cpp b/src/InteractiveMarkerViewer.cpp
@@ -45,15 +45,15 @@ using visualization_msgs::InteractiveMarkerPtr;
 using OpenRAVE::KinBodyPtr;
 using OpenRAVE::GraphHandlePtr;
 
-using namespace or_interactivemarker::markers;
-using namespace or_interactivemarker::util;
+using namespace or_rviz::markers;
+using namespace or_rviz::util;
 
 typedef boost::shared_ptr<interactive_markers::InteractiveMarkerServer> InteractiveMarkerServerPtr;
 
 static double const kRefreshRate = 30;
 static double const kWidthScaleFactor = 100;
 
-namespace or_interactivemarker {
+namespace or_rviz {
 
 namespace {
 
diff --git a/src/RVizViewer.cpp b/src/RVizViewer.cpp
@@ -56,7 +56,7 @@ static std::string const kOffscreenCameraName = "OffscreenCamera";
 static std::string const kInteractiveMarkersDisplayName = "OpenRAVE Markers";
 static std::string const kEnvironmentDisplayName = "OpenRAVE Environment";
 
-namespace or_interactivemarker {
+namespace or_rviz {
 
 /*
  * Helpers
@@ -479,7 +479,7 @@ rviz::EnvironmentDisplay *RVizViewer::InitializeEnvironmentDisplay(
 {
     auto *const display =
         detail::getOrCreateDisplay<rviz::EnvironmentDisplay>(
-            rviz_manager_, "or_interactivemarker::rviz::EnvironmentDisplay",
+            rviz_manager_, "or_rviz::rviz::EnvironmentDisplay",
             kEnvironmentDisplayName, true);
 
     display->set_environment(env);
diff --git a/src/markers/JointMarker.cpp b/src/markers/JointMarker.cpp
@@ -46,12 +46,12 @@ using OpenRAVE::dReal;
 using OpenRAVE::KinBody;
 using OpenRAVE::KinBodyPtr;
 
-using namespace or_interactivemarker::util;
+using namespace or_rviz::util;
 
 typedef boost::shared_ptr<InteractiveMarkerServer> InteractiveMarkerServerPtr;
 typedef OpenRAVE::KinBody::JointPtr JointPtr;
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace markers {
 
 JointMarker::JointMarker(InteractiveMarkerServerPtr server, JointPtr joint)
diff --git a/src/markers/KinBodyJointMarker.cpp b/src/markers/KinBodyJointMarker.cpp
@@ -38,7 +38,7 @@ using OpenRAVE::KinBodyPtr;
 typedef boost::shared_ptr<InteractiveMarkerServer> InteractiveMarkerServerPtr;
 typedef OpenRAVE::KinBody::JointPtr JointPtr;
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace markers {
 
 KinBodyJointMarker::KinBodyJointMarker(InteractiveMarkerServerPtr server, JointPtr joint)
diff --git a/src/markers/KinBodyLinkMarker.cpp b/src/markers/KinBodyLinkMarker.cpp
@@ -35,7 +35,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 using interactive_markers::MenuHandler;
 using visualization_msgs::InteractiveMarkerFeedbackConstPtr;
 
-using namespace or_interactivemarker::util;
+using namespace or_rviz::util;
 
 typedef OpenRAVE::KinBody::LinkPtr LinkPtr;
 typedef OpenRAVE::KinBody::LinkInfo LinkInfo;
@@ -54,7 +54,7 @@ static bool CheckStateToBool(MenuHandler::CheckState const &state)
     return state == MenuHandler::CHECKED;
 }
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace markers {
 
 KinBodyLinkMarker::KinBodyLinkMarker(boost::shared_ptr<interactive_markers::InteractiveMarkerServer> server,
diff --git a/src/markers/KinBodyMarker.cpp b/src/markers/KinBodyMarker.cpp
@@ -54,15 +54,15 @@ using visualization_msgs::InteractiveMarkerFeedbackConstPtr;
 using interactive_markers::InteractiveMarkerServer;
 using interactive_markers::MenuHandler;
 
-using namespace or_interactivemarker::util;
+using namespace or_rviz::util;
 
 typedef OpenRAVE::KinBody::LinkPtr LinkPtr;
 typedef OpenRAVE::KinBody::JointPtr JointPtr;
 typedef OpenRAVE::RobotBase::ManipulatorPtr ManipulatorPtr;
 typedef boost::shared_ptr<InteractiveMarkerServer> InteractiveMarkerServerPtr;
 typedef MenuHandler::EntryHandle EntryHandle;
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace markers {
 
 // TODO: Move this to a helper header.
diff --git a/src/markers/LinkMarker.cpp b/src/markers/LinkMarker.cpp
@@ -58,15 +58,15 @@ using visualization_msgs::InteractiveMarkerControl;
 using visualization_msgs::InteractiveMarkerFeedbackConstPtr;
 using interactive_markers::InteractiveMarkerServer;
 
-using namespace or_interactivemarker::util;
+using namespace or_rviz::util;
 
 typedef OpenRAVE::KinBody::LinkPtr LinkPtr;
 typedef boost::shared_ptr<OpenRAVE::TriMesh> TriMeshPtr;
 typedef OpenRAVE::RobotBase::ManipulatorPtr ManipulatorPtr;
 typedef OpenRAVE::KinBody::Link::GeometryPtr GeometryPtr;
 typedef boost::shared_ptr<InteractiveMarkerServer> InteractiveMarkerServerPtr;
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace markers {
 
 OpenRAVE::Vector const LinkMarker::kCollisionColor(0.0, 0.0, 1.0, 0.5);
diff --git a/src/markers/ManipulatorMarker.cpp b/src/markers/ManipulatorMarker.cpp
@@ -48,7 +48,7 @@ using OpenRAVE::RobotBasePtr;
 using OpenRAVE::KinBody;
 using OpenRAVE::IkSolverBasePtr;
 
-using namespace or_interactivemarker::util;
+using namespace or_rviz::util;
 
 typedef OpenRAVE::RobotBase::RobotStateSaver RobotStateSaver;
 
@@ -66,7 +66,7 @@ typedef OpenRAVE::RobotBase::ManipulatorInfoConstPtr ManipulatorInfoConstPtr;
 typedef OpenRAVE::RobotBase::AttachedSensorInfo AttachedSensorInfo;
 typedef OpenRAVE::RobotBase::AttachedSensorInfoConstPtr AttachedSensorInfoConstPtr;
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace markers {
 
 OpenRAVE::Vector const ManipulatorMarker::kValidColor(0, 1, 0, 0.4);
diff --git a/src/plugin.cpp b/src/plugin.cpp
@@ -51,7 +51,7 @@ InterfaceBasePtr CreateInterfaceValidated(
         InterfaceType type, std::string const &interfacename,
         std::istream & sinput, EnvironmentBasePtr env)
 {
-    using namespace or_interactivemarker;
+    using namespace or_rviz;
 
     if (type == PT_Viewer && (interfacename == "interactivemarker"
                            || interfacename == "rviz")) {
diff --git a/src/rviz/EnvironmentDisplay.cpp b/src/rviz/EnvironmentDisplay.cpp
@@ -41,7 +41,7 @@ using boost::lexical_cast;
 
 static QString const kDefaultFrame = "map";
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace rviz {
 
 EnvironmentDisplay::EnvironmentDisplay()
@@ -193,5 +193,4 @@ void EnvironmentDisplay::BodyCallback(OpenRAVE::KinBodyPtr body, int flag)
 
 // Tell pluginlib about this class.  It is important to do this in
 // global scope, outside our package's namespace.
-PLUGINLIB_EXPORT_CLASS(or_interactivemarker::rviz::EnvironmentDisplay,
-                       ::rviz::Display)
+PLUGINLIB_EXPORT_CLASS(or_rviz::rviz::EnvironmentDisplay, ::rviz::Display)
diff --git a/src/util/InteractiveMarkerGraphHandle.cpp b/src/util/InteractiveMarkerGraphHandle.cpp
@@ -3,7 +3,7 @@
 
 using visualization_msgs::InteractiveMarkerPtr;
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace util {
 
 InteractiveMarkerGraphHandle::InteractiveMarkerGraphHandle(
diff --git a/src/util/ScopedConnection.cpp b/src/util/ScopedConnection.cpp
@@ -1,6 +1,6 @@
 #include "util/ScopedConnection.h"
 
-namespace or_interactivemarker {
+namespace or_rviz {
 namespace util {
 
 ScopedConnection::ScopedConnection(boost::signals2::connection const &connection)
diff --git a/src/util/ogre_conversions.cpp b/src/util/ogre_conversions.cpp
diff --git a/src/util/ros_conversions.cpp b/src/util/ros_conversions.cpp

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ InterfaceBasePtr CreateInterfaceValidated(`
`51`	`51`	`InterfaceType type, std::string const &interfacename,`
`52`	`52`	`std::istream & sinput, EnvironmentBasePtr env)`
`53`	`53`	`{`
`54`		`- using namespace or_interactivemarker;`
	`54`	`+ using namespace or_rviz;`
`55`	`55`
`56`	`56`	`if (type == PT_Viewer && (interfacename == "interactivemarker"`
`57`	`57`	`\|\| interfacename == "rviz")) {`