Skip to content

Common widget GzColor replacement #1530

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 18 commits into from
Aug 16, 2022
Merged

Common widget GzColor replacement #1530

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9e567c4
gzcolor for Material.qml ambient
AzulRadio Jun 7, 2022
a881432
Ambient Loader
AzulRadio Jun 8, 2022
f0cee51
replace Light with common widget GzColor
AzulRadio Jun 8, 2022
b2ef512
Diffuse, Specular, and Emissive Loader
AzulRadio Jun 10, 2022
54a9465
spinbox value bind to property
AzulRadio Jun 10, 2022
ddbb980
change rgba property to bind
AzulRadio Jun 13, 2022
59d6386
update lights.qml to new GzColor
AzulRadio Jun 14, 2022
13c799f
fix Lights.qml switch bug and update Material.qml to new gzcolor
AzulRadio Jun 15, 2022
44749f0
Merge branch 'ign-gazebo6' into azulradio/common_widget_color
AzulRadio Jul 19, 2022
a60e317
Merge branch 'ign-gazebo6' into azulradio/common_widget_color
AzulRadio Aug 7, 2022
476dde4
codecheck
AzulRadio Aug 7, 2022
454e17c
update to new gzcolor
AzulRadio Aug 8, 2022
34dd66f
update material.qml to the new common widget color
AzulRadio Aug 8, 2022
86fdeec
removed unneeded code
jennuine Aug 11, 2022
c27b76e
codecheck
jennuine Aug 11, 2022
84d202d
slightly adjust format
AzulRadio Aug 11, 2022
a14b378
Merge branch 'ign-gazebo6' into azulradio/common_widget_color
AzulRadio Aug 16, 2022
7b52abf
add spacing on the left
AzulRadio Aug 16, 2022
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
94 changes: 21 additions & 73 deletions src/gui/plugins/component_inspector/ComponentInspector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <iostream>
#include <list>
#include <regex>
#include <QColorDialog>
#include <ignition/common/Console.hh>
#include <ignition/common/Profiler.hh>
#include <ignition/gui/Application.hh>
Expand Down Expand Up @@ -318,22 +317,22 @@ void ignition::gazebo::setData(QStandardItem *_item,
_item->setData(QString("Material"),
ComponentsModel::RoleNames().key("dataType"));
_item->setData(QList({
QVariant(_data.Ambient().R() * 255),
QVariant(_data.Ambient().G() * 255),
QVariant(_data.Ambient().B() * 255),
QVariant(_data.Ambient().A() * 255),
QVariant(_data.Diffuse().R() * 255),
QVariant(_data.Diffuse().G() * 255),
QVariant(_data.Diffuse().B() * 255),
QVariant(_data.Diffuse().A() * 255),
QVariant(_data.Specular().R() * 255),
QVariant(_data.Specular().G() * 255),
QVariant(_data.Specular().B() * 255),
QVariant(_data.Specular().A() * 255),
QVariant(_data.Emissive().R() * 255),
QVariant(_data.Emissive().G() * 255),
QVariant(_data.Emissive().B() * 255),
QVariant(_data.Emissive().A() * 255)
QVariant(_data.Ambient().R()),
QVariant(_data.Ambient().G()),
QVariant(_data.Ambient().B()),
QVariant(_data.Ambient().A()),
QVariant(_data.Diffuse().R()),
QVariant(_data.Diffuse().G()),
QVariant(_data.Diffuse().B()),
QVariant(_data.Diffuse().A()),
QVariant(_data.Specular().R()),
QVariant(_data.Specular().G()),
QVariant(_data.Specular().B()),
QVariant(_data.Specular().A()),
QVariant(_data.Emissive().R()),
QVariant(_data.Emissive().G()),
QVariant(_data.Emissive().B()),
QVariant(_data.Emissive().A())
}), ComponentsModel::RoleNames().key("data"));

// TODO(anyone) Only shows colors of material,
Expand Down Expand Up @@ -1128,55 +1127,8 @@ void ComponentInspector::OnMaterialColor(
double _rDiffuse, double _gDiffuse, double _bDiffuse, double _aDiffuse,
double _rSpecular, double _gSpecular, double _bSpecular, double _aSpecular,
double _rEmissive, double _gEmissive, double _bEmissive, double _aEmissive,
QString _type, QColor _currColor)
QString /*_type*/, QColor /*_currColor*/)
{
// when type is not empty, open qt color dialog
std::string type = _type.toStdString();
if (!type.empty())
{
QColor newColor = QColorDialog::getColor(
_currColor, nullptr, "Pick a color",
{QColorDialog::DontUseNativeDialog, QColorDialog::ShowAlphaChannel});

// returns if the user hits cancel
if (!newColor.isValid())
return;

if (type == "ambient")
{
_rAmbient = newColor.red();
_gAmbient = newColor.green();
_bAmbient = newColor.blue();
_aAmbient = newColor.alpha();
}
else if (type == "diffuse")
{
_rDiffuse = newColor.red();
_gDiffuse = newColor.green();
_bDiffuse = newColor.blue();
_aDiffuse = newColor.alpha();
}
else if (type == "specular")
{
_rSpecular = newColor.red();
_gSpecular = newColor.green();
_bSpecular = newColor.blue();
_aSpecular = newColor.alpha();
}
else if (type == "emissive")
{
_rEmissive = newColor.red();
_gEmissive = newColor.green();
_bEmissive = newColor.blue();
_aEmissive = newColor.alpha();
}
else
{
ignerr << "Invalid material type: " << type << std::endl;
return;
}
}

std::function<void(const ignition::msgs::Boolean &, const bool)> cb =
[](const ignition::msgs::Boolean &/*_rep*/, const bool _result)
{
Expand All @@ -1189,17 +1141,13 @@ void ComponentInspector::OnMaterialColor(
req.set_id(this->dataPtr->entity);

msgs::Set(req.mutable_material()->mutable_ambient(),
math::Color(_rAmbient / 255.0, _gAmbient / 255.0,
_bAmbient / 255.0, _aAmbient / 255.0));
math::Color(_rAmbient, _gAmbient, _bAmbient, _aAmbient));
msgs::Set(req.mutable_material()->mutable_diffuse(),
math::Color(_rDiffuse / 255.0, _gDiffuse / 255.0,
_bDiffuse / 255.0, _aDiffuse / 255.0));
math::Color(_rDiffuse, _gDiffuse, _bDiffuse, _aDiffuse));
msgs::Set(req.mutable_material()->mutable_specular(),
math::Color(_rSpecular / 255.0, _gSpecular / 255.0,
_bSpecular / 255.0, _aSpecular / 255.0));
math::Color(_rSpecular, _gSpecular, _bSpecular, _aSpecular));
msgs::Set(req.mutable_material()->mutable_emissive(),
math::Color(_rEmissive / 255.0, _gEmissive / 255.0,
_bEmissive / 255.0, _aEmissive / 255.0));
math::Color(_rEmissive, _gEmissive, _bEmissive, _aEmissive));

auto materialCmdService = "/world/" + this->dataPtr->worldName
+ "/visual_config";
Expand Down
Loading