From 28b025428caf5178432fb90496fe3634fb9201eb Mon Sep 17 00:00:00 2001 From: Pierre Kraemer Date: Thu, 13 Mar 2014 17:15:43 +0100 Subject: [PATCH] update filtering algos --- Apps/Examples/Debug/CMakeLists.txt | 10 ++-- Apps/Examples/Release/CMakeLists.txt | 3 +- Apps/Examples/mcmesh.cpp | 3 +- Apps/Examples/mcmesh.h | 4 +- SCHNApps/include/mapHandler.h | 1 - include/Algo/Filtering/average.h | 32 +++++------ include/Algo/Filtering/average_normals.h | 68 +++++++++++++----------- include/Algo/Filtering/bilateral.h | 6 +-- include/Algo/Filtering/functors.h | 17 +++--- include/Algo/Filtering/taubin.h | 17 +++--- include/Algo/Filtering/tools.h | 12 ++--- include/Container/containerBrowser.hpp | 1 - include/Topology/generic/attribmap.h | 52 ------------------ include/Topology/generic/attribmap.hpp | 29 ---------- include/Topology/map/map2.h | 1 - src/Topology/generic/attribmap.cpp | 46 ---------------- src/Topology/generic/genericmap.cpp | 2 +- src/Topology/generic/mapMono.cpp | 2 +- src/Topology/generic/mapMulti.cpp | 2 +- 19 files changed, 92 insertions(+), 216 deletions(-) delete mode 100644 include/Topology/generic/attribmap.h delete mode 100644 include/Topology/generic/attribmap.hpp delete mode 100644 src/Topology/generic/attribmap.cpp diff --git a/Apps/Examples/Debug/CMakeLists.txt b/Apps/Examples/Debug/CMakeLists.txt index f7ffb81a..104b49ab 100644 --- a/Apps/Examples/Debug/CMakeLists.txt +++ b/Apps/Examples/Debug/CMakeLists.txt @@ -63,19 +63,17 @@ target_link_libraries( clippingD ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} ) QT4_WRAP_UI( volumeExplorer_ui ../volumeExplorer.ui ) QT4_WRAP_CPP( volumeExplorer_moc ../volumeExplorer.h ) add_executable( volumeExplorerD ../volumeExplorer.cpp ${volumeExplorer_ui} ${volumeExplorer_moc}) -target_link_libraries( volumeExplorerD ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} ) +target_link_libraries( volumeExplorerD ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} ) #QT4_WRAP_UI( mcmesh_ui ../mcmesh.ui ) #QT4_WRAP_CPP( mcmesh_moc ../mcmesh.h ) #add_executable( mcmeshD ../mcmesh.cpp ${mcmesh_moc} ${mcmesh_ui} ) -#target_link_libraries( mcmeshD ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS}) +#target_link_libraries( mcmeshD ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} ) QT4_WRAP_CPP( concave_rendering_moc ../concave_rendering.h ) add_executable( concave_renderingD ../concave_rendering.cpp ${concave_rendering_moc} ${concave_rendering_ui} ) -target_link_libraries( concave_renderingD ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS}) +target_link_libraries( concave_renderingD ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} ) QT4_WRAP_CPP( viewerOBJ_moc ../viewerOBJ.h ) add_executable( viewerOBJD ../viewerOBJ.cpp ${viewerOBJ_moc} ) -target_link_libraries( viewerOBJD ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} ) - - +target_link_libraries( viewerOBJD ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} ) diff --git a/Apps/Examples/Release/CMakeLists.txt b/Apps/Examples/Release/CMakeLists.txt index af856d84..a48ab043 100644 --- a/Apps/Examples/Release/CMakeLists.txt +++ b/Apps/Examples/Release/CMakeLists.txt @@ -73,5 +73,4 @@ target_link_libraries( concave_rendering ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} ) QT4_WRAP_CPP( viewerOBJ_moc ../viewerOBJ.h ) add_executable( viewerOBJ ../viewerOBJ.cpp ${viewerOBJ_moc} ) -target_link_libraries( viewerOBJ ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} ) - +target_link_libraries( viewerOBJ ${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} ) diff --git a/Apps/Examples/mcmesh.cpp b/Apps/Examples/mcmesh.cpp index 862c5e56..037276f3 100644 --- a/Apps/Examples/mcmesh.cpp +++ b/Apps/Examples/mcmesh.cpp @@ -197,7 +197,6 @@ void MCMesh::sphere() myImg = new SAlgo::MC::Image(img,128,128,128,1.0f,1.0f,1.0f,false); } - /********************************************************************************************** * MAIN FUNCTION * **********************************************************************************************/ @@ -210,7 +209,7 @@ int main(int argc, char **argv) sqt.setGeometry(0, 0, 1000, 800); sqt.show(); - sqt.valLabel=DATATYPE(0); + sqt.valLabel = DATATYPE(0); if(argc == 2) { diff --git a/Apps/Examples/mcmesh.h b/Apps/Examples/mcmesh.h index e2010e57..bd0c4263 100644 --- a/Apps/Examples/mcmesh.h +++ b/Apps/Examples/mcmesh.h @@ -31,6 +31,8 @@ #include "Topology/generic/parameters.h" #include "Topology/map/embeddedMap2.h" +#include "Algo/MC/marchingcube.h" + #include "Geometry/vector_gen.h" #include "Geometry/matrix.h" @@ -40,8 +42,6 @@ #include "Utils/vbo.h" #include "Algo/Geometry/boundingbox.h" -#include "Algo/MC/marchingcube.h" - using namespace CGoGN ; diff --git a/SCHNApps/include/mapHandler.h b/SCHNApps/include/mapHandler.h index ccac5bd5..9ea099ef 100644 --- a/SCHNApps/include/mapHandler.h +++ b/SCHNApps/include/mapHandler.h @@ -9,7 +9,6 @@ #include "cellSelector.h" #include "Topology/generic/genericmap.h" -#include "Topology/generic/attribmap.h" #include "Topology/generic/functor.h" #include "Topology/generic/attributeHandler.h" diff --git a/include/Algo/Filtering/average.h b/include/Algo/Filtering/average.h index a0987781..653da686 100644 --- a/include/Algo/Filtering/average.h +++ b/include/Algo/Filtering/average.h @@ -43,11 +43,11 @@ enum neighborhood { INSIDE = 1, BORDER = 2 }; template void filterAverageAttribute_OneRing( typename PFP::MAP& map, - const VertexAttribute& attIn, - VertexAttribute& attOut, + const VertexAttribute& attIn, + VertexAttribute& attOut, int neigh) { - FunctorAverage fa(attIn) ; + FunctorAverage > fa(attIn) ; Algo::Surface::Selection::Collector_OneRing col(map) ; TraversorV t(map) ; @@ -88,13 +88,13 @@ void filterAverageAttribute_OneRing( template void filterAverageVertexAttribute_WithinSphere( typename PFP::MAP& map, - const VertexAttribute& attIn, - VertexAttribute& attOut, + const VertexAttribute& attIn, + VertexAttribute& attOut, int neigh, - VertexAttribute& position, + VertexAttribute& position, typename PFP::REAL radius) { - FunctorAverage faInside(attIn) ; + FunctorAverage > faInside(attIn) ; FunctorAverageOnSphereBorder faBorder(map, attIn, position) ; Algo::Surface::Selection::Collector_WithinSphere col(map, position, radius) ; @@ -129,13 +129,13 @@ void filterAverageVertexAttribute_WithinSphere( template void filterAverageEdgeAttribute_WithinSphere( typename PFP::MAP& map, - const EdgeAttribute& attIn, - EdgeAttribute& attOut, + const EdgeAttribute& attIn, + EdgeAttribute& attOut, int neigh, - VertexAttribute& position, + VertexAttribute& position, typename PFP::REAL radius) { - FunctorAverage fa(attIn) ; + FunctorAverage > fa(attIn) ; Algo::Surface::Selection::Collector_WithinSphere col(map, position, radius) ; TraversorE t(map) ; @@ -156,13 +156,13 @@ void filterAverageEdgeAttribute_WithinSphere( template void filterAverageFaceAttribute_WithinSphere( typename PFP::MAP& map, - const FaceAttribute& attIn, - FaceAttribute& attOut, + const FaceAttribute& attIn, + FaceAttribute& attOut, int neigh, - VertexAttribute& position, + VertexAttribute& position, typename PFP::REAL radius) { - FunctorAverage fa(attIn) ; + FunctorAverage > fa(attIn) ; Algo::Surface::Selection::Collector_WithinSphere col(map, position, radius) ; TraversorF t(map) ; @@ -182,7 +182,7 @@ void filterAverageFaceAttribute_WithinSphere( } // namespace Filtering -} +} // namespace Surface } // namespace Algo diff --git a/include/Algo/Filtering/average_normals.h b/include/Algo/Filtering/average_normals.h index 08c9dd4a..1c2c1b22 100644 --- a/include/Algo/Filtering/average_normals.h +++ b/include/Algo/Filtering/average_normals.h @@ -44,12 +44,12 @@ namespace Filtering template void computeNewPositionsFromFaceNormals( typename PFP::MAP& map, - const VertexAttribute& position, - VertexAttribute& position2, - const FaceAttribute& faceArea, - const FaceAttribute& faceCentroid, - const FaceAttribute& faceNormal, - const FaceAttribute& faceNewNormal) + const VertexAttribute& position, + VertexAttribute& position2, + const FaceAttribute& faceArea, + const FaceAttribute& faceCentroid, + const FaceAttribute& faceNormal, + const FaceAttribute& faceNewNormal) { typedef typename PFP::VEC3 VEC3 ; typedef typename PFP::REAL REAL ; @@ -77,20 +77,21 @@ void computeNewPositionsFromFaceNormals( } template -void filterAverageNormals(typename PFP::MAP& map, const VertexAttribute& position, VertexAttribute& position2) +void filterAverageNormals(typename PFP::MAP& map, const VertexAttribute& position, VertexAttribute& position2) { + typedef typename PFP::MAP::IMPL MAP_IMPL ; typedef typename PFP::VEC3 VEC3 ; typedef typename PFP::REAL REAL ; - FaceAutoAttribute faceArea(map, "faceArea") ; - FaceAutoAttribute faceNormal(map, "faceNormal") ; - FaceAutoAttribute faceCentroid(map, "faceCentroid") ; + FaceAutoAttribute faceArea(map, "faceArea") ; + FaceAutoAttribute faceNormal(map, "faceNormal") ; + FaceAutoAttribute faceCentroid(map, "faceCentroid") ; Algo::Surface::Geometry::computeAreaFaces(map, position, faceArea) ; Algo::Surface::Geometry::computeNormalFaces(map, position, faceNormal) ; Algo::Surface::Geometry::computeCentroidFaces(map, position, faceCentroid) ; - FaceAutoAttribute faceNewNormal(map, "faceNewNormal") ; + FaceAutoAttribute faceNewNormal(map, "faceNewNormal") ; // Compute new normals TraversorF tf(map) ; @@ -120,20 +121,21 @@ void filterAverageNormals(typename PFP::MAP& map, const VertexAttribute -void filterMMSE(typename PFP::MAP& map, float sigmaN2, const VertexAttribute& position, VertexAttribute& position2) +void filterMMSE(typename PFP::MAP& map, float sigmaN2, const VertexAttribute& position, VertexAttribute& position2) { + typedef typename PFP::MAP::IMPL MAP_IMPL ; typedef typename PFP::VEC3 VEC3 ; typedef typename PFP::REAL REAL ; - FaceAutoAttribute faceArea(map, "faceArea") ; - FaceAutoAttribute faceNormal(map, "faceNormal") ; - FaceAutoAttribute faceCentroid(map, "faceCentroid") ; + FaceAutoAttribute faceArea(map, "faceArea") ; + FaceAutoAttribute faceNormal(map, "faceNormal") ; + FaceAutoAttribute faceCentroid(map, "faceCentroid") ; Algo::Surface::Geometry::computeAreaFaces(map, position, faceArea) ; Algo::Surface::Geometry::computeNormalFaces(map, position, faceNormal) ; Algo::Surface::Geometry::computeCentroidFaces(map, position, faceCentroid) ; - FaceAutoAttribute faceNewNormal(map, "faceNewNormal") ; + FaceAutoAttribute faceNewNormal(map, "faceNewNormal") ; // Compute new normals TraversorF tf(map) ; @@ -204,20 +206,21 @@ void filterMMSE(typename PFP::MAP& map, float sigmaN2, const VertexAttribute -void filterTNBA(typename PFP::MAP& map, float sigmaN2, float SUSANthreshold, const VertexAttribute& position, VertexAttribute& position2) +void filterTNBA(typename PFP::MAP& map, float sigmaN2, float SUSANthreshold, const VertexAttribute& position, VertexAttribute& position2) { + typedef typename PFP::MAP::IMPL MAP_IMPL ; typedef typename PFP::VEC3 VEC3 ; typedef typename PFP::REAL REAL ; - FaceAutoAttribute faceArea(map, "faceArea") ; - FaceAutoAttribute faceNormal(map, "faceNormal") ; - FaceAutoAttribute faceCentroid(map, "faceCentroid") ; + FaceAutoAttribute faceArea(map, "faceArea") ; + FaceAutoAttribute faceNormal(map, "faceNormal") ; + FaceAutoAttribute faceCentroid(map, "faceCentroid") ; Algo::Surface::Geometry::computeAreaFaces(map, position, faceArea) ; Algo::Surface::Geometry::computeNormalFaces(map, position, faceNormal) ; Algo::Surface::Geometry::computeCentroidFaces(map, position, faceCentroid) ; - FaceAutoAttribute faceNewNormal(map, "faceNewNormal") ; + FaceAutoAttribute faceNewNormal(map, "faceNewNormal") ; // Compute new normals long nbTot = 0 ; @@ -322,22 +325,23 @@ void filterTNBA(typename PFP::MAP& map, float sigmaN2, float SUSANthreshold, con } template -void filterVNBA(typename PFP::MAP& map, float sigmaN2, float SUSANthreshold, const VertexAttribute& position, VertexAttribute& position2, const VertexAttribute& normal) +void filterVNBA(typename PFP::MAP& map, float sigmaN2, float SUSANthreshold, const VertexAttribute& position, VertexAttribute& position2, const VertexAttribute& normal) { + typedef typename PFP::MAP::IMPL MAP_IMPL ; typedef typename PFP::VEC3 VEC3 ; typedef typename PFP::REAL REAL ; - FaceAutoAttribute faceArea(map, "faceArea") ; - FaceAutoAttribute faceNormal(map, "faceNormal") ; - FaceAutoAttribute faceCentroid(map, "faceCentroid") ; + FaceAutoAttribute faceArea(map, "faceArea") ; + FaceAutoAttribute faceNormal(map, "faceNormal") ; + FaceAutoAttribute faceCentroid(map, "faceCentroid") ; Algo::Surface::Geometry::computeAreaFaces(map, position, faceArea) ; Algo::Surface::Geometry::computeNormalFaces(map, position, faceNormal) ; Algo::Surface::Geometry::computeCentroidFaces(map, position, faceCentroid) ; - VertexAutoAttribute vertexArea(map, "vertexArea") ; - FaceAutoAttribute faceNewNormal(map, "faceNewNormal") ; - VertexAutoAttribute vertexNewNormal(map, "vertexNewNormal") ; + VertexAutoAttribute vertexArea(map, "vertexArea") ; + FaceAutoAttribute faceNewNormal(map, "faceNewNormal") ; + VertexAutoAttribute vertexNewNormal(map, "vertexNewNormal") ; long nbTot = 0 ; long nbAdapt = 0 ; @@ -458,10 +462,10 @@ void filterVNBA(typename PFP::MAP& map, float sigmaN2, float SUSANthreshold, con // CGoGNout <<" adaptive rate = "<< float(nbAdapt)/float(nbTot)< -void sigmaBilateral(typename PFP::MAP& map, const VertexAttribute& position, const VertexAttribute& normal, float& sigmaC, float& sigmaS) +void sigmaBilateral(typename PFP::MAP& map, const VertexAttribute& position, const VertexAttribute& normal, float& sigmaC, float& sigmaS) { typedef typename PFP::VEC3 VEC3 ; @@ -60,7 +60,7 @@ void sigmaBilateral(typename PFP::MAP& map, const VertexAttribute -void filterBilateral(typename PFP::MAP& map, const VertexAttribute& position, VertexAttribute& position2, const VertexAttribute& normal) +void filterBilateral(typename PFP::MAP& map, const VertexAttribute& position, VertexAttribute& position2, const VertexAttribute& normal) { typedef typename PFP::VEC3 VEC3 ; @@ -96,7 +96,7 @@ void filterBilateral(typename PFP::MAP& map, const VertexAttribute -void filterSUSAN(typename PFP::MAP& map, float SUSANthreshold, const VertexAttribute& position, VertexAttribute& position2, const VertexAttribute& normal) +void filterSUSAN(typename PFP::MAP& map, float SUSANthreshold, const VertexAttribute& position, VertexAttribute& position2, const VertexAttribute& normal) { typedef typename PFP::VEC3 VEC3 ; diff --git a/include/Algo/Filtering/functors.h b/include/Algo/Filtering/functors.h index 6eaf8578..924cf894 100644 --- a/include/Algo/Filtering/functors.h +++ b/include/Algo/Filtering/functors.h @@ -40,16 +40,18 @@ namespace Surface namespace Filtering { -template +template class FunctorAverage : public virtual FunctorType { + typedef typename ATTR_TYPE::DATA_TYPE T ; + protected: - const AttributeHandler& attr ; + const ATTR_TYPE& attr ; T sum ; unsigned int count ; public: - FunctorAverage(const AttributeHandler& a) : FunctorType(), attr(a), sum(0), count(0) + FunctorAverage(const ATTR_TYPE& a) : FunctorType(), attr(a), sum(0), count(0) {} bool operator()(Dart d) { @@ -66,18 +68,19 @@ public: template class FunctorAverageOnSphereBorder : public FunctorMap { + typedef typename PFP::MAP::IMPL MAP_IMPL; typedef typename PFP::VEC3 VEC3; protected: - const VertexAttribute& attr ; - const VertexAttribute& position ; + const VertexAttribute& attr ; + const VertexAttribute& position ; VEC3 center; typename PFP::REAL radius; T sum ; unsigned int count ; public: - FunctorAverageOnSphereBorder(typename PFP::MAP& map, const AttributeHandler& a, const VertexAttribute& p) : + FunctorAverageOnSphereBorder(typename PFP::MAP& map, const VertexAttribute& a, const VertexAttribute& p) : FunctorMap(map), attr(a), position(p), sum(0), count(0) { center = VEC3(0); @@ -99,7 +102,7 @@ public: } // namespace Filtering -} +} // namespace Surface } // namespace Algo diff --git a/include/Algo/Filtering/taubin.h b/include/Algo/Filtering/taubin.h index cfc2be6f..241125c5 100644 --- a/include/Algo/Filtering/taubin.h +++ b/include/Algo/Filtering/taubin.h @@ -38,8 +38,10 @@ namespace Filtering { template -void filterTaubin(typename PFP::MAP& map, VertexAttribute& position, VertexAttribute& position2) +void filterTaubin(typename PFP::MAP& map, VertexAttribute& position, VertexAttribute& position2) { + typedef typename PFP::MAP MAP ; + typedef typename PFP::MAP::IMPL MAP_IMPL ; typedef typename PFP::VEC3 VEC3 ; Algo::Surface::Selection::Collector_OneRing c(map) ; @@ -47,9 +49,9 @@ void filterTaubin(typename PFP::MAP& map, VertexAttribute& p const float lambda = 0.6307 ; const float mu = -0.6732 ; - CellMarkerNoUnmark mv(map) ; + CellMarkerNoUnmark mv(map) ; - FunctorAverage fa1(position) ; + FunctorAverage > fa1(position) ; for(Dart d = map.begin(); d != map.end(); map.next(d)) { if( !mv.isMarked(d)) @@ -72,7 +74,7 @@ void filterTaubin(typename PFP::MAP& map, VertexAttribute& p } // unshrinking step - FunctorAverage fa2(position2) ; + FunctorAverage > fa2(position2) ; for(Dart d = map.begin(); d != map.end(); map.next(d)) { if( mv.isMarked(d)) @@ -99,14 +101,15 @@ void filterTaubin(typename PFP::MAP& map, VertexAttribute& p * Taubin filter modified as proposed by [Lav09] */ template -void filterTaubin_modified(typename PFP::MAP& map, VertexAttribute& position, VertexAttribute& position2, typename PFP::REAL radius) +void filterTaubin_modified(typename PFP::MAP& map, VertexAttribute& position, VertexAttribute& position2, typename PFP::REAL radius) { + typedef typename PFP::MAP MAP ; typedef typename PFP::VEC3 VEC3 ; const float lambda = 0.6307 ; const float mu = -0.6732 ; - CellMarkerNoUnmark mv(map) ; + CellMarkerNoUnmark mv(map) ; FunctorAverageOnSphereBorder fa1(map, position, position) ; Algo::Surface::Selection::Collector_WithinSphere c1(map, position, radius) ; @@ -158,7 +161,7 @@ void filterTaubin_modified(typename PFP::MAP& map, VertexAttribute -float computeHaussdorf(typename PFP::MAP& map, const VertexAttribute& originalPosition, const VertexAttribute& position2) +float computeHaussdorf(typename PFP::MAP& map, const VertexAttribute& originalPosition, const VertexAttribute& position2) { typedef typename PFP::VEC3 VEC3 ; @@ -88,7 +88,7 @@ float computeHaussdorf(typename PFP::MAP& map, const VertexAttribute -void computeNoise(typename PFP::MAP& map, long amount, const VertexAttribute& position, VertexAttribute& position2, const VertexAttribute& normal) +void computeNoise(typename PFP::MAP& map, long amount, const VertexAttribute& position, VertexAttribute& position2, const VertexAttribute& normal) { typedef typename PFP::VEC3 VEC3 ; @@ -135,7 +135,7 @@ void computeNoise(typename PFP::MAP& map, long amount, const VertexAttribute -void computeUnfirmAdditiveNoise(typename PFP::MAP& map, float noiseIntensity, const VertexAttribute& position, VertexAttribute& position2) +void computeUnfirmAdditiveNoise(typename PFP::MAP& map, float noiseIntensity, const VertexAttribute& position, VertexAttribute& position2) { typedef typename PFP::VEC3 VEC3 ; @@ -182,7 +182,7 @@ void computeUnfirmAdditiveNoise(typename PFP::MAP& map, float noiseIntensity, co //Gaussian-distributed additive noise //TODO do not touch to boundary vertices template -void computeGaussianAdditiveNoise(typename PFP::MAP& map, float noiseIntensity, const VertexAttribute& position, VertexAttribute& position2) +void computeGaussianAdditiveNoise(typename PFP::MAP& map, float noiseIntensity, const VertexAttribute& position, VertexAttribute& position2) { typedef typename PFP::VEC3 VEC3 ; @@ -252,7 +252,7 @@ namespace Filtering { template -void computeNoise(typename PFP::MAP& map, long amount, const VertexAttribute& position, VertexAttribute& position2) +void computeNoise(typename PFP::MAP& map, long amount, const VertexAttribute& position, VertexAttribute& position2) { typedef typename PFP::VEC3 VEC3 ; @@ -329,7 +329,7 @@ void computeNoise(typename PFP::MAP& map, long amount, const VertexAttribute -void computeNoiseGaussian(typename PFP::MAP& map, long amount, const VertexAttribute& position, VertexAttribute& position2) +void computeNoiseGaussian(typename PFP::MAP& map, long amount, const VertexAttribute& position, VertexAttribute& position2) { typedef typename PFP::VEC3 VEC3 ; diff --git a/include/Container/containerBrowser.hpp b/include/Container/containerBrowser.hpp index 94f10094..74ac7daf 100644 --- a/include/Container/containerBrowser.hpp +++ b/include/Container/containerBrowser.hpp @@ -23,7 +23,6 @@ *******************************************************************************/ #include "Topology/generic/dart.h" -#include "Topology/generic/attribmap.h" namespace CGoGN { diff --git a/include/Topology/generic/attribmap.h b/include/Topology/generic/attribmap.h deleted file mode 100644 index 3dfb3858..00000000 --- a/include/Topology/generic/attribmap.h +++ /dev/null @@ -1,52 +0,0 @@ -/******************************************************************************* -* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps * -* version 0.1 * -* Copyright (C) 2009-2012, IGG Team, LSIIT, University of Strasbourg * -* * -* This library is free software; you can redistribute it and/or modify it * -* under the terms of the GNU Lesser General Public License as published by the * -* Free Software Foundation; either version 2.1 of the License, or (at your * -* option) any later version. * -* * -* This library is distributed in the hope that it will be useful, but WITHOUT * -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License * -* for more details. * -* * -* You should have received a copy of the GNU Lesser General Public License * -* along with this library; if not, write to the Free Software Foundation, * -* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * -* * -* Web site: http://cgogn.unistra.fr/ * -* Contact information: cgogn@unistra.fr * -* * -*******************************************************************************/ - -#ifndef __ATTRIB_MAP__ -#define __ATTRIB_MAP__ - -#include "Topology/generic/genericmap.h" -#include "Topology/generic/attributeHandler.h" - -namespace CGoGN -{ - -class AttribMap : public GenericMap -{ -private: - void init() ; - -public: - static const unsigned int UNKNOWN_ATTRIB = AttributeContainer::UNKNOWN ; - - AttribMap() ; - - virtual void clear(bool removeAttrib) ; - -} ; - -} // namespace CGoGN - -#include "Topology/generic/attribmap.hpp" - -#endif diff --git a/include/Topology/generic/attribmap.hpp b/include/Topology/generic/attribmap.hpp deleted file mode 100644 index c9d251d9..00000000 --- a/include/Topology/generic/attribmap.hpp +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* -* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps * -* version 0.1 * -* Copyright (C) 2009-2012, IGG Team, LSIIT, University of Strasbourg * -* * -* This library is free software; you can redistribute it and/or modify it * -* under the terms of the GNU Lesser General Public License as published by the * -* Free Software Foundation; either version 2.1 of the License, or (at your * -* option) any later version. * -* * -* This library is distributed in the hope that it will be useful, but WITHOUT * -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License * -* for more details. * -* * -* You should have received a copy of the GNU Lesser General Public License * -* along with this library; if not, write to the Free Software Foundation, * -* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * -* * -* Web site: http://cgogn.unistra.fr/ * -* Contact information: cgogn@unistra.fr * -* * -*******************************************************************************/ - -namespace CGoGN -{ - - -} // namespace CGoGN diff --git a/include/Topology/map/map2.h b/include/Topology/map/map2.h index e7376410..662be4b1 100644 --- a/include/Topology/map/map2.h +++ b/include/Topology/map/map2.h @@ -517,7 +517,6 @@ public: unsigned int closeMap(bool forboundary = true); //@} - /*! @name Compute dual * These functions compute the dual mesh *************************************************************************/ diff --git a/src/Topology/generic/attribmap.cpp b/src/Topology/generic/attribmap.cpp deleted file mode 100644 index 15df2180..00000000 --- a/src/Topology/generic/attribmap.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/******************************************************************************* -* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps * -* version 0.1 * -* Copyright (C) 2009-2012, IGG Team, LSIIT, University of Strasbourg * -* * -* This library is free software; you can redistribute it and/or modify it * -* under the terms of the GNU Lesser General Public License as published by the * -* Free Software Foundation; either version 2.1 of the License, or (at your * -* option) any later version. * -* * -* This library is distributed in the hope that it will be useful, but WITHOUT * -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License * -* for more details. * -* * -* You should have received a copy of the GNU Lesser General Public License * -* along with this library; if not, write to the Free Software Foundation, * -* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * -* * -* Web site: http://cgogn.unistra.fr/ * -* Contact information: cgogn@unistra.fr * -* * -*******************************************************************************/ - -#include "Topology/generic/attribmap.h" - -namespace CGoGN -{ - -void AttribMap::init() -{ -} - -AttribMap::AttribMap() : GenericMap() -{ - init() ; -} - -void AttribMap::clear(bool removeAttrib) -{ - GenericMap::clear(removeAttrib) ; - if (removeAttrib) - init() ; -} - -} // namespace CGoGN diff --git a/src/Topology/generic/genericmap.cpp b/src/Topology/generic/genericmap.cpp index ec14940b..36147469 100644 --- a/src/Topology/generic/genericmap.cpp +++ b/src/Topology/generic/genericmap.cpp @@ -362,7 +362,7 @@ void GenericMap::restore_shortcuts() ss << "quickLocalIncidentTraversal_" << j; m_quickLocalIncidentTraversal[orbit][j] = cont.getDataVector< NoTypeNameAttribute > >(ss.str()) ; std::stringstream ss2; - ss2 << "quickLocalAdjacentTraversal" << j; + ss2 << "quickLocalAdjacentTraversal_" << j; m_quickLocalAdjacentTraversal[orbit][j] = cont.getDataVector< NoTypeNameAttribute > >(ss2.str()) ; } diff --git a/src/Topology/generic/mapMono.cpp b/src/Topology/generic/mapMono.cpp index f3cac8c1..dc61c358 100644 --- a/src/Topology/generic/mapMono.cpp +++ b/src/Topology/generic/mapMono.cpp @@ -108,7 +108,7 @@ bool MapMono::loadMapBin(const std::string& filename) unsigned int nbo = *ptr_nbo; if (nbo != NB_ORBITS) { - CGoGNerr << "Wrond max orbit number in file" << CGoGNendl; + CGoGNerr << "Wrong max orbit number in file" << CGoGNendl; return false; } diff --git a/src/Topology/generic/mapMulti.cpp b/src/Topology/generic/mapMulti.cpp index ac0c51c2..b4d50cfd 100644 --- a/src/Topology/generic/mapMulti.cpp +++ b/src/Topology/generic/mapMulti.cpp @@ -286,7 +286,7 @@ bool MapMulti::loadMapBin(const std::string& filename) unsigned int nbo = *ptr_nbo; if (nbo != NB_ORBITS) { - CGoGNerr << "Wrond max orbit number in file" << CGoGNendl; + CGoGNerr << "Wrong max orbit number in file" << CGoGNendl; return false; } -- GitLab