kindred/create
1
1
Fork 0
Code Issues 51 Pull Requests 1 Actions Packages Projects 9 Releases 2 Wiki Activity

fix Debian bug #825861

Browse Source
This commit is contained in:
wmayer
2018-03-14 18:05:24 +01:00
parent b7c050f23b
commit 980e95ce05
4 changed files with 41 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/Mod/Part/App/Part2DObject.cpp
View File

@@ -214,60 +214,32 @@ void Part2DObject::acceptGeometry()
}
void Part2DObject::Restore(Base::XMLReader &reader)
{
Part::Feature::Restore(reader);
}
void Part2DObject::handleChangedPropertyType(Base::XMLReader &reader,
const char * TypeName,
App::Property * prop)
{
//override generic restoration to convert Support property from PropertyLinkSub to PropertyLinkSubList
reader.readElement("Properties");
int Cnt = reader.getAttributeAsInteger("Count");
for (int i=0 ;i<Cnt ;i++) {
reader.readElement("Property");
const char* PropName = reader.getAttribute("name");
const char* TypeName = reader.getAttribute("type");
App::Property* prop = getPropertyByName(PropName);
// NOTE: We must also check the type of the current property because a
// subclass of PropertyContainer might change the type of a property but
// not its name. In this case we would force to read-in a wrong property
// type and the behaviour would be undefined.
try {
if(prop){
if (strcmp(prop->getTypeId().getName(), TypeName) == 0){
prop->Restore(reader);
} else if (prop->isDerivedFrom(App::PropertyLinkSubList::getClassTypeId())){
//reading legacy Support - when the Support could only be a single flat face.
App::PropertyLinkSub tmp;
if (0 == strcmp(tmp.getTypeId().getName(),TypeName)) {
tmp.setContainer(this);
tmp.Restore(reader);
static_cast<App::PropertyLinkSubList*>(prop)->setValue(tmp.getValue(), tmp.getSubValues());
}
this->MapMode.setValue(Attacher::mmFlatFace);
}
} else {
extHandleChangedPropertyName(reader, TypeName, PropName); // AttachExtension
}
if (prop->isDerivedFrom(App::PropertyLinkSubList::getClassTypeId())) {
//reading legacy Support - when the Support could only be a single flat face.
App::PropertyLinkSub tmp;
if (0 == strcmp(tmp.getTypeId().getName(),TypeName)) {
tmp.setContainer(this);
tmp.Restore(reader);
static_cast<App::PropertyLinkSubList*>(prop)->setValue(tmp.getValue(), tmp.getSubValues());
}
catch (const Base::XMLParseException&) {
throw; // re-throw
}
catch (const Base::Exception &e) {
Base::Console().Error("%s\n", e.what());
}
catch (const std::exception &e) {
Base::Console().Error("%s\n", e.what());
}
catch (const char* e) {
Base::Console().Error("%s\n", e);
}
#ifndef FC_DEBUG
catch (...) {
Base::Console().Error("PropertyContainer::Restore: Unknown C++ exception thrown");
}
#endif
reader.readEndElement("Property");
this->MapMode.setValue(Attacher::mmFlatFace);
}
reader.readEndElement("Properties");
}
void Part2DObject::handleChangedPropertyName(Base::XMLReader &reader,
const char * TypeName,
const char *PropName)
{
extHandleChangedPropertyName(reader, TypeName, PropName); // AttachExtension
}
// Python Drawing feature ---------------------------------------------------------

4
src/Mod/Part/App/Part2DObject.h
View File

@@ -94,6 +94,10 @@ public:
//@}
void Restore(Base::XMLReader &reader);
protected:
void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop);
void handleChangedPropertyName(Base::XMLReader &reader, const char * TypeName, const char *PropName);
};
typedef App::FeaturePythonT<Part2DObject> Part2DObjectPython;

58
src/Mod/Part/Gui/ViewProvider2DObject.cpp
View File

@@ -263,52 +263,22 @@ void ViewProvider2DObject::onChanged(const App::Property* prop)
void ViewProvider2DObject::Restore(Base::XMLReader &reader)
{
reader.readElement("Properties");
int Cnt = reader.getAttributeAsInteger("Count");
ViewProviderPart::Restore(reader);
}
for (int i=0 ;i<Cnt ;i++) {
reader.readElement("Property");
const char* PropName = reader.getAttribute("name");
const char* TypeName = reader.getAttribute("type");
App::Property* prop = getPropertyByName(PropName);
try {
if (prop && strcmp(prop->getTypeId().getName(), TypeName) == 0) {
prop->Restore(reader);
}
else if (prop) {
Base::Type inputType = Base::Type::fromName(TypeName);
if (prop->getTypeId().isDerivedFrom(App::PropertyFloat::getClassTypeId()) &&
inputType.isDerivedFrom(App::PropertyFloat::getClassTypeId())) {
// Do not directly call the property's Restore method in case the implementation
// has changed. So, create a temporary PropertyFloat object and assign the value.
App::PropertyFloat floatProp;
floatProp.Restore(reader);
static_cast<App::PropertyFloat*>(prop)->setValue(floatProp.getValue());
}
}
}
catch (const Base::XMLParseException&) {
throw; // re-throw
}
catch (const Base::Exception &e) {
Base::Console().Error("%s\n", e.what());
}
catch (const std::exception &e) {
Base::Console().Error("%s\n", e.what());
}
catch (const char* e) {
Base::Console().Error("%s\n", e);
}
#ifndef FC_DEBUG
catch (...) {
Base::Console().Error("Primitive::Restore: Unknown C++ exception thrown");
}
#endif
reader.readEndElement("Property");
void ViewProvider2DObject::handleChangedPropertyType(Base::XMLReader &reader,
const char * TypeName,
App::Property * prop)
{
Base::Type inputType = Base::Type::fromName(TypeName);
if (prop->getTypeId().isDerivedFrom(App::PropertyFloat::getClassTypeId()) &&
inputType.isDerivedFrom(App::PropertyFloat::getClassTypeId())) {
// Do not directly call the property's Restore method in case the implementation
// has changed. So, create a temporary PropertyFloat object and assign the value.
App::PropertyFloat floatProp;
floatProp.Restore(reader);
static_cast<App::PropertyFloat*>(prop)->setValue(floatProp.getValue());
}
reader.readEndElement("Properties");
}
void ViewProvider2DObject::attach(App::DocumentObject *pcFeat)

1
src/Mod/Part/Gui/ViewProvider2DObject.h
View File

@@ -68,6 +68,7 @@ protected:
/// get called by the container whenever a property has been changed
virtual void onChanged(const App::Property* prop);
virtual void Restore(Base::XMLReader &reader);
virtual void handleChangedPropertyType(Base::XMLReader &reader, const char * TypeName, App::Property * prop);
SoSeparator *GridRoot;