Merge remote-tracking branch 'origin/HEAD' into MoreBezier

CurveAux.cpp

@@ -1940,6 +1940,22 @@ CalcCurveVoronoiDiagram( const ICurve& crvC, ICURVEPOVECTOR& vCrvs, int nBound)
    return pVoronoiObj->CalcVoronoiDiagram( vCrvs, nBound) ;
 }
 
+//----------------------------------------------------------------------------
+bool 
+CalcCurvesVoronoiDiagram( const CICURVEPVECTOR& vCrvC, ICURVEPOVECTOR& vCrvs, int nBound) 
+{
+  // creo oggetto Voronoi con le curve passate
+   PtrOwner<Voronoi> pVoronoiObj( new( std::nothrow) Voronoi()) ;
+   if ( pVoronoiObj == nullptr)
+      return false ;
+   for ( int i = 0 ; i < int( vCrvC.size()) ; i ++) {
+      if ( ! pVoronoiObj->AddCurve( vCrvC[i]))
+         return false ;
+   }
+
+   return pVoronoiObj->CalcVoronoiDiagram( vCrvs, nBound) ;
+}
+
 //----------------------------------------------------------------------------
 bool 
 CalcCurveMedialAxis( const ICurve& crvC, ICURVEPOVECTOR& vCrvs, int nSide)
@@ -1951,6 +1967,22 @@ CalcCurveMedialAxis( const ICurve& crvC, ICURVEPOVECTOR& vCrvs, int nSide)
    return pVoronoiObj->CalcMedialAxis( vCrvs, nSide) ;
 }
 
+//----------------------------------------------------------------------------
+bool 
+CalcCurvesMedialAxis( const CICURVEPVECTOR& vCrvC, ICURVEPOVECTOR& vCrvs, int nSide)
+{
+  // creo oggetto Voronoi con le curve passate
+   PtrOwner<Voronoi> pVoronoiObj( new( std::nothrow) Voronoi()) ;
+   if ( pVoronoiObj == nullptr)
+      return false ;
+   for ( int i = 0 ; i < int( vCrvC.size()) ; i ++) {
+      if ( ! pVoronoiObj->AddCurve( vCrvC[i]))
+         return false ;
+   }
+
+   return pVoronoiObj->CalcMedialAxis( vCrvs, nSide) ;
+}
+
 //----------------------------------------------------------------------------
 bool 
 CalcCurveFatCurve( const ICurve& crvC, ICURVEPOVECTOR& vCrvs, double dRadius, bool bSquareEnds, bool bSquareMids)