suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FixBug #1402

Browse Source
This commit is contained in:
jriegel 2014-02-11 23:03:26 +01:00
parent 24b06ad3db
commit 82ff64477e
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Gui/propertyeditor/PropertyItem.cpp
View File

@ -655,6 +655,7 @@ QVariant PropertyUnitItem::toString(const QVariant& Value) const
const std::vector<App::Property*>& prop = getPropertyData(); const std::vector<App::Property*>& prop = getPropertyData();
if (!prop.empty() && prop.front()->getTypeId().isDerivedFrom(App::PropertyQuantity::getClassTypeId())) { if (!prop.empty() && prop.front()->getTypeId().isDerivedFrom(App::PropertyQuantity::getClassTypeId())) {
Base::Quantity value = static_cast<const App::PropertyQuantity*>(prop.front())->getQuantityValue(); Base::Quantity value = static_cast<const App::PropertyQuantity*>(prop.front())->getQuantityValue();
//unit = QString::fromLatin1("'%1'").arg(value.getUserString());
unit = value.getUserString(); unit = value.getUserString();
} }
@ -665,8 +666,9 @@ QVariant PropertyUnitItem::value(const App::Property* prop) const
{ {
assert(prop && prop->getTypeId().isDerivedFrom(App::PropertyQuantity::getClassTypeId())); assert(prop && prop->getTypeId().isDerivedFrom(App::PropertyQuantity::getClassTypeId()));
Base::Quantity value = static_cast<const App::PropertyQuantity*>(prop)->getQuantityValue(); Base::Quantity value = static_cast<const App::PropertyQuantity*>(prop)->getQuantityValue();
QString unitString; //QString unitString;
return QVariant(value.getValue()); //return QVariant(value.getValue());
return QVariant(value.getUserString());
} }
void PropertyUnitItem::setValue(const QVariant& value) void PropertyUnitItem::setValue(const QVariant& value)
@ -681,7 +683,8 @@ void PropertyUnitItem::setValue(const QVariant& value)
return; return;
else if (prop.front()->getTypeId().isDerivedFrom(App::PropertyQuantity::getClassTypeId())) { else if (prop.front()->getTypeId().isDerivedFrom(App::PropertyQuantity::getClassTypeId())) {
Base::Quantity value = static_cast<const App::PropertyQuantity*>(prop.front())->getQuantityValue(); Base::Quantity value = static_cast<const App::PropertyQuantity*>(prop.front())->getQuantityValue();
unit = value.getUserString(); //unit = value.getUserString();
unit = QString::fromLatin1("'%1 %2'").arg(val).arg(value.getUnit().getString());
} }
setPropertyValue(unit); setPropertyValue(unit);
@ -708,9 +711,9 @@ void PropertyUnitItem::setEditorData(QWidget *editor, const QVariant& data) cons
Base::Quantity value = static_cast<const App::PropertyQuantity*>(prop.front())->getQuantityValue(); Base::Quantity value = static_cast<const App::PropertyQuantity*>(prop.front())->getQuantityValue();
QString unitString; QString unitString;
//double factor; //double factor;
//value.getUserString(unitString); sb->setValue(value.getValue());
//unitString.prepend(QLatin1String(" ")); //unitString.prepend(QLatin1String(" "));
//sb->setSuffix(unitString); sb->setSuffix(value.getUnit().getString());
} }
} }