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

PartDesign: Introduce ability to disable single-solid rule

Browse Source 
This adds "SingleSolidRuleMode" enum that controls if PartDesign will
enforce singular solid. By default the single-solid is enforced so
nothing changes for the user, it must be explicitly disabled by setting
new Allow Compound boolean property on a given body.

Default for this value is controled using user parameter under
Mod/PartDesign/AllowCompoundDefault
This commit is contained in:
Kacper Donat
2024-05-11 14:17:02 +02:00
committed by Adrián Insaurralde Avalos
parent d0a35c8c03
commit e4ed0d883f
5 changed files with 61 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Mod/PartDesign/App/Body.cpp
View File

@@ -40,7 +40,17 @@ using namespace PartDesign;
PROPERTY_SOURCE(PartDesign::Body, Part::BodyBase)
Body::Body() {
_GroupTouched.setStatus(App::Property::Output,true);
ADD_PROPERTY_TYPE(AllowCompound, (false), "Experimental", App::Prop_None, "Allow multiple solids in Body (experimental)");
_GroupTouched.setStatus(App::Property::Output, true);
static Base::Reference<ParameterGrp> hGrp = App::GetApplication()
.GetUserParameter()
.GetGroup("BaseApp/Preferences/Mod/PartDesign");
auto allowCompoundDefaultValue = hGrp->GetBool("AllowCompoundDefault", false);
ADD_PROPERTY(AllowCompound, (allowCompoundDefaultValue));
}
/*
@@ -428,7 +438,7 @@ void Body::onSettingDocument() {
Part::BodyBase::onSettingDocument();
}
void Body::onChanged (const App::Property* prop) {
void Body::onChanged(const App::Property* prop) {
// we neither load a project nor perform undo/redo
if (!this->isRestoring()
&& this->getDocument()
@@ -438,7 +448,6 @@ void Body::onChanged (const App::Property* prop) {
auto first = Group.getValues().empty() ? nullptr : Group.getValues().front();
if (BaseFeature.getValue()) {
//setup the FeatureBase if needed
if (!first || !first->isDerivedFrom(FeatureBase::getClassTypeId())) {
bf = static_cast<FeatureBase*>(getDocument()->addObject("PartDesign::FeatureBase", "BaseFeature"));
@@ -452,17 +461,26 @@ void Body::onChanged (const App::Property* prop) {
}
}
if (bf && (bf->BaseFeature.getValue() != BaseFeature.getValue()))
if (bf && (bf->BaseFeature.getValue() != BaseFeature.getValue())) {
bf->BaseFeature.setValue(BaseFeature.getValue());
}
}
else if( prop == &Group ) {
else if (prop == &Group) {
//if the FeatureBase was deleted we set the BaseFeature link to nullptr
if (BaseFeature.getValue() &&
(Group.getValues().empty() || !Group.getValues().front()->isDerivedFrom(FeatureBase::getClassTypeId()))) {
BaseFeature.setValue(nullptr);
}
}
else if (prop == &AllowCompound) {
// As disallowing compounds can break the model we need to recompute the whole tree.
// This will inform user about first place where there is more than one solid.
if (!AllowCompound.getValue()) {
for (auto feature : getFullModel()) {
feature->enforceRecompute();
}
}
}
}
Part::BodyBase::onChanged(prop);