Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TF Display migration #182

Merged
merged 17 commits into from
Jan 29, 2018
Merged

TF Display migration #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0ef6c1b
Fix infinite loop when adding a display by topic
greimela-si Jan 10, 2018
8fb76f1
Move tf_display
Martin-Idel-SI Jan 9, 2018
8d6f2f2
Make tf_display compile
Martin-Idel-SI Jan 9, 2018
c583428
Add tf_display to plugins_description
Martin-Idel-SI Jan 16, 2018
79fa423
Dissect tf_display into several classes
Martin-Idel-SI Jan 9, 2018
2bc4550
Rename tf_display folder to just tf
Martin-Idel-SI Jan 10, 2018
9fb24f8
C++14 style adjustments of rviz_default_plugin tf classes
Martin-Idel-SI Jan 9, 2018
5f66e27
Split methods in tf_display
greimela-si Jan 12, 2018
5055e15
Move some methods from tf_display to frame_info
greimela-si Jan 15, 2018
82fc7a0
Expose functions for testability
Martin-Idel-SI Jan 11, 2018
85b86a5
Refactor movable_text
Martin-Idel-SI Jan 11, 2018
df51e28
Fix a couple of bugs
Martin-Idel-SI Jan 11, 2018
636980a
Extract more functions and refactoring
Martin-Idel-SI Jan 12, 2018
773a48e
Set reasonable default value for spacing from the start
Martin-Idel-SI Jan 12, 2018
87b342e
Refactoring of file style
Martin-Idel-SI Jan 12, 2018
3fcf237
Refactoring of tests
Martin-Idel-SI Jan 12, 2018
b749752
Change inheritance of MovableText to avoid visibility problems
Martin-Idel-SI Jan 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
793 changes: 0 additions & 793 deletions rviz/src/rviz/default_plugin/tf_display.cpp
View file
Open in desktop

This file was deleted.

175 changes: 0 additions & 175 deletions rviz/src/rviz/default_plugin/tf_display.h
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions rviz_common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,6 @@ set(rviz_common_headers_to_moc
)

# TODO(wjwwood): remove this later
list(APPEND rviz_common_headers_to_moc
src/rviz_common/temp/default_plugins/displays/tf_display.hpp)
list(APPEND rviz_common_headers_to_moc
src/rviz_common/temp/default_plugins/displays/robot_model_display.hpp)
list(APPEND rviz_common_headers_to_moc
Expand Down Expand Up @@ -207,8 +205,6 @@ set(rviz_common_source_files
)

# TODO(wjwwood): remove this later
list(APPEND rviz_common_source_files
src/rviz_common/temp/default_plugins/displays/tf_display.cpp)
list(APPEND rviz_common_source_files
src/rviz_common/temp/default_plugins/displays/robot_model_display.cpp)
list(APPEND rviz_common_headers_to_moc
Expand Down
3 changes: 2 additions & 1 deletion rviz_common/src/rviz_common/add_display_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ bool isSubtopic(const std::string & base, const std::string & topic)
}

std::string query = topic;
while (query != "/") {
// Both checks are required, otherwise the loop does not terminate when adding 'by topic'
while (query != "" && query != "/") {
if (query == base) {
return true;
}
Expand Down
6 changes: 0 additions & 6 deletions rviz_common/src/rviz_common/display_factory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
// TODO(wjwwood): remove this block (within if-endif) once plugins moved to default plugins package
#if 1

#include "./temp/default_plugins/displays/tf_display.hpp"
#include "./temp/default_plugins/displays/robot_model_display.hpp"

#endif
Expand All @@ -57,10 +56,6 @@ static Display * newDisplayGroup()
// TODO(wjwwood): remove this block (within if-endif) once plugins moved to default plugins package
#if 1

static Display * newTFDisplay()
{
return new rviz_common::TFDisplay();
}
static Display * newRobotModelDisplay()
{
return new rviz_common::RobotModelDisplay();
Expand All @@ -72,7 +67,6 @@ DisplayFactory::DisplayFactory()
: PluginlibFactory<Display>("rviz_common", "rviz_common::Display")
{
addBuiltInClass("rviz", "Group", "A container for Displays", &newDisplayGroup);
addBuiltInClass("rviz", "TF", "tf display", &newTFDisplay);
addBuiltInClass("rviz", "RobotModel", "robot model display", &newRobotModelDisplay);
}

Expand Down
Loading