From beb52c4e65b4ee3ce6773c139899383ef6e18663 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 9 Feb 2016 16:02:44 +0100 Subject: [PATCH] + replace old C cast with static_cast --- src/Mod/Inspection/Gui/ViewProviderInspection.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp index a7fa59b3f1..a70dc0731b 100644 --- a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp +++ b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp @@ -299,10 +299,10 @@ void ViewProviderInspection::setDistances() return; } - if (pcColorMat->diffuseColor.getNum() != (int)fValues.size()) - pcColorMat->diffuseColor.setNum((int)fValues.size()); - if (pcColorMat->transparency.getNum() != (int)fValues.size()) - pcColorMat->transparency.setNum((int)fValues.size()); + if (pcColorMat->diffuseColor.getNum() != static_cast(fValues.size())) + pcColorMat->diffuseColor.setNum(static_cast(fValues.size())); + if (pcColorMat->transparency.getNum() != static_cast(fValues.size())) + pcColorMat->transparency.setNum(static_cast(fValues.size())); SbColor * cols = pcColorMat->diffuseColor.startEditing(); float * tran = pcColorMat->transparency.startEditing(); @@ -311,10 +311,12 @@ void ViewProviderInspection::setDistances() for (std::vector::const_iterator jt = fValues.begin(); jt != fValues.end(); ++jt, j++) { App::Color col = pcColorBar->getColor(*jt); cols[j] = SbColor(col.r, col.g, col.b); - if (pcColorBar->isVisible(*jt)) + if (pcColorBar->isVisible(*jt)) { tran[j] = 0.0f; - else + } + else { tran[j] = 0.8f; + } } pcColorMat->diffuseColor.finishEditing();