Skip to content
Snippets Groups Projects
Commit 8e092b82 authored by Max Lyon's avatar Max Lyon
Browse files

fixed some cppcheck errors in propertyvis plugin

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@16833 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 88e2f20c
No related branches found
No related tags found
No related merge requests found
...@@ -639,7 +639,7 @@ bool OVMPropertyModel<MeshT>::isEntityType(const TypeInfoWrapper& typeInfo, Prop ...@@ -639,7 +639,7 @@ bool OVMPropertyModel<MeshT>::isEntityType(const TypeInfoWrapper& typeInfo, Prop
|| (typeInfo == proptype_Cell_double) || (typeInfo == proptype_Cell_double)
|| (typeInfo == proptype_Cell_uint) || (typeInfo == proptype_Cell_uint)
|| (typeInfo == proptype_Cell_Vec3d) || (typeInfo == proptype_Cell_Vec3d)
|| (typeInfo == proptype_Cell_Vec3d); || (typeInfo == proptype_Cell_Vec3f);
} }
if (entity_type & PropertyInfo::EF_FACE) if (entity_type & PropertyInfo::EF_FACE)
{ {
...@@ -648,7 +648,7 @@ bool OVMPropertyModel<MeshT>::isEntityType(const TypeInfoWrapper& typeInfo, Prop ...@@ -648,7 +648,7 @@ bool OVMPropertyModel<MeshT>::isEntityType(const TypeInfoWrapper& typeInfo, Prop
|| (typeInfo == proptype_Face_double) || (typeInfo == proptype_Face_double)
|| (typeInfo == proptype_Face_uint) || (typeInfo == proptype_Face_uint)
|| (typeInfo == proptype_Face_Vec3d) || (typeInfo == proptype_Face_Vec3d)
|| (typeInfo == proptype_Face_Vec3d); || (typeInfo == proptype_Face_Vec3f);
} }
if (entity_type & PropertyInfo::EF_HALFFACE) if (entity_type & PropertyInfo::EF_HALFFACE)
{ {
...@@ -657,7 +657,7 @@ bool OVMPropertyModel<MeshT>::isEntityType(const TypeInfoWrapper& typeInfo, Prop ...@@ -657,7 +657,7 @@ bool OVMPropertyModel<MeshT>::isEntityType(const TypeInfoWrapper& typeInfo, Prop
|| (typeInfo == proptype_HalfFace_double) || (typeInfo == proptype_HalfFace_double)
|| (typeInfo == proptype_HalfFace_uint) || (typeInfo == proptype_HalfFace_uint)
|| (typeInfo == proptype_HalfFace_Vec3d) || (typeInfo == proptype_HalfFace_Vec3d)
|| (typeInfo == proptype_HalfFace_Vec3d); || (typeInfo == proptype_HalfFace_Vec3f);
} }
if (entity_type & PropertyInfo::EF_EDGE) if (entity_type & PropertyInfo::EF_EDGE)
{ {
...@@ -666,7 +666,7 @@ bool OVMPropertyModel<MeshT>::isEntityType(const TypeInfoWrapper& typeInfo, Prop ...@@ -666,7 +666,7 @@ bool OVMPropertyModel<MeshT>::isEntityType(const TypeInfoWrapper& typeInfo, Prop
|| (typeInfo == proptype_Edge_double) || (typeInfo == proptype_Edge_double)
|| (typeInfo == proptype_Edge_uint) || (typeInfo == proptype_Edge_uint)
|| (typeInfo == proptype_Edge_Vec3d) || (typeInfo == proptype_Edge_Vec3d)
|| (typeInfo == proptype_Edge_Vec3d); || (typeInfo == proptype_Edge_Vec3f);
} }
if (entity_type & PropertyInfo::EF_HALFEDGE) if (entity_type & PropertyInfo::EF_HALFEDGE)
{ {
...@@ -675,7 +675,7 @@ bool OVMPropertyModel<MeshT>::isEntityType(const TypeInfoWrapper& typeInfo, Prop ...@@ -675,7 +675,7 @@ bool OVMPropertyModel<MeshT>::isEntityType(const TypeInfoWrapper& typeInfo, Prop
|| (typeInfo == proptype_HalfEdge_double) || (typeInfo == proptype_HalfEdge_double)
|| (typeInfo == proptype_HalfEdge_uint) || (typeInfo == proptype_HalfEdge_uint)
|| (typeInfo == proptype_HalfEdge_Vec3d) || (typeInfo == proptype_HalfEdge_Vec3d)
|| (typeInfo == proptype_HalfEdge_Vec3d); || (typeInfo == proptype_HalfEdge_Vec3f);
} }
if (entity_type & PropertyInfo::EF_VERTEX) if (entity_type & PropertyInfo::EF_VERTEX)
{ {
...@@ -684,7 +684,7 @@ bool OVMPropertyModel<MeshT>::isEntityType(const TypeInfoWrapper& typeInfo, Prop ...@@ -684,7 +684,7 @@ bool OVMPropertyModel<MeshT>::isEntityType(const TypeInfoWrapper& typeInfo, Prop
|| (typeInfo == proptype_Vertex_double) || (typeInfo == proptype_Vertex_double)
|| (typeInfo == proptype_Vertex_uint) || (typeInfo == proptype_Vertex_uint)
|| (typeInfo == proptype_Vertex_Vec3d) || (typeInfo == proptype_Vertex_Vec3d)
|| (typeInfo == proptype_Vertex_Vec3d); || (typeInfo == proptype_Vertex_Vec3f);
} }
return result; return result;
} }
......
...@@ -346,8 +346,6 @@ void OVMPropertyVisualizer<MeshT>::clear() ...@@ -346,8 +346,6 @@ void OVMPropertyVisualizer<MeshT>::clear()
VolumeMeshObject<MeshT>* object; VolumeMeshObject<MeshT>* object;
PluginFunctions::getObject(OVMPropertyVisualizer<MeshT>::mObjectID, object); PluginFunctions::getObject(OVMPropertyVisualizer<MeshT>::mObjectID, object);
MeshT* mesh = OVMPropertyVisualizer<MeshT>::mesh;
if (propertyInfo.isCellProp()) if (propertyInfo.isCellProp())
object->colors().clear_cell_colors(); object->colors().clear_cell_colors();
else if (propertyInfo.isFaceProp()) else if (propertyInfo.isFaceProp())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment