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

+ fix many minor warnings, activate -Wall for gcc

Browse Source
This commit is contained in:
wwmayer
2015-08-02 22:32:18 +02:00
parent 8a8d56c317
commit 6bf065c097
20 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Mesh/App/Core/Projection.cpp
View File

@@ -396,7 +396,7 @@ bool MeshProjection::projectLineOnMesh(const MeshFacetGrid& grid,
// cut all facets with plane
std::list< std::pair<Base::Vector3f, Base::Vector3f> > cutLine;
unsigned long start = 0, end = 0;
//unsigned long start = 0, end = 0;
for (std::vector<unsigned long>::iterator it = facets.begin(); it != facets.end(); ++it) {
Base::Vector3f e1, e2;
MeshGeomFacet tria = kernel.GetFacet(*it);
@@ -418,7 +418,7 @@ bool MeshProjection::projectLineOnMesh(const MeshFacetGrid& grid,
else
cutLine.push_back(std::pair<Base::Vector3f, Base::Vector3f>(v1, e1));
start = it - facets.begin();
//start = it - facets.begin();
}
if (*it == f2) { // end facet
@@ -427,7 +427,7 @@ bool MeshProjection::projectLineOnMesh(const MeshFacetGrid& grid,
else
cutLine.push_back(std::pair<Base::Vector3f, Base::Vector3f>(v2, e1));
end = it - facets.begin();
//end = it - facets.begin();
}
}
}

4
src/Mod/Mesh/Gui/ViewProvider.cpp
View File

@@ -568,10 +568,10 @@ bool ViewProviderMesh::exportToVrml(const char* filename, const MeshCore::Materi
SoMaterialBinding* binding = new SoMaterialBinding;
SoMaterial* material = new SoMaterial;
if (mat.diffuseColor.size() == coords->point.getNum()) {
if (static_cast<int>(mat.diffuseColor.size()) == coords->point.getNum()) {
binding->value = SoMaterialBinding::PER_VERTEX_INDEXED;
}
else if (mat.diffuseColor.size() == faces->coordIndex.getNum()/4) {
else if (static_cast<int>(mat.diffuseColor.size()) == faces->coordIndex.getNum()/4) {
binding->value = SoMaterialBinding::PER_FACE_INDEXED;
}

2
src/Mod/Part/App/PrimitiveFeature.cpp
View File

@@ -826,7 +826,7 @@ App::DocumentObjectExecReturn *Helix::execute(void)
Standard_Real myRadius = Radius.getValue();
Standard_Real myAngle = Angle.getValue();
Standard_Boolean myLocalCS = LocalCoord.getValue() ? Standard_True : Standard_False;
Standard_Boolean myStyle = Style.getValue() ? Standard_True : Standard_False;
//Standard_Boolean myStyle = Style.getValue() ? Standard_True : Standard_False;
TopoShape helix;
// work around for OCC bug #23314 (FC #0954)
// the exact conditions for failure are unknown. building the helix 1 turn at a time

1
src/Mod/Part/Gui/SoBrepFaceSet.cpp
View File

@@ -866,6 +866,7 @@ void SoBrepFaceSet::renderShape(const SoGLCoordinateElement * const vertexlist,
break;
}
v4 = viptr < viendptr ? *viptr++ : -1;
(void)v4;
/* vertex 1 *********************************************************/
if (mbind == PER_PART) {

8
src/Mod/Part/Gui/ViewProviderBoolean.cpp
View File

@@ -106,7 +106,7 @@ void ViewProviderBoolean::updateData(const App::Property* prop)
colBool.resize(boolMap.Extent(), this->ShapeColor.getValue());
bool setColor=false;
if (colBase.size() == baseMap.Extent()) {
if (static_cast<int>(colBase.size()) == baseMap.Extent()) {
applyColor(hist[0], colBase, colBool);
setColor = true;
}
@@ -115,7 +115,7 @@ void ViewProviderBoolean::updateData(const App::Property* prop)
applyColor(hist[0], colBase, colBool);
setColor = true;
}
if (colTool.size() == toolMap.Extent()) {
if (static_cast<int>(colTool.size()) == toolMap.Extent()) {
applyColor(hist[1], colTool, colBool);
setColor = true;
}
@@ -199,7 +199,7 @@ void ViewProviderMultiFuse::updateData(const App::Property* prop)
Gui::ViewProvider* vpBase = Gui::Application::Instance->getViewProvider(objBase);
std::vector<App::Color> colBase = static_cast<PartGui::ViewProviderPart*>(vpBase)->DiffuseColor.getValues();
if (colBase.size() == baseMap.Extent()) {
if (static_cast<int>(colBase.size()) == baseMap.Extent()) {
applyColor(hist[index], colBase, colBool);
setColor = true;
}
@@ -316,7 +316,7 @@ void ViewProviderMultiCommon::updateData(const App::Property* prop)
Gui::ViewProvider* vpBase = Gui::Application::Instance->getViewProvider(objBase);
std::vector<App::Color> colBase = static_cast<PartGui::ViewProviderPart*>(vpBase)->DiffuseColor.getValues();
if (colBase.size() == baseMap.Extent()) {
if (static_cast<int>(colBase.size()) == baseMap.Extent()) {
applyColor(hist[index], colBase, colBool);
setColor = true;
}

2
src/Mod/Part/Gui/ViewProviderCompound.cpp
View File

@@ -92,7 +92,7 @@ void ViewProviderCompound::updateData(const App::Property* prop)
Gui::ViewProvider* vpBase = Gui::Application::Instance->getViewProvider(objBase);
std::vector<App::Color> baseCol = static_cast<PartGui::ViewProviderPart*>(vpBase)->DiffuseColor.getValues();
if (baseCol.size() == baseMap.Extent()) {
if (static_cast<int>(baseCol.size()) == baseMap.Extent()) {
applyColor(hist[index], baseCol, compCol);
setColor = true;
}

1
src/Mod/Part/Gui/ViewProviderExt.cpp
View File

@@ -762,7 +762,6 @@ void ViewProviderPartExt::updateVisual(const TopoDS_Shape& inputShape)
bounds.Get(xMin, yMin, zMin, xMax, yMax, zMax);
Standard_Real deflection = ((xMax-xMin)+(yMax-yMin)+(zMax-zMin))/300.0 *
Deviation.getValue();
Standard_Real AngDeflectionRads = AngularDeflection.getValue() / 180.0 * M_PI;
// create or use the mesh on the data structure
#if OCC_VERSION_HEX >= 0x060600

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

@@ -253,7 +253,7 @@ void ViewProviderFillet::updateData(const App::Property* prop)
colFill.resize(fillMap.Extent(), static_cast<PartGui::ViewProviderPart*>(vpBase)->ShapeColor.getValue());
bool setColor=false;
if (colBase.size() == baseMap.Extent()) {
if (static_cast<int>(colBase.size()) == baseMap.Extent()) {
applyColor(hist[0], colBase, colFill);
setColor = true;
}
@@ -356,7 +356,7 @@ void ViewProviderChamfer::updateData(const App::Property* prop)
colCham.resize(chamMap.Extent(), static_cast<PartGui::ViewProviderPart*>(vpBase)->ShapeColor.getValue());
bool setColor=false;
if (colBase.size() == baseMap.Extent()) {
if (static_cast<int>(colBase.size()) == baseMap.Extent()) {
applyColor(hist[0], colBase, colCham);
setColor = true;
}

1
src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp
View File

@@ -250,7 +250,6 @@ void ViewProviderTransformed::recomputeFeature(void)
bounds.Get(xMin, yMin, zMin, xMax, yMax, zMax);
}
Standard_Real deflection = ((xMax-xMin)+(yMax-yMin)+(zMax-zMin))/300.0 * Deviation.getValue();
Standard_Real AngDeflectionRads = AngularDeflection.getValue() / 180.0 * M_PI;
// create or use the mesh on the data structure
#if OCC_VERSION_HEX >= 0x060600