diff --git a/src/Mod/Fem/App/FemPostFunction.cpp b/src/Mod/Fem/App/FemPostFunction.cpp index c65ff6cea3..2581302099 100644 --- a/src/Mod/Fem/App/FemPostFunction.cpp +++ b/src/Mod/Fem/App/FemPostFunction.cpp @@ -63,18 +63,19 @@ DocumentObjectExecReturn* FemPostFunction::execute() { // cylinder function PROPERTY_SOURCE(Fem::FemPostCylinderFunction, Fem::FemPostFunction) -FemPostCylinderFunction::FemPostCylinderFunction() : FemPostFunction() +FemPostCylinderFunction::FemPostCylinderFunction() + : FemPostFunction() { ADD_PROPERTY(Center, (Base::Vector3d(0.0, 0.0, 0.0))); ADD_PROPERTY(Axis, (Base::Vector3d(0.0, 0.0, 1.0))); - ADD_PROPERTY(Radius, (5.)); + ADD_PROPERTY(Radius, (5.0)); m_cylinder = vtkSmartPointer::New(); m_implicit = m_cylinder; - m_cylinder->SetAxis(0., 0., 1.); - m_cylinder->SetCenter(0., 0., 0.); - m_cylinder->SetRadius(5.); + m_cylinder->SetAxis(0.0, 0.0, 1.0); + m_cylinder->SetCenter(0.0, 0.0, 0.0); + m_cylinder->SetRadius(5.0); } FemPostCylinderFunction::~FemPostCylinderFunction() diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt index 85b8e2b754..e4ce4ba555 100755 --- a/src/Mod/Fem/Gui/CMakeLists.txt +++ b/src/Mod/Fem/Gui/CMakeLists.txt @@ -91,17 +91,17 @@ set(FemGui_UIC_SRCS if(BUILD_FEM_VTK) set(FemGui_UIC_SRCS ${FemGui_UIC_SRCS} - TaskPostDisplay.ui - TaskPostClip.ui - TaskPostContours.ui - TaskPostDataAlongLine.ui - TaskPostDataAtPoint.ui - TaskPostScalarClip.ui - TaskPostWarpVector.ui - TaskPostCut.ui CylinderWidget.ui PlaneWidget.ui SphereWidget.ui + TaskPostClip.ui + TaskPostContours.ui + TaskPostCut.ui + TaskPostDataAlongLine.ui + TaskPostDataAtPoint.ui + TaskPostDisplay.ui + TaskPostScalarClip.ui + TaskPostWarpVector.ui ) endif(BUILD_FEM_VTK) @@ -273,16 +273,16 @@ if(BUILD_FEM_VTK) CylinderWidget.ui PlaneWidget.ui SphereWidget.ui - TaskPostClip.ui - TaskPostContours.ui - TaskPostDataAlongLine.ui - TaskPostDataAtPoint.ui - TaskPostScalarClip.ui - TaskPostDisplay.ui - TaskPostWarpVector.ui - TaskPostCut.ui TaskPostBoxes.h TaskPostBoxes.cpp + TaskPostClip.ui + TaskPostContours.ui + TaskPostCut.ui + TaskPostDataAlongLine.ui + TaskPostDataAtPoint.ui + TaskPostDisplay.ui + TaskPostScalarClip.ui + TaskPostWarpVector.ui ) endif(BUILD_FEM_VTK) SOURCE_GROUP("Task_Boxes" FILES ${FemGui_SRCS_TaskBoxes}) diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp index 64b15d7167..0fb84f3d7e 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp @@ -885,32 +885,33 @@ SoGroup* postCylinder() { SoCoordinate3* points = new SoCoordinate3(); int nCirc = 20; - int nSide = 8; - float h = 3.; - points->point.setNum(2*(nCirc + 1 + nSide)); + const int nSide = 8; + float h = 3.0; + points->point.setNum(2 * (nCirc + 1 + nSide)); int idx = 0; // top and bottom for (int i = 0; i < 2; ++i) { for (int j = 0; j < nCirc + 1; ++j) { - points->point.set1Value(idx, SbVec3f(std::cos(2*M_PI/nCirc*j), - std::sin(2*M_PI/nCirc*j), - -h/2. + h*i)); + points->point.set1Value(idx, + SbVec3f(std::cos(2 * M_PI / nCirc * j), + std::sin(2 * M_PI / nCirc * j), + -h / 2. + h * i)); ++idx; } - } // sides for (int i = 0; i < nSide; ++i) { for (int j = 0; j < 2; ++j) { - points->point.set1Value(idx, SbVec3f(std::cos(2*M_PI/nSide*i), - std::sin(2*M_PI/nSide*i), - -h/2. + h*j)); + points->point.set1Value(idx, + SbVec3f(std::cos(2 * M_PI / nSide * i), + std::sin(2 * M_PI / nSide * i), + -h / 2. + h * j)); ++idx; } } // numVertices - int vert[nSide + 2]; + int vert[nSide + 2] {}; vert[0] = nCirc + 1; vert[1] = nCirc + 1; for (int i = 0; i < nSide; ++i) {