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

[jsk_rviz_plugins] Rviz default font is changed from Arial to Liberat… #676

Merged
merged 1 commit into from
Sep 29, 2017
Merged

[jsk_rviz_plugins] Rviz default font is changed from Arial to Liberat… #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion jsk_rviz_plugins/src/diagnostics_display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ namespace jsk_rviz_plugins
scene_node_ = scene_manager_->getRootSceneNode()->createChildSceneNode();
orbit_node_ = scene_node_->createChildSceneNode(); // ??
line_ = new rviz::BillboardLine(context_->getSceneManager(), scene_node_);
msg_ = new rviz::MovableText("not initialized", "Arial", 0.05);
msg_ = new rviz::MovableText("not initialized", "Liberation Sans", 0.05);
msg_->setTextAlignment(rviz::MovableText::H_CENTER,
rviz::MovableText::V_ABOVE);
frame_id_property_->setFrameManager(context_->getFrameManager());
Expand Down
2 changes: 1 addition & 1 deletion jsk_rviz_plugins/src/facing_visualizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ namespace jsk_rviz_plugins
context->getSceneManager(),
node_);
target_text_node_ = node_->createChildSceneNode();
msg_ = new rviz::MovableText("not initialized", "Arial", 0.05);
msg_ = new rviz::MovableText("not initialized", "Liberation Sans", 0.05);
msg_->setVisible(false);
msg_->setTextAlignment(rviz::MovableText::H_LEFT,
rviz::MovableText::V_ABOVE);
Expand Down
2 changes: 1 addition & 1 deletion jsk_rviz_plugins/src/footstep_display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ namespace jsk_rviz_plugins
// create nodes
Ogre::SceneNode* node = scene_node_->createChildSceneNode();
rviz::MovableText* text
= new rviz::MovableText("not initialized", "Arial", 0.05);
= new rviz::MovableText("not initialized", "Liberation Sans", 0.05);
text->setVisible(false);
text->setTextAlignment(rviz::MovableText::H_CENTER,
rviz::MovableText::V_ABOVE);
Expand Down
8 changes: 4 additions & 4 deletions jsk_rviz_plugins/src/overlay_diagnostic_display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ namespace jsk_rviz_plugins
{
painter.save();
const double r = size_ / 128.0;
QFont font("Arial", font_size * r, font_size * r, QFont::Bold);
QFont font("Liberation Sans", font_size * r, font_size * r, QFont::Bold);
QPen pen;
QPainterPath path;
pen.setWidth(1);
Expand All @@ -397,7 +397,7 @@ namespace jsk_rviz_plugins
{
painter.save();
const double r = size_ / 128.0;
QFont font("Arial", font_size * r, font_size * r, QFont::Bold);
QFont font("Liberation Sans", font_size * r, font_size * r, QFont::Bold);
QPen pen;
QPainterPath path;
pen.setWidth(1);
Expand All @@ -417,7 +417,7 @@ namespace jsk_rviz_plugins
const std::string text)
{
const double r = size_ / 128.0;
QFont font("Arial", font_size * r, font_size * r, false);
QFont font("Liberation Sans", font_size * r, font_size * r, false);
QPen pen;
QPainterPath path;
pen.setWidth(1);
Expand Down Expand Up @@ -598,7 +598,7 @@ namespace jsk_rviz_plugins
}
}
painter.setPen(QPen(textColor(), 2 * line_width, Qt::SolidLine));
painter.setFont(QFont("Arial", 12, QFont::Bold));
painter.setFont(QFont("Liberation Sans", 12, QFont::Bold));
double theta = atan2(S - B, S - A) / M_PI * 180;
double text_box_height = cos(theta*M_PI/180) * B;
double text_box_width = (S - A) / cos(theta*M_PI/180) - sin(theta*M_PI/180) * B * 2;
Expand Down
2 changes: 1 addition & 1 deletion jsk_rviz_plugins/src/overlay_text_display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ namespace jsk_rviz_plugins
// font
if (text_size_ != 0) {
//QFont font = painter.font();
QFont font(font_.length() > 0 ? font_.c_str(): "Arial");
QFont font(font_.length() > 0 ? font_.c_str(): "Liberation Sans");
font.setPointSize(text_size_);
font.setBold(true);
painter.setFont(font);
Expand Down
2 changes: 1 addition & 1 deletion jsk_rviz_plugins/src/pictogram_display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ namespace jsk_rviz_plugins
pictogram_text);
painter.end();
}else if( mode_ == jsk_rviz_plugins::Pictogram::STRING_MODE){
QFont font("Arial");
QFont font("Liberation Sans");
font.setPointSize(32);
font.setBold(true);
painter.setFont(font);
Expand Down