From c2c22778e8b2174daef27807b0cda9efcf9f5d60 Mon Sep 17 00:00:00 2001
From: Paolo Cignoni cignoni <paolo.cignoni@isti.cnr.it>
Date: Thu, 28 Aug 2014 01:52:29 +0000
Subject: [PATCH] Added to the voronoi sampling filter the restricted voronoi
 relaxation option

---
 src/meshlabplugins/filter_voronoi/filter_voronoi.cpp | 7 +++++--
 src/meshlabplugins/filter_voronoi/filter_voronoi.xml | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/meshlabplugins/filter_voronoi/filter_voronoi.cpp b/src/meshlabplugins/filter_voronoi/filter_voronoi.cpp
index 60c6c1b64..febb646cc 100644
--- a/src/meshlabplugins/filter_voronoi/filter_voronoi.cpp
+++ b/src/meshlabplugins/filter_voronoi/filter_voronoi.cpp
@@ -138,7 +138,10 @@ bool FilterVoronoiPlugin::applyFilter( const QString& filterName,MeshDocument& m
      for(int i=0;i<iterNum;++i)
      {
        cb(100*i/iterNum, "Relaxing...");
-       tri::VoronoiProcessing<CMeshO, EuclideanDistance<CMeshO> >::VoronoiRelaxing(m.cm, seedVec, 1,dd,vpp);
+       if(env.evalEnum("relaxType")==2)
+         tri::VoronoiProcessing<CMeshO, EuclideanDistance<CMeshO> >::RestrictedVoronoiRelaxing(m.cm, seedVec, 10,vpp);
+       else
+         tri::VoronoiProcessing<CMeshO, EuclideanDistance<CMeshO> >::VoronoiRelaxing(m.cm, seedVec, 1,dd,vpp);
        md.updateRenderStateMeshes(meshlist,int(MeshModel::MM_VERTCOLOR));
        if (intteruptreq) return true;
      }
@@ -236,7 +239,7 @@ bool FilterVoronoiPlugin::applyFilter( const QString& filterName,MeshDocument& m
     Log("Base Poisson volume sampling at a radius %f ",poissonVolumeRadius);
 
     cb(40, "Relaxing Volume...");
-    vvs.RelaxVoronoiSamples(relaxStep);
+    vvs.BarycentricRelaxVoronoiSamples(relaxStep);
 
     cb(50, "Building Scaffloding Volume...");
     vvs.BuildScaffoldingMesh(sm->cm,voxelRes,isoThr,elemType,surfFlag);
diff --git a/src/meshlabplugins/filter_voronoi/filter_voronoi.xml b/src/meshlabplugins/filter_voronoi/filter_voronoi.xml
index 56590f85f..4832966fb 100644
--- a/src/meshlabplugins/filter_voronoi/filter_voronoi.xml
+++ b/src/meshlabplugins/filter_voronoi/filter_voronoi.xml
@@ -27,7 +27,7 @@
     <PARAM_HELP><![CDATA[]]></PARAM_HELP>
     <CHECKBOX_GUI guiLabel="Preprocessing"/>
    </PARAM>
-   <PARAM parName="relaxType" parIsImportant="true" parType="Enum { Geodesic : 0 | SquaredDistance : 1 }" parDefault="1">
+   <PARAM parName="relaxType" parIsImportant="true" parType="Enum { Geodesic : 0 | SquaredDistance : 1 | Restricted : 2 }" parDefault="1">
     <PARAM_HELP><![CDATA[
     At each relaxation step we search for each voronoi region the new position of the seed.
     According to the classical LLoyd relaxation strategy it should have been placed onto the
@@ -35,6 +35,7 @@
     <ul>
     <li> Geodesic: the seed is placed onto the vertex that maximize the geodesic distance from the border of the region </li>
     <li> Squared Distance: the seed is placed in the vertex that minimize the squared sum of the distances from all the pints of the region.</li>
+    <li> Restricted: .</li>
     </ul>
     ]]></PARAM_HELP>
     <ENUM_GUI guiLabel="Relax Type"/>