return false;
TopoDS_Shape aShape = theObject->GetTopShape();
- if( aShape.ShapeType()!=TopAbs_FACE )
- return false;
+ TopoDS_Face aFace;
- TopoDS_Face aFace = TopoDS::Face( aShape );
+ if( aShape.ShapeType() ==TopAbs_FACE )
+ {
+ aFace = TopoDS::Face(aShape);
+ }
+ else if ( aShape.ShapeType() ==TopAbs_COMPOUND )
+ {
+ TopoDS_Iterator It(aShape);
+ for (; It.More(); It.Next())
+ if (It.Value().ShapeType() == TopAbs_FACE)
+ {
+ aFace = TopoDS::Face(It.Value());
+ break;
+ }
+ }
+
+ if (aFace.IsNull())
+ return false;
return LocalPartition( aFace, theType );
}
*/
bool HYDROData_LandCoverMap::Split( const TopoDS_Shape& theShape )
{
- return LocalPartition( theShape, "" );
+ int aNbCL = GetLCCount();
+ bool aResult = LocalPartition( theShape, "" );
+ return aResult && aNbCL != GetLCCount();
}
bool HYDROData_LandCoverMap::Merge( const TopTools_ListOfShape& theFaces, const QString& theType )
{
// 1. to fuse the faces into the new face
- TopoDS_Shape aMergedFace = MergeFaces( theFaces, true );
- if( !aMergedFace.IsNull() && aMergedFace.ShapeType()==TopAbs_FACE )
- {
+ TopoDS_Shape aMergedFace = MergeFaces( theFaces, true );
+ bool aStat = true;
+ if( !aMergedFace.IsNull() )
+ {
// 2. to remove the merged faces from the current map
Remove( theFaces );
-
- // 3. to add the face into the map
- return LocalPartition( TopoDS::Face( aMergedFace ), theType );
+ TopExp_Explorer Exp(aMergedFace, TopAbs_FACE);
+ for( ; Exp.More(); Exp.Next() )
+ {
+ const TopoDS_Face& aCF = TopoDS::Face(Exp.Current());
+ // 3. to add the face into the map
+ aStat = aStat && LocalPartition( aCF, theType );
+ }
}
- return false;
+ else
+ aStat = false;
+ return aStat;
}
/**
QString aSType = anIt.StricklerType();
//std::cout << "from " << anIt.Face() << ": " << anIt.StricklerType() << std::endl;
TopTools_ListOfShape aModified = aBuilder.Modified( anIt.Face() );
-
- //
- TopTools_ListOfShape aGen = aBuilder.Generated( anIt.Face() );
//
if( aModified.Extent() == 0 )
aModified.Append( anIt.Face() );