diff --git a/src/Mod/Sketcher/Gui/PropertyConstraintListItem.cpp b/src/Mod/Sketcher/Gui/PropertyConstraintListItem.cpp index 875b2a86a..d960bcd0c 100644 --- a/src/Mod/Sketcher/Gui/PropertyConstraintListItem.cpp +++ b/src/Mod/Sketcher/Gui/PropertyConstraintListItem.cpp @@ -23,38 +23,13 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include -# include -# include -# include -# include -# include -# include # include -# include #endif #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include - #include "../App/PropertyConstraintList.h" - #include "PropertyConstraintListItem.h" @@ -65,7 +40,7 @@ TYPESYSTEM_SOURCE(SketcherGui::PropertyConstraintListItem, Gui::PropertyEditor:: PropertyConstraintListItem::PropertyConstraintListItem() { - + } QVariant PropertyConstraintListItem::toString(const QVariant& prop) const @@ -86,9 +61,9 @@ QVariant PropertyConstraintListItem::toString(const QVariant& prop) const QVariant PropertyConstraintListItem::value(const App::Property* prop) const { assert(prop && prop->getTypeId().isDerivedFrom(Sketcher::PropertyConstraintList::getClassTypeId())); - + PropertyConstraintListItem* self = const_cast(this); - + int id = 1; QList quantities; @@ -112,22 +87,19 @@ QVariant PropertyConstraintListItem::value(const App::Property* prop) const } quantities.append(quant); - + QString name = QString::fromStdString((*it)->Name); if (name.isEmpty()) name = QString::fromLatin1("Constraint%1").arg(id); - + PropertyConstraintListItem* self = const_cast(this); self->blockEvent=true; self->setProperty(name.toLatin1(), QVariant::fromValue(quant)); self->blockEvent=false; - } } - return QVariant::fromValue< QList >(quantities); - } void PropertyConstraintListItem::setValue(const QVariant& value) @@ -146,7 +118,7 @@ bool PropertyConstraintListItem::event (QEvent* ev) int id = 0; Sketcher::PropertyConstraintList* item = static_cast(getFirstProperty()); - + const std::vector< Sketcher::Constraint * > &vals = item->getValues(); for (std::vector< Sketcher::Constraint* >::const_iterator it = vals.begin();it != vals.end(); ++it, ++id) { if ((*it)->Type == Sketcher::Distance || // Datum constraint @@ -155,7 +127,6 @@ bool PropertyConstraintListItem::event (QEvent* ev) (*it)->Type == Sketcher::Radius || (*it)->Type == Sketcher::Angle) { - // Get the name QString name = QString::fromStdString((*it)->Name); if (name.isEmpty()) @@ -172,6 +143,7 @@ bool PropertyConstraintListItem::event (QEvent* ev) } } } + return PropertyItem::event(ev); } @@ -198,9 +170,8 @@ QVariant PropertyConstraintListItem::editorData(QWidget *editor) const void PropertyConstraintListItem::initialize() { const Sketcher::PropertyConstraintList* item=static_cast(getPropertyData()[0]); - const std::vector< Sketcher::Constraint * > &vals = item->getValues(); - + int id = 1; for (std::vector< Sketcher::Constraint* >::const_iterator it = vals.begin();it != vals.end(); ++it, ++id) { @@ -210,19 +181,16 @@ void PropertyConstraintListItem::initialize() (*it)->Type == Sketcher::Radius || (*it)->Type == Sketcher::Angle) { - // Get the name - QString name = QString::fromStdString((*it)->Name); if (name.isEmpty()) name = QString::fromLatin1("Constraint%1").arg(id); PropertyUnitItem* item = static_cast(PropertyUnitItem::create()); item->setParent(this); item->setPropertyName(name); - this->appendChild(item); + this->appendChild(item); } } - } -#include "moc_PropertyConstraintListItem.cpp" \ No newline at end of file +#include "moc_PropertyConstraintListItem.cpp" diff --git a/src/Mod/Sketcher/Gui/PropertyConstraintListItem.h b/src/Mod/Sketcher/Gui/PropertyConstraintListItem.h index ed60d8c42..212ae6da0 100644 --- a/src/Mod/Sketcher/Gui/PropertyConstraintListItem.h +++ b/src/Mod/Sketcher/Gui/PropertyConstraintListItem.h @@ -40,7 +40,7 @@ namespace SketcherGui { -class GuiExport PropertyConstraintListItem: public Gui::PropertyEditor::PropertyItem +class PropertyConstraintListItem: public Gui::PropertyEditor::PropertyItem { Q_OBJECT TYPESYSTEM_HEADER(); @@ -48,23 +48,21 @@ class GuiExport PropertyConstraintListItem: public Gui::PropertyEditor::Property virtual QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const; virtual void setEditorData(QWidget *editor, const QVariant& data) const; virtual QVariant editorData(QWidget *editor) const; - + protected: virtual QVariant toString(const QVariant&) const; virtual QVariant value(const App::Property*) const; virtual void setValue(const QVariant&); virtual bool event (QEvent* ev); - + virtual void initialize(); - - + protected: PropertyConstraintListItem(); bool blockEvent; - }; } //namespace SketcherGui -#endif \ No newline at end of file +#endif