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

Part: Make ViewProviderPart::applyMaterial more robust

Browse Source 
* Fixes hard crashes and throw an exception if value is out of range
* Fixes several linter warnings
This commit is contained in:
wmayer
2024-08-21 16:52:44 +02:00
committed by wwmayer
parent 5f4a43a34f
commit c4a506146f
1 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/Mod/Part/Gui/ViewProvider.cpp
View File

@@ -23,7 +23,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QObject>
#include <QObject>
#endif
#include <App/Document.h>
@@ -36,7 +36,7 @@
using namespace PartGui;
PROPERTY_SOURCE(PartGui::ViewProviderPart, PartGui::ViewProviderPartExt)
PROPERTY_SOURCE(PartGui::ViewProviderPart, PartGui::ViewProviderPartExt) // NOLINT
ViewProviderPart::ViewProviderPart() = default;
@@ -61,12 +61,10 @@ void ViewProviderPart::applyColor(const Part::ShapeHistory& hist,
const std::vector<App::Color>& colBase,
std::vector<App::Color>& colBool)
{
std::map<int, std::vector<int> >::const_iterator jt;
// apply color from modified faces
for (jt = hist.shapeMap.begin(); jt != hist.shapeMap.end(); ++jt) {
std::vector<int>::const_iterator kt;
for (kt = jt->second.begin(); kt != jt->second.end(); ++kt) {
colBool[*kt] = colBase[jt->first];
for (const auto& jt : hist.shapeMap) {
for (auto kt : jt.second) {
colBool.at(kt) = colBase.at(jt.first);
}
}
}
@@ -75,12 +73,10 @@ void ViewProviderPart::applyMaterial(const Part::ShapeHistory& hist,
const std::vector<App::Material>& colBase,
std::vector<App::Material>& colBool)
{
std::map<int, std::vector<int>>::const_iterator jt;
// apply color from modified faces
for (jt = hist.shapeMap.begin(); jt != hist.shapeMap.end(); ++jt) {
std::vector<int>::const_iterator kt;
for (kt = jt->second.begin(); kt != jt->second.end(); ++kt) {
colBool[*kt] = colBase[jt->first];
for (const auto& jt : hist.shapeMap) {
for (auto kt : jt.second) {
colBool.at(kt) = colBase.at(jt.first);
}
}
}
@@ -89,11 +85,11 @@ void ViewProviderPart::applyTransparency(float transparency, std::vector<App::Co
{
if (transparency != 0.0) {
// transparency has been set object-wide
std::vector<App::Color>::iterator j;
for (j = colors.begin(); j != colors.end(); ++j) {
for (auto& j : colors) {
// transparency hasn't been set for this face
if (j->a == 0.0)
j->a = transparency/100.0; // transparency comes in percent
if (j.a == 0.0) {
j.a = transparency/100.0F; // transparency comes in percent
}
}
}
}
@@ -102,11 +98,10 @@ void ViewProviderPart::applyTransparency(float transparency, std::vector<App::Ma
{
if (transparency != 0.0) {
// transparency has been set object-wide
std::vector<App::Material>::iterator j;
for (j = colors.begin(); j != colors.end(); ++j) {
for (auto& j : colors) {
// transparency hasn't been set for this face
if (j->transparency == 0.0) {
j->transparency = transparency / 100.0; // transparency comes in percent
if (j.transparency == 0.0) {
j.transparency = transparency / 100.0F; // transparency comes in percent
}
}
}
@@ -114,10 +109,14 @@ void ViewProviderPart::applyTransparency(float transparency, std::vector<App::Ma
// ----------------------------------------------------------------------------
void ViewProviderShapeBuilder::buildNodes(const App::Property* , std::vector<SoNode*>& ) const
void ViewProviderShapeBuilder::buildNodes(const App::Property* prop, std::vector<SoNode*>& nodes) const
{
Q_UNUSED(prop)
Q_UNUSED(nodes)
}
void ViewProviderShapeBuilder::createShape(const App::Property* , SoSeparator* ) const
void ViewProviderShapeBuilder::createShape(const App::Property* prop, SoSeparator* node) const
{
Q_UNUSED(prop)
Q_UNUSED(node)
}