From d18ad183f98c9c8d53c3b3ff1adf349b39eef2a2 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 12 Dec 2016 17:30:13 +0100 Subject: [PATCH] remove superfluous conversion methods --- src/Gui/propertyeditor/PropertyItem.cpp | 72 +++++++++---------------- 1 file changed, 26 insertions(+), 46 deletions(-) diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp index a8fdcc82a..4bade8509 100644 --- a/src/Gui/propertyeditor/PropertyItem.cpp +++ b/src/Gui/propertyeditor/PropertyItem.cpp @@ -59,26 +59,6 @@ using namespace Gui::PropertyEditor; -namespace Gui { namespace PropertyEditor { - static QColor toQColor(const App::Color& col) - { - return QColor( - (int)(255.0f*col.r), - (int)(255.0f*col.g), - (int)(255.0f*col.b) - ); - } - static App::Color fromQColor(const QColor& col) - { - App::Color val; - val.r = (float)col.red() / 255.0f; - val.g = (float)col.green() / 255.0f; - val.b = (float)col.blue() / 255.0f; - return val; - } -} -} - Gui::PropertyEditor::PropertyItemFactory* Gui::PropertyEditor::PropertyItemFactory::_singleton = NULL; PropertyItemFactory& PropertyItemFactory::instance() @@ -2311,7 +2291,7 @@ QVariant PropertyColorItem::value(const App::Property* prop) const assert(prop && prop->getTypeId().isDerivedFrom(App::PropertyColor::getClassTypeId())); App::Color value = ((App::PropertyColor*)prop)->getValue(); - return QVariant(toQColor(value)); + return QVariant(value.asValue()); } void PropertyColorItem::setValue(const QVariant& value) @@ -2319,7 +2299,7 @@ void PropertyColorItem::setValue(const QVariant& value) if (!value.canConvert()) return; QColor col = value.value(); - App::Color val = fromQColor(col); + App::Color val; val.setValue(col); QString data = QString::fromLatin1("(%1,%2,%3)") .arg(val.r,0,'f',decimals()) .arg(val.g,0,'f',decimals()) @@ -2565,10 +2545,10 @@ QVariant PropertyMaterialItem::toolTip(const App::Property* prop) const assert(prop && prop->getTypeId().isDerivedFrom(App::PropertyMaterial::getClassTypeId())); const App::Material& value = static_cast(prop)->getValue(); - QColor dc = toQColor(value.diffuseColor); - QColor ac = toQColor(value.ambientColor); - QColor sc = toQColor(value.specularColor); - QColor ec = toQColor(value.emissiveColor); + QColor dc = value.diffuseColor.asValue(); + QColor ac = value.ambientColor.asValue(); + QColor sc = value.specularColor.asValue(); + QColor ec = value.emissiveColor.asValue(); QString data = QString::fromUtf8( "Diffuse color: [%1, %2, %3]\n" @@ -2596,10 +2576,10 @@ QVariant PropertyMaterialItem::value(const App::Property* prop) const const App::Material& value = static_cast(prop)->getValue(); Material mat; - mat.diffuseColor = toQColor(value.diffuseColor); - mat.ambientColor = toQColor(value.ambientColor); - mat.specularColor = toQColor(value.specularColor); - mat.emissiveColor = toQColor(value.emissiveColor); + mat.diffuseColor = value.diffuseColor.asValue(); + mat.ambientColor = value.ambientColor.asValue(); + mat.specularColor = value.specularColor.asValue(); + mat.emissiveColor = value.emissiveColor.asValue(); mat.shininess = value.shininess; mat.transparency = value.transparency; @@ -2612,10 +2592,10 @@ void PropertyMaterialItem::setValue(const QVariant& value) return; Material mat = value.value(); - App::Color dc = fromQColor(mat.diffuseColor); - App::Color ac = fromQColor(mat.ambientColor); - App::Color sc = fromQColor(mat.specularColor); - App::Color ec = fromQColor(mat.emissiveColor); + App::Color dc; dc.setValue(mat.diffuseColor); + App::Color ac; ac.setValue(mat.ambientColor); + App::Color sc; sc.setValue(mat.specularColor); + App::Color ec; ec.setValue(mat.emissiveColor); float s = mat.shininess; float t = mat.transparency; @@ -2992,10 +2972,10 @@ QVariant PropertyMaterialListItem::toolTip(const App::Property* prop) const return QVariant(); App::Material value = values.front(); - QColor dc = toQColor(value.diffuseColor); - QColor ac = toQColor(value.ambientColor); - QColor sc = toQColor(value.specularColor); - QColor ec = toQColor(value.emissiveColor); + QColor dc = value.diffuseColor.asValue(); + QColor ac = value.ambientColor.asValue(); + QColor sc = value.specularColor.asValue(); + QColor ec = value.emissiveColor.asValue(); QString data = QString::fromUtf8( "Diffuse color: [%1, %2, %3]\n" @@ -3025,10 +3005,10 @@ QVariant PropertyMaterialListItem::value(const App::Property* prop) const for (std::vector::const_iterator it = value.begin(); it != value.end(); ++it) { Material mat; - mat.diffuseColor = toQColor(it->diffuseColor); - mat.ambientColor = toQColor(it->ambientColor); - mat.specularColor = toQColor(it->specularColor); - mat.emissiveColor = toQColor(it->emissiveColor); + mat.diffuseColor = it->diffuseColor.asValue(); + mat.ambientColor = it->ambientColor.asValue(); + mat.specularColor = it->specularColor.asValue(); + mat.emissiveColor = it->emissiveColor.asValue(); mat.shininess = it->shininess; mat.transparency = it->transparency; @@ -3053,10 +3033,10 @@ void PropertyMaterialListItem::setValue(const QVariant& value) for (QVariantList::iterator it = list.begin(); it != list.end(); ++it) { Material mat = it->value(); - App::Color dc = fromQColor(mat.diffuseColor); - App::Color ac = fromQColor(mat.ambientColor); - App::Color sc = fromQColor(mat.specularColor); - App::Color ec = fromQColor(mat.emissiveColor); + App::Color dc; dc.setValue(mat.diffuseColor); + App::Color ac; ac.setValue(mat.ambientColor); + App::Color sc; sc.setValue(mat.specularColor); + App::Color ec; ec.setValue(mat.emissiveColor); float s = mat.shininess; float t = mat.transparency;