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

Part: if fillet/chamfer object has set transparency then override the values of the input shape

Browse Source
This commit is contained in:
wmayer
2022-07-27 17:32:39 +02:00
parent 7237fcfc14
commit acbd4b1cd7
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Mod/Part/Gui/ViewProviderMirror.cpp
View File

@@ -266,6 +266,12 @@ void ViewProviderFillet::updateData(const App::Property* prop)
applyColor(hist[0], colBase, colFill);
}
// If the view provider has set a transparency then override the values
// of the input shapes
if (Transparency.getValue() > 0) {
applyTransparency(Transparency.getValue(), colFill);
}
this->DiffuseColor.setValues(colFill);
}
}
@@ -357,21 +363,29 @@ void ViewProviderChamfer::updateData(const App::Property* prop)
TopExp::MapShapes(baseShape, TopAbs_FACE, baseMap);
TopExp::MapShapes(chamShape, TopAbs_FACE, chamMap);
Gui::ViewProvider* vpBase = Gui::Application::Instance->getViewProvider(objBase);
std::vector<App::Color> colBase = static_cast<PartGui::ViewProviderPart*>(vpBase)->DiffuseColor.getValues();
std::vector<App::Color> colCham;
colCham.resize(chamMap.Extent(), static_cast<PartGui::ViewProviderPart*>(vpBase)->ShapeColor.getValue());
applyTransparency(static_cast<PartGui::ViewProviderPart*>(vpBase)->Transparency.getValue(),colBase);
auto vpBase = dynamic_cast<PartGui::ViewProviderPart*>(Gui::Application::Instance->getViewProvider(objBase));
if (vpBase) {
std::vector<App::Color> colBase = static_cast<PartGui::ViewProviderPart*>(vpBase)->DiffuseColor.getValues();
std::vector<App::Color> colCham;
colCham.resize(chamMap.Extent(), static_cast<PartGui::ViewProviderPart*>(vpBase)->ShapeColor.getValue());
applyTransparency(static_cast<PartGui::ViewProviderPart*>(vpBase)->Transparency.getValue(),colBase);
if (static_cast<int>(colBase.size()) == baseMap.Extent()) {
applyColor(hist[0], colBase, colCham);
}
else if (!colBase.empty() && colBase[0] != this->ShapeColor.getValue()) {
colBase.resize(baseMap.Extent(), colBase[0]);
applyColor(hist[0], colBase, colCham);
}
if (static_cast<int>(colBase.size()) == baseMap.Extent()) {
applyColor(hist[0], colBase, colCham);
}
else if (!colBase.empty() && colBase[0] != this->ShapeColor.getValue()) {
colBase.resize(baseMap.Extent(), colBase[0]);
applyColor(hist[0], colBase, colCham);
}
this->DiffuseColor.setValues(colCham);
// If the view provider has set a transparency then override the values
// of the input shapes
if (Transparency.getValue() > 0) {
applyTransparency(Transparency.getValue(), colCham);
}
this->DiffuseColor.setValues(colCham);
}
}
}
}