Skip to content

Fix view angle plugin #1877

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

Merged
merged 2 commits into from
Feb 6, 2023
Merged

Fix view angle plugin #1877

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d38866c
Fix view angle plugin
jennuine Jan 31, 2023
2ea163b
spacing
iche033 Feb 3, 2023
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
16 changes: 8 additions & 8 deletions src/gui/plugins/view_angle/ViewAngle.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ void ViewAngle::LoadConfig(const tinyxml2::XMLElement *)
this->dataPtr->moveToModelService = "/gui/move_to/model";
this->dataPtr->node.Advertise(this->dataPtr->moveToModelService,
&ViewAngle::OnMoveToModelService, this);
ignmsg << "Move to model service on ["
gzmsg << "Move to model service on ["
<< this->dataPtr->moveToModelService << "]" << std::endl;

gz::gui::App()->findChild<
Expand Down Expand Up @@ -260,7 +260,7 @@ void ViewAngle::OnViewControlReferenceVisual(bool _enable)
[](const msgs::Boolean &/*_rep*/, const bool _result)
{
if (!_result)
ignerr << "Error setting view controller reference visual" << std::endl;
gzerr << "Error setting view controller reference visual" << std::endl;
};

msgs::Boolean req;
Expand All @@ -277,12 +277,12 @@ void ViewAngle::OnViewControlSensitivity(double _sensitivity)
[](const msgs::Boolean &/*_rep*/, const bool _result)
{
if (!_result)
ignerr << "Error setting view controller sensitivity" << std::endl;
gzerr << "Error setting view controller sensitivity" << std::endl;
};

if (_sensitivity <= 0.0)
{
ignerr << "View controller sensitivity must be greater than 0" << std::endl;
gzerr << "View controller sensitivity must be greater than 0" << std::endl;
return;
}

Expand Down Expand Up @@ -324,7 +324,7 @@ bool ViewAngle::OnMoveToModelService(const gz::msgs::GUICamera &_msg,
auto visualToMove = scene->VisualByName(_msg.name());
if (nullptr == visualToMove)
{
ignerr << "Failed to get visual with ID ["
gzerr << "Failed to get visual with ID ["
<< _msg.name() << "]" << std::endl;
_res.set_data(false);
return false;
Expand All @@ -338,7 +338,7 @@ bool ViewAngle::OnMoveToModelService(const gz::msgs::GUICamera &_msg,
}
catch(std::bad_variant_access &_e)
{
ignerr << "Failed to get gazebo-entity user data ["
gzerr << "Failed to get gazebo-entity user data ["
<< visualToMove->Name() << "]" << std::endl;
_res.set_data(false);
return false;
Expand All @@ -358,7 +358,7 @@ bool ViewAngle::OnMoveToModelService(const gz::msgs::GUICamera &_msg,
[](const msgs::Boolean &/*_rep*/, const bool _result)
{
if (!_result)
ignerr << "Error setting view controller" << std::endl;
gzerr << "Error setting view controller" << std::endl;
};

msgs::StringMsg req;
Expand All @@ -375,7 +375,7 @@ bool ViewAngle::OnMoveToModelService(const gz::msgs::GUICamera &_msg,
}
else
{
ignerr << "Unknown view controller selected: " << str << std::endl;
gzerr << "Unknown view controller selected: " << str << std::endl;
_res.set_data(false);
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions src/gui/plugins/view_angle/ViewAngle.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import "qrc:/qml"

ColumnLayout {
Layout.minimumWidth: 320
Layout.minimumHeight: 530
Layout.minimumHeight: 650
anchors.fill: parent

ToolBar {
Expand Down Expand Up @@ -217,7 +217,7 @@ ColumnLayout {
id: viewControlSensitivityLabel
text: "View control sensitivity"
}
IgnSpinBox {
GzSpinBox {
id: viewControlSensitivitySpinBox
Layout.fillWidth: true
value: 1.0
Expand Down