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

Part: Rename AttachExtension::Support property to AttachmentSupport, to avoid name conflict with base features. Fixes #7052

Browse Source
This commit is contained in:
Josh Coalson
2024-03-02 10:35:11 -08:00
committed by Adrián Insaurralde Avalos
parent 2643902b6b
commit fbd8767242
55 changed files with 162 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
View File

@@ -116,7 +116,7 @@ bool TaskDlgDatumParameters::accept() {
//check the prerequisites for the selected objects
//the user has to decide which option we should take if external references are used
bool extReference = false;
for (App::DocumentObject* obj : pcDatum->Support.getValues()) {
for (App::DocumentObject* obj : pcDatum->AttachmentSupport.getValues()) {
if (pcActiveBody && !pcActiveBody->hasObject(obj) && !pcActiveBody->getOrigin()->hasObject(obj))
extReference = true;
}
@@ -133,9 +133,9 @@ bool TaskDlgDatumParameters::accept() {
else if (!dlg.radioXRef->isChecked()) {
std::vector<App::DocumentObject*> copyObjects;
std::vector<std::string> copySubValues;
std::vector<std::string> subs = pcDatum->Support.getSubValues();
std::vector<std::string> subs = pcDatum->AttachmentSupport.getSubValues();
int index = 0;
for (App::DocumentObject* obj : pcDatum->Support.getValues()) {
for (App::DocumentObject* obj : pcDatum->AttachmentSupport.getValues()) {
if (pcActiveBody && !pcActiveBody->hasObject(obj) && !pcActiveBody->getOrigin()->hasObject(obj)) {
auto* copy = PartDesignGui::TaskFeaturePick::makeCopy(obj, subs[index], dlg.radioIndependent->isChecked());
if (copy) {
@@ -152,7 +152,7 @@ bool TaskDlgDatumParameters::accept() {
index++;
}
pcDatum->Support.setValues(copyObjects, copySubValues);
pcDatum->AttachmentSupport.setValues(copyObjects, copySubValues);
}
}