diff --git a/src/App/FreeCADInit.py b/src/App/FreeCADInit.py index 4fe6eed65..d99892b14 100644 --- a/src/App/FreeCADInit.py +++ b/src/App/FreeCADInit.py @@ -1,12 +1,12 @@ # FreeCAD init module -# (c) 2001 Jürgen Riegel +# (c) 2001 Juergen Riegel # # Gathering all the information to start FreeCAD # This is the second one of three init scripts, the third one # runs when the gui is up #*************************************************************************** -#* (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * +#* (c) Juergen Riegel (juergen.riegel@web.de) 2002 * #* * #* This file is part of the FreeCAD CAx development system. * #* * diff --git a/src/App/FreeCADTest.py b/src/App/FreeCADTest.py index 0de2dd188..31759e10e 100644 --- a/src/App/FreeCADTest.py +++ b/src/App/FreeCADTest.py @@ -1,12 +1,12 @@ # FreeCAD test module -# (c) 2002 Jürgen Riegel +# (c) 2002 Juergen Riegel # # Testing the function of the base system and run # (if existing) the test function of the modules # #*************************************************************************** -#* (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * +#* (c) Juergen Riegel (juergen.riegel@web.de) 2002 * #* * #* This file is part of the FreeCAD CAx development system. * #* * diff --git a/src/Gui/CoinRiftWidget.h b/src/Gui/CoinRiftWidget.h index 343d58775..0218c613e 100644 --- a/src/Gui/CoinRiftWidget.h +++ b/src/Gui/CoinRiftWidget.h @@ -115,4 +115,4 @@ protected: #endif //BUILD_VR -#endif GUI_CoinRiftWidget \ No newline at end of file +#endif GUI_CoinRiftWidget diff --git a/src/Gui/FreeCADGuiInit.py b/src/Gui/FreeCADGuiInit.py index 08f5bcf94..ee8ea4b9f 100644 --- a/src/Gui/FreeCADGuiInit.py +++ b/src/Gui/FreeCADGuiInit.py @@ -1,12 +1,12 @@ # FreeCAD gui init module -# (c) 2003 Jürgen Riegel +# (c) 2003 Juergen Riegel # # Gathering all the information to start FreeCAD # This is the second one of three init scripts, the third one # runs when the gui is up #*************************************************************************** -#* (c) Jürgen Riegel (juergen.riegel@web.de) 2002 * +#* (c) Juergen Riegel (juergen.riegel@web.de) 2002 * #* * #* This file is part of the FreeCAD CAx development system. * #* * diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp index b0e00ef68..1850339f8 100755 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp @@ -623,8 +623,6 @@ void ViewProviderFemMesh::animateNodes(double factor) void ViewProviderFemMesh::setColorByElementId(const std::map &ElementColorMap) { - pcShapeMaterial->diffuseColor; - pcMatBinding->value = SoMaterialBinding::PER_FACE ; // resizing and writing the color vector: @@ -896,13 +894,15 @@ void ViewProviderFEMMeshBuilder::createMesh(const App::Property* prop, SoCoordin // sort out double nodes and build up index map std::map mapNodeIndex; - for(int l=0; l< FaceSize;l++){ - if(!facesHelper[l].hide) - for(int i=0; i<8;i++) + for(int l=0; l< FaceSize;l++) { + if(!facesHelper[l].hide) { + for(int i=0; i<8;i++) { if(facesHelper[l].Nodes[i]) mapNodeIndex[facesHelper[l].Nodes[i]]=0; else break; + } + } } Base::Console().Log(" %f: Start set point vector\n",Base::TimeInfo::diffTimeF(Start,Base::TimeInfo())); diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp index f525bbac0..aeb8ef47e 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.cpp @@ -171,23 +171,25 @@ App::DocumentObject* TaskTransformedParameters::getSketchObject() const void TaskTransformedParameters::hideObject() { Gui::Document* doc = Gui::Application::Instance->activeDocument(); - if (doc) + if (doc) { if (insideMultiTransform) { doc->setHide(parentTask->TransformedView->getObject()->getNameInDocument()); } else { doc->setHide(TransformedView->getObject()->getNameInDocument()); } + } } void TaskTransformedParameters::showObject() { Gui::Document* doc = Gui::Application::Instance->activeDocument(); - if (doc) + if (doc) { if (insideMultiTransform) { doc->setShow(parentTask->TransformedView->getObject()->getNameInDocument()); } else { doc->setShow(TransformedView->getObject()->getNameInDocument()); } + } } void TaskTransformedParameters::hideOriginals() diff --git a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp index e3ab6b9c6..93fc158a1 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherTools.cpp @@ -630,7 +630,6 @@ void CmdSketcherSelectElementsAssociatedWithConstraints::activated(int iMsg) { case Sketcher::none: ss << "Edge" << vals[ConstrId]->Second + 1; - vals[ConstrId]->Second; break; case Sketcher::start: case Sketcher::end: @@ -652,7 +651,6 @@ void CmdSketcherSelectElementsAssociatedWithConstraints::activated(int iMsg) { case Sketcher::none: ss << "Edge" << vals[ConstrId]->Third + 1; - vals[ConstrId]->Third; break; case Sketcher::start: case Sketcher::end: