From c9c2a13e387b0e65d9c953483977a7538fabebc1 Mon Sep 17 00:00:00 2001
From: Benoit LELANDAIS <benoit.lelandais@cea.fr>
Date: Tue, 7 Jan 2025 09:35:04 +0100
Subject: [PATCH] Fix issue#160: UniformSmoothFix removed

---
 Docs/CMakeLists.txt                           |  1 -
 .../EdgeMeshingPropertyUniformSmoothFix.cpp   | 90 -------------------
 .../EdgeMeshingPropertyUniformSmoothFix.h     | 61 -------------
 src/pyMagix3D/pyMagix3D.i                     |  2 -
 4 files changed, 154 deletions(-)
 delete mode 100644 src/Core/Topo/EdgeMeshingPropertyUniformSmoothFix.cpp
 delete mode 100644 src/Core/protected/Topo/EdgeMeshingPropertyUniformSmoothFix.h

diff --git a/Docs/CMakeLists.txt b/Docs/CMakeLists.txt
index 4e4c9d2..cd774b2 100644
--- a/Docs/CMakeLists.txt
+++ b/Docs/CMakeLists.txt
@@ -33,7 +33,6 @@ set(DOXYGEN_DIRS
   ${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/TopoInfo.h
   ${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/TopoManagerIfc.h
   ${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/EdgeMeshingPropertyUniform.h
-  ${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/EdgeMeshingPropertyUniformSmoothFix.h
   ${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/EdgeMeshingPropertyGeometric.h
   ${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/EdgeMeshingPropertyBigeometric.h
   ${PROJECT_SOURCE_DIR}/src/Core/protected/Topo/EdgeMeshingPropertyHyperbolic.h
diff --git a/src/Core/Topo/EdgeMeshingPropertyUniformSmoothFix.cpp b/src/Core/Topo/EdgeMeshingPropertyUniformSmoothFix.cpp
deleted file mode 100644
index d04d417..0000000
--- a/src/Core/Topo/EdgeMeshingPropertyUniformSmoothFix.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/*
- * \file EdgeMeshingPropertyUniformSmoothFix.cpp
- *
- *  \date 24 janv. 2012
- */
-/*----------------------------------------------------------------------------*/
-#include "Topo/EdgeMeshingPropertyUniformSmoothFix.h"
-#include <TkUtil/UTF8String.h>
-#include <TkUtil/Exception.h>
-#include "Utils/Common.h"
-/*----------------------------------------------------------------------------*/
-namespace Mgx3D {
-/*----------------------------------------------------------------------------*/
-namespace Topo {
-/*----------------------------------------------------------------------------*/
-    EdgeMeshingPropertyUniformSmoothFix::
-    EdgeMeshingPropertyUniformSmoothFix(int nb)
-: CoEdgeMeshingProperty(nb, uniforme_smoothfix, true)
-{
-}
-/*----------------------------------------------------------------------------*/
-    EdgeMeshingPropertyUniformSmoothFix::
-    EdgeMeshingPropertyUniformSmoothFix(int nb, Utils::Math::Point polar_center)
-: CoEdgeMeshingProperty(nb, polar_center, uniforme_smoothfix, true)
-{
-}
-/*----------------------------------------------------------------------------*/
-EdgeMeshingPropertyUniformSmoothFix::EdgeMeshingPropertyUniformSmoothFix (const CoEdgeMeshingProperty& prop)
-: CoEdgeMeshingProperty (prop.getNbEdges(), uniforme_smoothfix, prop.getDirect())
-{
-	const EdgeMeshingPropertyUniformSmoothFix*	p = reinterpret_cast<const EdgeMeshingPropertyUniformSmoothFix*>(&prop);
-	if (0 == p)
-	{
-		TkUtil::UTF8String	messErr (TkUtil::Charset::UTF_8);
-        	messErr << "EdgeMeshingPropertyUniformSmoothFix, la propriété transmise en argument n'est pas de type EdgeMeshingPropertyUniformSmoothFix";
-	        throw TkUtil::Exception(messErr);
-	}	// if (0 == p)
-}
-
-/*----------------------------------------------------------------------------*/
-bool EdgeMeshingPropertyUniformSmoothFix::operator == (const CoEdgeMeshingProperty& cedp) const
-{
-	const EdgeMeshingPropertyUniformSmoothFix*	props	=
-					dynamic_cast<const EdgeMeshingPropertyUniformSmoothFix*> (&cedp);
-	if (0 == props)
-		return false;
-
-	return CoEdgeMeshingProperty::operator == (cedp);
-}
-/*----------------------------------------------------------------------------*/
-double EdgeMeshingPropertyUniformSmoothFix::
-nextCoeff()
-{
-    m_dernierIndice+=1;
-
-#ifdef _DEBUG
-    if (m_dernierIndice>m_nb_edges){
-		TkUtil::UTF8String	messErr (TkUtil::Charset::UTF_8);
-        messErr<<"EdgeMeshingPropertyUniformSmoothFix::nextCoeff est en dehors des limites: dernierIndice : "
-                <<(long)m_dernierIndice<<", nb de bras : "<<(long)m_nb_edges;
-        throw TkUtil::Exception(messErr);
-    }
-#endif
-
-    return ((double)m_dernierIndice)/((double)m_nb_edges);
-}
-/*----------------------------------------------------------------------------*/
-TkUtil::UTF8String EdgeMeshingPropertyUniformSmoothFix::
-getScriptCommand() const
-{
-    TkUtil::UTF8String o (TkUtil::Charset::UTF_8);
-    o << getMgx3DAlias() << ".EdgeMeshingPropertyUniformSmoothFix(" << (long)m_nb_edges ;
-    if (isPolarCut())
-    	o << ", "<<getPolarCenter().getScriptCommand();
-    o	<< ")";
-    return o;
-}
-/*----------------------------------------------------------------------------*/
-void EdgeMeshingPropertyUniformSmoothFix::
-addDescription(Utils::SerializedRepresentation& topoProprietes) const
-{
-	// on considère que le nombre de bras et le type de maillage sont déjà donnés.
-	// rien à ajouter
-}
-/*----------------------------------------------------------------------------*/
-} // end namespace Topo
-/*----------------------------------------------------------------------------*/
-} // end namespace Mgx3D
-/*----------------------------------------------------------------------------*/
diff --git a/src/Core/protected/Topo/EdgeMeshingPropertyUniformSmoothFix.h b/src/Core/protected/Topo/EdgeMeshingPropertyUniformSmoothFix.h
deleted file mode 100644
index 1751d2d..0000000
--- a/src/Core/protected/Topo/EdgeMeshingPropertyUniformSmoothFix.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/*
- * \file EdgeMeshingPropertyUniformSmoothFix.h
- *
- *  \date 24 janv. 2012
- */
-/*----------------------------------------------------------------------------*/
-#ifndef EDGEPROPERTYMESHINGUNIFORMSMOOTHFIX_H_
-#define EDGEPROPERTYMESHINGUNIFORMSMOOTHFIX_H_
-/*----------------------------------------------------------------------------*/
-#include "Topo/CoEdgeMeshingProperty.h"
-/*----------------------------------------------------------------------------*/
-namespace Mgx3D {
-/*----------------------------------------------------------------------------*/
-namespace Topo {
-/*----------------------------------------------------------------------------*/
-/**
-   @brief Propriété de la discrétisation d'une arête avec une discrétisation uniforme
- */
-class EdgeMeshingPropertyUniformSmoothFix  : public CoEdgeMeshingProperty{
-public:
-
-    /// Constructeur avec un nombre de bras spécifié
-    EdgeMeshingPropertyUniformSmoothFix(int nb);
-
-    /// Constructeur avec un nombre de bras spécifié et un centre de découpage polaire
-    EdgeMeshingPropertyUniformSmoothFix(int nb, Utils::Math::Point polar_center);
-
-    /// Pour les pythoneries, cast par opérateur = :
-    EdgeMeshingPropertyUniformSmoothFix (const CoEdgeMeshingProperty&);
-
-    /// Comparaison de 2 propriétés.
-    virtual bool operator == (const CoEdgeMeshingProperty&) const;
-
-    /// Accesseur sur le nom de la méthode de maillage
-    virtual std::string getMeshLawName() const {return "uniforme_smoothfix";}
-
-#ifndef SWIG
-    /** Création d'un clone, on copie toutes les informations */
-    virtual CoEdgeMeshingProperty* clone() {return new EdgeMeshingPropertyUniformSmoothFix(*this);}
-
-    /// retourne le coefficient suivant pour les noeuds internes
-    virtual double nextCoeff();
-
-    /// Script pour la commande de création Python
-    virtual TkUtil::UTF8String getScriptCommand() const;
-
-    /*------------------------------------------------------------------------*/
-    /** Ajoute les informations spécifiques de cette discrétisation à
-     *  la représentation textuelle
-     */
-    virtual void addDescription(Utils::SerializedRepresentation& topoProprietes) const;
-#endif
-};
-/*----------------------------------------------------------------------------*/
-} // end namespace Topo
-/*----------------------------------------------------------------------------*/
-} // end namespace Mgx3D
-/*----------------------------------------------------------------------------*/
-
-#endif /* EDGEPROPERTYMESHINGUNIFORMSMOOTHFIX_H_ */
diff --git a/src/pyMagix3D/pyMagix3D.i b/src/pyMagix3D/pyMagix3D.i
index 1ed4690..75b360f 100644
--- a/src/pyMagix3D/pyMagix3D.i
+++ b/src/pyMagix3D/pyMagix3D.i
@@ -39,7 +39,6 @@ using std::ptrdiff_t;
 #include "Topo/TopoInfo.h"
 #include "Topo/TopoManagerIfc.h"
 #include "Topo/EdgeMeshingPropertyUniform.h"
-#include "Topo/EdgeMeshingPropertyUniformSmoothFix.h"
 #include "Topo/EdgeMeshingPropertyGeometric.h"
 #include "Topo/EdgeMeshingPropertyBigeometric.h"
 #include "Topo/EdgeMeshingPropertyHyperbolic.h"
@@ -308,7 +307,6 @@ using std::ptrdiff_t;
 %include Topo/TopoManagerIfc.h
 %include Topo/CoEdgeMeshingProperty.h
 %include Topo/EdgeMeshingPropertyUniform.h
-%include Topo/EdgeMeshingPropertyUniformSmoothFix.h
 %include Topo/EdgeMeshingPropertyGeometric.h
 %include Topo/EdgeMeshingPropertyBigeometric.h
 %include Topo/EdgeMeshingPropertyHyperbolic.h