From f60f996a2f3b701c2ed3bf7113cc6a372580ced1 Mon Sep 17 00:00:00 2001 From: Alopez <alopez@iri.upc.edu> Date: Tue, 21 Jul 2020 12:27:45 +0200 Subject: [PATCH] Adapted to las changes on sing_description launch files --- include/adc_signals.h | 2 +- spawn_signs.launch | 100 ------------------------------------------ src/adc_circuit.cpp | 1 - src/adc_signals.cpp | 3 +- 4 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 spawn_signs.launch diff --git a/include/adc_signals.h b/include/adc_signals.h index 37ee1e7..d1347b6 100644 --- a/include/adc_signals.h +++ b/include/adc_signals.h @@ -40,7 +40,7 @@ #define SEMAPHORE_TYPE "1000001" #define SEMAPHORE_MARKER "alvar15" -#define DEFAULT_REVERSE_ORIENTATION true +#define DEFAULT_REVERSE_ORIENTATION false /** * \struct Sign_urdf_info. * diff --git a/spawn_signs.launch b/spawn_signs.launch deleted file mode 100644 index ce10501..0000000 --- a/spawn_signs.launch +++ /dev/null @@ -1,100 +0,0 @@ -<?xml version="1.0"?> - -<launch> - <arg name="parent" default="map"/> - <arg name="rviz" default="false"/> - - - <include file="$(find sign_description)/launch/spawn.launch"> - <arg name="name" value="max_1008223688"/> - <arg name="model" value="sign"/> - <arg name="tag" value="alvar14"/> - <arg name="type" value="max_100"/> - <arg name="x" value="-785.318"/> - <arg name="y" value="-886.771"/> - <arg name="yaw" value="4.40075"/> - <arg name="parent" value="$(arg parent)"/> - <arg name="rviz" value="$(arg rviz)"/> - </include> - - - <include file="$(find sign_description)/launch/spawn.launch"> - <arg name="name" value="max_1008225686"/> - <arg name="model" value="sign"/> - <arg name="tag" value="alvar14"/> - <arg name="type" value="max_100"/> - <arg name="x" value="-806.912"/> - <arg name="y" value="-878.394"/> - <arg name="yaw" value="4.40068"/> - <arg name="parent" value="$(arg parent)"/> - <arg name="rviz" value="$(arg rviz)"/> - </include> - - - <include file="$(find sign_description)/launch/spawn.launch"> - <arg name="name" value="roadworks8986806"/> - <arg name="model" value="sign"/> - <arg name="tag" value="alvar12"/> - <arg name="type" value="roadworks"/> - <arg name="x" value="-837.75"/> - <arg name="y" value="-974.551"/> - <arg name="yaw" value="4.40369"/> - <arg name="parent" value="$(arg parent)"/> - <arg name="rviz" value="$(arg rviz)"/> - </include> - - - <include file="$(find sign_description)/launch/spawn.launch"> - <arg name="name" value="roadworks8986841"/> - <arg name="model" value="sign"/> - <arg name="tag" value="alvar12"/> - <arg name="type" value="roadworks"/> - <arg name="x" value="-817.618"/> - <arg name="y" value="-983.322"/> - <arg name="yaw" value="4.40372"/> - <arg name="parent" value="$(arg parent)"/> - <arg name="rviz" value="$(arg rviz)"/> - </include> - - - <include file="$(find sign_description)/launch/spawn.launch"> - <arg name="name" value="no_overtaking8225798"/> - <arg name="model" value="sign"/> - <arg name="tag" value="alvar8"/> - <arg name="type" value="no_overtaking"/> - <arg name="x" value="-688.818"/> - <arg name="y" value="-510.078"/> - <arg name="yaw" value="7.54412"/> - <arg name="parent" value="$(arg parent)"/> - <arg name="rviz" value="$(arg rviz)"/> - </include> - - - <include file="$(find sign_description)/launch/spawn.launch"> - <arg name="name" value="giveway8236721"/> - <arg name="model" value="sign"/> - <arg name="tag" value="alvar5"/> - <arg name="type" value="giveway"/> - <arg name="x" value="-232.499"/> - <arg name="y" value="-227.554"/> - <arg name="yaw" value="3.26183"/> - <arg name="parent" value="$(arg parent)"/> - <arg name="rviz" value="$(arg rviz)"/> - </include> - - - <include file="$(find sign_description)/launch/spawn.launch"> - <arg name="name" value="no_overtaking8223908"/> - <arg name="model" value="sign"/> - <arg name="tag" value="alvar8"/> - <arg name="type" value="no_overtaking"/> - <arg name="x" value="-672.01"/> - <arg name="y" value="-514.418"/> - <arg name="yaw" value="7.52419"/> - <arg name="parent" value="$(arg parent)"/> - <arg name="rviz" value="$(arg rviz)"/> - </include> - - -</launch> - diff --git a/src/adc_circuit.cpp b/src/adc_circuit.cpp index 6df6a81..380c83e 100644 --- a/src/adc_circuit.cpp +++ b/src/adc_circuit.cpp @@ -56,7 +56,6 @@ void CAdcCircuit::generate_spwan_launch_file(std::string &filename) oss << "<?xml version=\"1.0\"?>" << std::endl << std::endl; oss << "<launch>" << std::endl; oss << " <arg name=\"parent\" default=\"map\"/>" << std::endl; - oss << " <arg name=\"rviz\" default=\"false\"/>" << std::endl; std::ofstream out_file; out_file.open(filename.c_str(), std::ios_base::app); diff --git a/src/adc_signals.cpp b/src/adc_signals.cpp index 99a649d..898db52 100644 --- a/src/adc_signals.cpp +++ b/src/adc_signals.cpp @@ -199,7 +199,7 @@ void CAdcSignals::append_sign_spawn(std::string &filename) std::ostringstream oss; - oss << std::endl << " <include file=\"$(find sign_description)/launch/spawn.launch\">" << std::endl; + oss << std::endl << " <include file=\"$(find sign_description)/launch/spawn_sign.launch\">" << std::endl; oss << " <arg name=\"name\" value=\"" << it->second.type << this->id << "\"/>" << std::endl; oss << " <arg name=\"model\" value=\"" << (this->type == SEMAPHORE_TYPE ? "semaphore": "sign") << "\"/>" << std::endl; oss << " <arg name=\"tag\" value=\"" << it->second.marker << "\"/>" << std::endl; @@ -208,7 +208,6 @@ void CAdcSignals::append_sign_spawn(std::string &filename) oss << " <arg name=\"y\" value=\"" << this->world_y << "\"/>" << std::endl; oss << " <arg name=\"yaw\" value=\"" << this->world_yaw << "\"/>" << std::endl; oss << " <arg name=\"parent\" value=\"$(arg parent)\"/>" << std::endl; - oss << " <arg name=\"rviz\" value=\"$(arg rviz)\"/>" << std::endl; oss << " </include>" << std::endl; std::ofstream out_file; out_file.open(filename.c_str(), std::ios_base::app); -- GitLab