From 4327cd5ccb8559cfcf41616161419d7745786316 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 15 Sep 2021 14:07:32 +0200 Subject: [PATCH] Mod: make sure to call the base class' handleChangedPropertyType --- src/Mod/Part/App/FeatureMirroring.cpp | 3 +++ src/Mod/Part/App/Part2DObject.cpp | 3 +++ src/Mod/Part/App/PartFeatures.cpp | 3 +++ src/Mod/Part/Gui/ViewProvider2DObject.cpp | 3 +++ src/Mod/PartDesign/App/FeatureDraft.cpp | 3 +++ src/Mod/PartDesign/App/FeatureHelix.cpp | 3 +++ src/Mod/PartDesign/App/FeatureLinearPattern.cpp | 3 +++ src/Mod/PartDesign/App/FeaturePolarPattern.cpp | 3 +++ src/Mod/PartDesign/App/ShapeBinder.cpp | 8 ++++++-- src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp | 3 +++ src/Mod/TechDraw/Gui/ViewProviderDimension.cpp | 3 +++ src/Mod/TechDraw/Gui/ViewProviderLeader.cpp | 8 ++++++-- src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp | 8 ++++++-- src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp | 3 +++ 14 files changed, 51 insertions(+), 6 deletions(-) diff --git a/src/Mod/Part/App/FeatureMirroring.cpp b/src/Mod/Part/App/FeatureMirroring.cpp index 7427422b14..b67d585bc3 100644 --- a/src/Mod/Part/App/FeatureMirroring.cpp +++ b/src/Mod/Part/App/FeatureMirroring.cpp @@ -88,6 +88,9 @@ void Mirroring::handleChangedPropertyType(Base::XMLReader &reader, const char *T Normal.setValue(v.getValue()); } + else { + Part::Feature::handleChangedPropertyType(reader, TypeName, prop); + } } App::DocumentObjectExecReturn *Mirroring::execute(void) diff --git a/src/Mod/Part/App/Part2DObject.cpp b/src/Mod/Part/App/Part2DObject.cpp index e26414b592..d91dee9075 100644 --- a/src/Mod/Part/App/Part2DObject.cpp +++ b/src/Mod/Part/App/Part2DObject.cpp @@ -274,6 +274,9 @@ void Part2DObject::handleChangedPropertyType(Base::XMLReader &reader, } this->MapMode.setValue(Attacher::mmFlatFace); } + else { + Part::Feature::handleChangedPropertyType(reader, TypeName, prop); + } } void Part2DObject::handleChangedPropertyName(Base::XMLReader &reader, diff --git a/src/Mod/Part/App/PartFeatures.cpp b/src/Mod/Part/App/PartFeatures.cpp index 86ec1f1cc7..2dc503bdf2 100644 --- a/src/Mod/Part/App/PartFeatures.cpp +++ b/src/Mod/Part/App/PartFeatures.cpp @@ -629,6 +629,9 @@ void Thickness::handleChangedPropertyType(Base::XMLReader &reader, const char *T Value.setValue(v.getValue()); } + else { + Part::Feature::handleChangedPropertyType(reader, TypeName, prop); + } } App::DocumentObjectExecReturn *Thickness::execute(void) diff --git a/src/Mod/Part/Gui/ViewProvider2DObject.cpp b/src/Mod/Part/Gui/ViewProvider2DObject.cpp index b4dc8ca5c2..3c1ad047a4 100644 --- a/src/Mod/Part/Gui/ViewProvider2DObject.cpp +++ b/src/Mod/Part/Gui/ViewProvider2DObject.cpp @@ -305,6 +305,9 @@ void ViewProvider2DObjectGrid::handleChangedPropertyType(Base::XMLReader &reader floatProp.Restore(reader); static_cast(prop)->setValue(floatProp.getValue()); } + else { + ViewProviderPart::handleChangedPropertyType(reader, TypeName, prop); + } } void ViewProvider2DObjectGrid::attach(App::DocumentObject *pcFeat) diff --git a/src/Mod/PartDesign/App/FeatureDraft.cpp b/src/Mod/PartDesign/App/FeatureDraft.cpp index 8c946a741a..a21f797036 100644 --- a/src/Mod/PartDesign/App/FeatureDraft.cpp +++ b/src/Mod/PartDesign/App/FeatureDraft.cpp @@ -88,6 +88,9 @@ void Draft::handleChangedPropertyType(Base::XMLReader &reader, v.Restore(reader); Angle.setValue(v.getValue()); } + else { + DressUp::handleChangedPropertyType(reader, TypeName, prop); + } } short Draft::mustExecute() const diff --git a/src/Mod/PartDesign/App/FeatureHelix.cpp b/src/Mod/PartDesign/App/FeatureHelix.cpp index f8dc38b4d1..a6fdedac22 100644 --- a/src/Mod/PartDesign/App/FeatureHelix.cpp +++ b/src/Mod/PartDesign/App/FeatureHelix.cpp @@ -514,6 +514,9 @@ void Helix::handleChangedPropertyType(Base::XMLReader& reader, const char* TypeN TurnsProperty.Restore(reader); Turns.setValue(TurnsProperty.getValue()); } + else { + ProfileBased::handleChangedPropertyType(reader, TypeName, prop); + } } PROPERTY_SOURCE(PartDesign::AdditiveHelix, PartDesign::Helix) diff --git a/src/Mod/PartDesign/App/FeatureLinearPattern.cpp b/src/Mod/PartDesign/App/FeatureLinearPattern.cpp index 225da7daa8..08ffa89d5b 100644 --- a/src/Mod/PartDesign/App/FeatureLinearPattern.cpp +++ b/src/Mod/PartDesign/App/FeatureLinearPattern.cpp @@ -200,6 +200,9 @@ void LinearPattern::handleChangedPropertyType(Base::XMLReader& reader, const cha OccurrencesProperty.Restore(reader); Occurrences.setValue(OccurrencesProperty.getValue()); } + else { + Transformed::handleChangedPropertyType(reader, TypeName, prop); + } } } diff --git a/src/Mod/PartDesign/App/FeaturePolarPattern.cpp b/src/Mod/PartDesign/App/FeaturePolarPattern.cpp index b5eda35ba8..646216564a 100644 --- a/src/Mod/PartDesign/App/FeaturePolarPattern.cpp +++ b/src/Mod/PartDesign/App/FeaturePolarPattern.cpp @@ -189,6 +189,9 @@ void PolarPattern::handleChangedPropertyType(Base::XMLReader& reader, const char OccurrencesProperty.Restore(reader); Occurrences.setValue(OccurrencesProperty.getValue()); } + else { + Transformed::handleChangedPropertyType(reader, TypeName, prop); + } } } diff --git a/src/Mod/PartDesign/App/ShapeBinder.cpp b/src/Mod/PartDesign/App/ShapeBinder.cpp index b1db1349bc..64d33f19e6 100644 --- a/src/Mod/PartDesign/App/ShapeBinder.cpp +++ b/src/Mod/PartDesign/App/ShapeBinder.cpp @@ -224,6 +224,9 @@ void ShapeBinder::handleChangedPropertyType(Base::XMLReader &reader, const char if (prop == &Support && strcmp(TypeName, "App::PropertyLinkSubList") == 0) { Support.Restore(reader); } + else { + Part::Feature::handleChangedPropertyType(reader, TypeName, prop); + } } void ShapeBinder::onSettingDocument() @@ -727,8 +730,9 @@ void SubShapeBinder::handleChangedPropertyType( { if(prop == &Support) { Support.upgrade(reader,TypeName); - return; } - inherited::handleChangedPropertyType(reader,TypeName,prop); + else { + inherited::handleChangedPropertyType(reader,TypeName,prop); + } } diff --git a/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp b/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp index 28450ce266..2d899bbc5d 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp @@ -195,6 +195,9 @@ void ViewProviderBalloon::handleChangedPropertyType(Base::XMLReader &reader, con LineWidthProperty.Restore(reader); LineWidth.setValue(LineWidthProperty.getValue()); } + else { + ViewProviderDrawingView::handleChangedPropertyType(reader, TypeName, prop); + } } bool ViewProviderBalloon::canDelete(App::DocumentObject *obj) const diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp index 4ab084793f..1000ba7677 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp @@ -271,6 +271,9 @@ void ViewProviderDimension::handleChangedPropertyType(Base::XMLReader &reader, c LineWidthProperty.Restore(reader); LineWidth.setValue(LineWidthProperty.getValue()); } + else { + ViewProviderDrawingView::handleChangedPropertyType(reader, TypeName, prop); + } } bool ViewProviderDimension::canDelete(App::DocumentObject *obj) const diff --git a/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp b/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp index 434e89a189..5f4520d03d 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp @@ -224,7 +224,7 @@ void ViewProviderLeader::handleChangedPropertyType(Base::XMLReader &reader, cons } // property LineStyle had the App::PropertyInteger and was changed to App::PropertyIntegerConstraint - if (prop == &LineStyle && strcmp(TypeName, "App::PropertyInteger") == 0) { + else if (prop == &LineStyle && strcmp(TypeName, "App::PropertyInteger") == 0) { App::PropertyInteger LineStyleProperty; // restore the PropertyInteger to be able to set its value LineStyleProperty.Restore(reader); @@ -232,12 +232,16 @@ void ViewProviderLeader::handleChangedPropertyType(Base::XMLReader &reader, cons } // property LineStyle had the App::PropertyIntegerConstraint and was changed to App::PropertyEnumeration - if (prop == &LineStyle && strcmp(TypeName, "App::PropertyIntegerConstraint") == 0) { + else if (prop == &LineStyle && strcmp(TypeName, "App::PropertyIntegerConstraint") == 0) { App::PropertyIntegerConstraint LineStyleProperty; // restore the PropertyIntegerConstraint to be able to set its value LineStyleProperty.Restore(reader); LineStyle.setValue(LineStyleProperty.getValue()); } + + else { + ViewProviderDrawingView::handleChangedPropertyType(reader, TypeName, prop); + } } bool ViewProviderLeader::onDelete(const std::vector &) diff --git a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp index d747df5b27..b8d4875ff1 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp @@ -208,7 +208,7 @@ void ViewProviderRichAnno::handleChangedPropertyType(Base::XMLReader &reader, co } // property LineStyle had App::PropertyInteger and was changed to App::PropertyIntegerConstraint - if (prop == &LineStyle && strcmp(TypeName, "App::PropertyInteger") == 0) { + else if (prop == &LineStyle && strcmp(TypeName, "App::PropertyInteger") == 0) { App::PropertyInteger LineStyleProperty; // restore the PropertyInteger to be able to set its value LineStyleProperty.Restore(reader); @@ -216,12 +216,16 @@ void ViewProviderRichAnno::handleChangedPropertyType(Base::XMLReader &reader, co } // property LineStyle had App::PropertyIntegerConstraint and was changed to App::PropertyEnumeration - if (prop == &LineStyle && strcmp(TypeName, "App::PropertyIntegerConstraint") == 0) { + else if (prop == &LineStyle && strcmp(TypeName, "App::PropertyIntegerConstraint") == 0) { App::PropertyIntegerConstraint LineStyleProperty; // restore the PropertyIntegerConstraint to be able to set its value LineStyleProperty.Restore(reader); LineStyle.setValue(LineStyleProperty.getValue()); } + + else { + ViewProviderDrawingView::handleChangedPropertyType(reader, TypeName, prop); + } } bool ViewProviderRichAnno::canDelete(App::DocumentObject *obj) const diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp index 6773ccdeda..d6373dd0e2 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp @@ -334,6 +334,9 @@ void ViewProviderViewPart::handleChangedPropertyType(Base::XMLReader &reader, co ExtraWidthProperty.Restore(reader); ExtraWidth.setValue(ExtraWidthProperty.getValue()); } + else { + ViewProviderDrawingView::handleChangedPropertyType(reader, TypeName, prop); + } } bool ViewProviderViewPart::onDelete(const std::vector &)