Merge branch 'master' of /home/kraemer/CGoGN

* 'master' of /home/kraemer/CGoGN:
  Mise a jour d'autres fonctions d'import pour le moment de la récupération du container (pour rester cohérent avec les autres fonctions)

include/Algo/Import/importInESS.hpp

@@ -59,10 +59,11 @@ bool importInESS(typename PFP::MAP& map, const std::string& filename, std::vecto
 {
 	typedef typename PFP::VEC3 VEC3;
 
-	AttribContainer& container = map.getAttributeContainer(VERTEX_CELL) ;
 	AttributeHandler<VEC3> position = map.template addAttribute<VEC3>(VERTEX_ORBIT, "position") ;
 	attrNames.push_back(position.name()) ;
 
+	AttribContainer& container = map.getAttributeContainer(VERTEX_CELL) ;
+
 	// open file
 	std::ifstream fp(filename.c_str(), std::ios::in);
 	if (!fp.good())

include/Algo/Import/importObjEle.hpp

@@ -39,11 +39,12 @@ bool importOFFWithELERegions(typename PFP::MAP& map, const std::string& filename
 {
 	typedef typename PFP::VEC3 VEC3;
 
-	AttribContainer& container = map.getAttributeContainer(VERTEX_CELL) ;
 	AttributeHandler<VEC3> position = map.template addAttribute<VEC3>(VERTEX_ORBIT, "position") ;
 	attrNames.push_back(position.name()) ;
 
-	unsigned int m_nbVertices=0, m_nbFaces=0, m_nbEdges=0, m_nbVolumes=0;
+	AttribContainer& container = map.getAttributeContainer(VERTEX_CELL) ;
+
+	unsigned int m_nbVertices = 0, m_nbFaces = 0, m_nbEdges = 0, m_nbVolumes = 0;
 
 	AutoAttributeHandler<  NoMathIONameAttribute< std::vector<Dart> > > vecDartsPerVertex(map, VERTEX_ORBIT, "incidents");
 

include/Algo/Import/importTet.hpp

@@ -37,11 +37,12 @@ bool importTet(typename PFP::MAP& map, const std::string& filename, std::vector<
 {
 	typedef typename PFP::VEC3 VEC3;
 
-	AttribContainer& container = map.getAttributeContainer(VERTEX_CELL) ;
 	AttributeHandler<VEC3> position = map.template addAttribute<VEC3>(VERTEX_ORBIT, "position") ;
 	attrNames.push_back(position.name()) ;
 
-	unsigned int m_nbVertices=0, m_nbFaces=0, m_nbEdges=0, m_nbVolumes=0;
+	AttribContainer& container = map.getAttributeContainer(VERTEX_CELL) ;
+
+	unsigned int m_nbVertices = 0, m_nbFaces = 0, m_nbEdges = 0, m_nbVolumes = 0;
 	AutoAttributeHandler<  NoMathIONameAttribute< std::vector<Dart> > > vecDartsPerVertex(map, VERTEX_ORBIT, "incidents");
 
 	// open file
@@ -75,7 +76,7 @@ bool importTet(typename PFP::MAP& map, const std::string& filename, std::vector<
 		do
 		{
 			std::getline (fp, ligne);
-		} while (ligne.size()==0);
+		} while (ligne.size() == 0);
 
 		std::stringstream oss(ligne);
 
@@ -102,7 +103,7 @@ bool importTet(typename PFP::MAP& map, const std::string& filename, std::vector<
 	// lecture tetra
 	// normalement m_nbVolumes*12 (car on ne charge que des tetra)
 
-	m_nbFaces=nbt*4;
+	m_nbFaces = nbt*4;
 
 	std::cout << "nb points = " << m_nbVertices << " / nb faces = " << m_nbFaces << " / nb edges = " << m_nbEdges << " / nb tet = " << m_nbVolumes << std::endl;
 
@@ -146,7 +147,7 @@ bool importTet(typename PFP::MAP& map, const std::string& filename, std::vector<
 				//vecDartPtrEmb[pt[j]].push_back(dd);
 				vecDartsPerVertex[pt[j]].push_back(dd);
 				dd = map.phi1(map.phi2(dd));
-			} while(dd!=d);
+			} while(dd != d);
 
 			d = map.phi1(d);
 

include/Algo/Import/importTs.hpp

@@ -43,13 +43,14 @@ bool importTs(typename PFP::MAP& map, const std::string& filename, std::vector<s
 	typedef typename PFP::VEC3 VEC3;
 	typedef typename PFP::REAL REAL;
 
-	AttribContainer& container = map.getAttributeContainer(VERTEX_CELL) ;
 	AttributeHandler<VEC3> position = map.template addAttribute<VEC3>(VERTEX_ORBIT, "position") ;
 	attrNames.push_back(position.name()) ;
 	AttributeHandler<REAL> scalaire = map.template addAttribute<REAL>(VERTEX_ORBIT, "scalar");
 	attrNames.push_back(scalaire.name()) ;
 
-	unsigned int m_nbVertices=0, m_nbFaces=0, m_nbEdges=0, m_nbVolumes=0;
+	AttribContainer& container = map.getAttributeContainer(VERTEX_CELL) ;
+
+	unsigned int m_nbVertices = 0, m_nbFaces = 0, m_nbEdges = 0, m_nbVolumes = 0;
 	AutoAttributeHandler< NoMathIONameAttribute< std::vector<Dart> > > vecDartsPerVertex(map, VERTEX_ORBIT, "incidents");
 
 	// open file