From 8e092b8262271b34d2b31ef2e9ecb9767ff9fe70 Mon Sep 17 00:00:00 2001 From: Max Lyon Date: Thu, 6 Jun 2013 14:59:15 +0000 Subject: [PATCH] fixed some cppcheck errors in propertyvis plugin git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@16833 383ad7c9-94d9-4d36-a494-682f7c89f535 --- OpenVolumeMesh/OVMPropertyModelT.cc | 12 ++++++------ OpenVolumeMesh/OVMPropertyVisualizerT.cc | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/OpenVolumeMesh/OVMPropertyModelT.cc b/OpenVolumeMesh/OVMPropertyModelT.cc index 5a338ab..4606479 100644 --- a/OpenVolumeMesh/OVMPropertyModelT.cc +++ b/OpenVolumeMesh/OVMPropertyModelT.cc @@ -639,7 +639,7 @@ bool OVMPropertyModel::isEntityType(const TypeInfoWrapper& typeInfo, Prop || (typeInfo == proptype_Cell_double) || (typeInfo == proptype_Cell_uint) || (typeInfo == proptype_Cell_Vec3d) - || (typeInfo == proptype_Cell_Vec3d); + || (typeInfo == proptype_Cell_Vec3f); } if (entity_type & PropertyInfo::EF_FACE) { @@ -648,7 +648,7 @@ bool OVMPropertyModel::isEntityType(const TypeInfoWrapper& typeInfo, Prop || (typeInfo == proptype_Face_double) || (typeInfo == proptype_Face_uint) || (typeInfo == proptype_Face_Vec3d) - || (typeInfo == proptype_Face_Vec3d); + || (typeInfo == proptype_Face_Vec3f); } if (entity_type & PropertyInfo::EF_HALFFACE) { @@ -657,7 +657,7 @@ bool OVMPropertyModel::isEntityType(const TypeInfoWrapper& typeInfo, Prop || (typeInfo == proptype_HalfFace_double) || (typeInfo == proptype_HalfFace_uint) || (typeInfo == proptype_HalfFace_Vec3d) - || (typeInfo == proptype_HalfFace_Vec3d); + || (typeInfo == proptype_HalfFace_Vec3f); } if (entity_type & PropertyInfo::EF_EDGE) { @@ -666,7 +666,7 @@ bool OVMPropertyModel::isEntityType(const TypeInfoWrapper& typeInfo, Prop || (typeInfo == proptype_Edge_double) || (typeInfo == proptype_Edge_uint) || (typeInfo == proptype_Edge_Vec3d) - || (typeInfo == proptype_Edge_Vec3d); + || (typeInfo == proptype_Edge_Vec3f); } if (entity_type & PropertyInfo::EF_HALFEDGE) { @@ -675,7 +675,7 @@ bool OVMPropertyModel::isEntityType(const TypeInfoWrapper& typeInfo, Prop || (typeInfo == proptype_HalfEdge_double) || (typeInfo == proptype_HalfEdge_uint) || (typeInfo == proptype_HalfEdge_Vec3d) - || (typeInfo == proptype_HalfEdge_Vec3d); + || (typeInfo == proptype_HalfEdge_Vec3f); } if (entity_type & PropertyInfo::EF_VERTEX) { @@ -684,7 +684,7 @@ bool OVMPropertyModel::isEntityType(const TypeInfoWrapper& typeInfo, Prop || (typeInfo == proptype_Vertex_double) || (typeInfo == proptype_Vertex_uint) || (typeInfo == proptype_Vertex_Vec3d) - || (typeInfo == proptype_Vertex_Vec3d); + || (typeInfo == proptype_Vertex_Vec3f); } return result; } diff --git a/OpenVolumeMesh/OVMPropertyVisualizerT.cc b/OpenVolumeMesh/OVMPropertyVisualizerT.cc index d5a00a5..7c2bdd1 100644 --- a/OpenVolumeMesh/OVMPropertyVisualizerT.cc +++ b/OpenVolumeMesh/OVMPropertyVisualizerT.cc @@ -346,8 +346,6 @@ void OVMPropertyVisualizer::clear() VolumeMeshObject* object; PluginFunctions::getObject(OVMPropertyVisualizer::mObjectID, object); - MeshT* mesh = OVMPropertyVisualizer::mesh; - if (propertyInfo.isCellProp()) object->colors().clear_cell_colors(); else if (propertyInfo.isFaceProp()) -- GitLab