refs #668: get the complete boundary of the object face as the splitting polyline.

diff --git a/src/HYDROData/HYDROData_LandCoverMap.cxx b/src/HYDROData/HYDROData_LandCoverMap.cxx
index 5487b6ad255d8e0c459d667e235f5415a53f6e25..e825ebb04d05b24f585b17b882d6b5f65f53743c 100644 (file)
--- a/src/HYDROData/HYDROData_LandCoverMap.cxx
+++ b/src/HYDROData/HYDROData_LandCoverMap.cxx
@@ -508,9 +508,21 @@ bool HYDROData_LandCoverMap::Split( const Handle( HYDROData_PolylineXY )& thePol
     return false;
 
   TopoDS_Shape aShape = thePolyline->GetShape();
-  return LocalPartition( aShape, "" );
+  return Split( aShape );
 }
 
+
+/**
+  Split the land cover map by the given polyline
+  @param theShape the tool polyline to split the land cover map
+  @return if the removing is successful
+*/
+bool HYDROData_LandCoverMap::Split( const TopoDS_Shape& theShape )
+{
+  return LocalPartition( theShape, "" );
+}
+
+
 /**
   Merge the given faces in the land cover
   @param theFaces the faces to merge in the land cover map

diff --git a/src/HYDROData/HYDROData_LandCoverMap.h b/src/HYDROData/HYDROData_LandCoverMap.h
index f3492f17da8de64034bea85198b03f15afbdcf02..d30ab979cd0e41c1fff21b8659727b11b0f3d521 100644 (file)
--- a/src/HYDROData/HYDROData_LandCoverMap.h
+++ b/src/HYDROData/HYDROData_LandCoverMap.h
@@ -105,6 +105,7 @@ public:
   HYDRODATA_EXPORT bool Remove( const TopTools_ListOfShape& );
 
   HYDRODATA_EXPORT bool Split( const Handle( HYDROData_PolylineXY )& );
+  HYDRODATA_EXPORT bool Split( const TopoDS_Shape& );
   HYDRODATA_EXPORT bool Merge( const TopTools_ListOfShape&, const QString& theType );
 
   HYDRODATA_EXPORT TopoDS_Face FindByPoint( const gp_Pnt2d&, QString& theType ) const;

diff --git a/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx b/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx
index 5e2c0b9e5705d41e573604f35d1cc276ac04dd94..5a4acc553911cd8128c40756841e057457374143 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx
@@ -250,10 +250,20 @@ bool HYDROGUI_LandCoverMapOp::processApply( int& theUpdateFlags,
       aLandCoverSplitted = aLandCoverMapObj->Split( aPolyline );
     else if ( !aFace.IsNull() )
     {
-      // TODO:
-      //Get the complete boundary of the object face as the splitting polyline
-      Handle(HYDROData_PolylineXY) aBoundaryPolyline;
-      aLandCoverSplitted = aLandCoverMapObj->Split( aBoundaryPolyline );
+      // Get the complete boundary of the object face as the splitting polyline
+      QList<TopoDS_Shape> aBoundShapes;
+      QStringList aBoundNames;
+      aFace->GetBoundaries( aBoundShapes, aBoundNames );
+
+      for( int i=0, n=aBoundShapes.size(); i<n; i++ )
+      {
+        TopoDS_Shape aShape = aBoundShapes[i];
+        if( aShape.IsNull() )
+          continue;
+
+        bool aSplitResult = aLandCoverMapObj->Split( aShape );
+        aLandCoverSplitted = ( i==0 ? aSplitResult : aLandCoverSplitted && aSplitResult );
+      }
     }
     if ( !aLandCoverSplitted )
     {