#include <QStringList>
#include <QColor>
#include <Geom_BSplineCurve.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+#include <BRepLib_MakeWire.hxx>
#define _DEVDEBUG_
#include "HYDRO_trace.hxx"
{
std::vector<TopoDS_Shape> aCurvesList;
Split( aCurves[i], thePoint, theTolerance, aCurvesList );
- bool isLocalOK = CreatePolylines( theDoc, thePolyline->GetName(),
- aCurvesList, true, thePolyline->GetWireColor() );
+ bool isLocalOK = CreatePolylines( theDoc, thePolyline, aCurvesList, true );
isOK = isOK && isLocalOK;
}
return isOK;
bool isConnectByNewSegment,
double theTolerance )
{
- std::deque<HYDROData_TopoCurve> aMergedCurves;
+ Handle( HYDROData_PolylineXY ) aNewPolyline =
+ Handle( HYDROData_PolylineXY )::DownCast( theDoc->CreateObject( KIND_POLYLINEXY ) );
+ int ins =0;
+
HYDROData_SequenceOfObjects::Iterator aPIt(thePolylines);
- for (; aPIt.More(); aPIt.Next())
+
+ for (int ip=1; aPIt.More(); aPIt.Next(), ip++)
{
Handle(HYDROData_PolylineXY) aPolyline =
Handle(HYDROData_PolylineXY)::DownCast(aPIt.Value());
- std::vector<TopoDS_Wire> aWires;
- GetWires(aPolyline, aWires);
- for (std::vector<TopoDS_Wire>::const_iterator aWIt = aWires.begin(),
- aLastWIt = aWires.end(); aWIt != aLastWIt; ++aWIt)
- {
- const Standard_Boolean aResult = !isConnectByNewSegment ?
- HYDROData_TopoCurve::Merge(theTolerance, *aWIt, aMergedCurves) :
- HYDROData_TopoCurve::Connect(theTolerance, *aWIt, aMergedCurves);
- if (!aResult)
- {
- return false;
- }
- }
- }
+ NCollection_Sequence<TCollection_AsciiString> aSectNames;
+ NCollection_Sequence<HYDROData_PolylineXY::SectionType> aSectTypes;
+ NCollection_Sequence<bool> aSectClosures;
+ aPolyline->GetSections( aSectNames, aSectTypes, aSectClosures );
- TopoDS_Compound aWireSet;
- BRep_Builder aBuilder;
- aBuilder.MakeCompound(aWireSet);
- std::deque<HYDROData_TopoCurve>::iterator aCIt = aMergedCurves.begin();
- std::deque<HYDROData_TopoCurve>::iterator aLastCIt = aMergedCurves.end();
- for (; aCIt != aLastCIt; ++aCIt)
- {
- if (!aCIt->IsEmpty())
+ for ( int i = 1, n = aSectNames.Size(); i <= n; ++i )
{
- aBuilder.Add(aWireSet, aCIt->Wire());
+ const TCollection_AsciiString& aSectName = aSectNames.Value( i ) + "_" + ip;
+ const HYDROData_PolylineXY::SectionType& aSectType = aSectTypes.Value( i );
+ bool aSectClosure = aSectClosures.Value( i );
+ aNewPolyline->AddSection(aSectName, aSectType, aSectClosure);
+ HYDROData_PolylineXY::PointsList aPointsList = aPolyline->GetPoints(i-1, false);
+ aNewPolyline->SetPoints(ins++, aPointsList);
}
}
-
- std::vector<TopoDS_Shape> aPolylines(1);
- aPolylines[0] = aWireSet;
QString aName = theName;
if( aName.isEmpty() )
- aName = "merged";
- CreatePolylines( theDoc, aName, aPolylines, true, QColor() );
+ {
+ aName = "merged";
+ int anIndex = 1;
+ QString aNewName = aName + "_" + QString::number(anIndex);
+ while (!theDoc->FindObjectByName(aNewName).IsNull()) // the object with such a name is not found
+ {
+ anIndex++;
+ aNewName = aName + "_" + QString::number(anIndex);
+ }
+ aName = aNewName;
+ }
+
+ aNewPolyline->SetName(aName);
+ aNewPolyline->Update();
return true;
}
for (int aPSI = 0; aPSI < aPSCount; ++aPSI)
{
HYDROData_TopoCurve aCurve;
- DEBTRACE("Initialize curve " << aPSI);
+ //DEBTRACE("Initialize curve " << aPSI);
if (!aCurve.Initialize(aCurves[aPSI]))
{
continue;
aSplitCurves.end();
for (int iw=0; aCIt != aLastCIt; ++aCIt, iw++)
{
- std::stringstream brepName;
- brepName << "theSplitWire_";
- brepName << iw;
- brepName << ".brep";
- BRepTools::Write(aCIt->Wire() , brepName.str().c_str() );
- aResult.push_back(aCIt->Wire());
+ /*std::stringstream brepName;
+ brepName << "theSplitWire_";
+ brepName << iw;
+ brepName << ".brep";
+ BRepTools::Write(aCIt->Wire() , brepName.str().c_str() );*/
+ aResult.push_back(aCIt->Wire());
}
}
- CreatePolylines( theDoc, thePolyline->GetName(), aResult, true, thePolyline->GetWireColor() );
- //CreatePolylinesSplit( theDoc, thePolyline, aResult, true );
+ CreatePolylines( theDoc, thePolyline, aResult, true );
return true;
}
}
}
-//bool HYDROData_PolylineOperator::CreatePolylinesSplit(const Handle( HYDROData_Document )& theDoc,
-// const Handle( HYDROData_PolylineXY )& thePolyline,
-// const std::vector<TopoDS_Shape>& theShapes, bool isUseIndices)
-//{
-//
-// if (theDoc.IsNull())
-// return false;
-//
-// int nbSections = thePolyline->NbSections();
-// const QString& theNamePrefix = thePolyline->GetName();
-// const QColor& theColor = thePolyline->GetWireColor();
-//
-// int n = theShapes.size();
-// DEBTRACE("theShapes.size() "<< n);
-// int anIndex = 1;
-// for (int i = 0; i < n; i++)
-// {
-// Handle( HYDROData_PolylineXY ) aPolyline =
-// Handle( HYDROData_PolylineXY )::DownCast(theDoc->CreateObject(KIND_POLYLINEXY));
-// if (aPolyline.IsNull())
-// return false;
-//
-// for (int isec = 0; isec < nbSections; isec++)
-// {
-// gp_XY p = gp_XY(0, 0);
-// //double d = thePolyline->GetMinDistance(isec, p);
-// }
-//
-// if (isUseIndices)
-// {
-// QString aNewName = theNamePrefix + "_" + QString::number(anIndex);
-// while (!theDoc->FindObjectByName(aNewName).IsNull()) // the object with such a name is not found
-// {
-// anIndex++;
-// aNewName = theNamePrefix + "_" + QString::number(anIndex);
-// }
-// aPolyline->SetName(aNewName);
-// }
-// else
-// {
-// aPolyline->SetName(theNamePrefix);
-// }
-//
-// if (theColor.isValid())
-// aPolyline->SetWireColor(theColor);
-// }
-// return true;
-//
-//}
-
bool HYDROData_PolylineOperator::CreatePolylines( const Handle( HYDROData_Document )& theDoc,
- const QString& theNamePrefix,
+ const Handle( HYDROData_PolylineXY )& theOldPolyline,
const std::vector<TopoDS_Shape>& theShapes,
- bool isUseIndices,
- const QColor& theColor )
+ bool isUseIndices )
{
if( theDoc.IsNull() )
return false;
+ if ( theOldPolyline.IsNull() )
+ return false;
+ const QString& theNamePrefix = theOldPolyline->GetName();
+ const QColor& theColor = theOldPolyline->GetWireColor();
+
int n = theShapes.size();
- DEBTRACE("theShapes.size() "<< n);
+ //DEBTRACE("theShapes.size() "<< n);
int anIndex = 1;
for( int i=0; i<n; i++ )
{
if( aPolyline.IsNull() )
return false;
- aPolyline->ImportShape(theShapes[i], false);
- //aPolyline->SetShape( theShapes[i] );
-
+ aPolyline->ImportShape(theShapes[i], false, theOldPolyline, false);
if( isUseIndices )
{
QList<TopoDS_Shape> aBoundShapes;
QStringList aBoundNames;
+ QMap<QString, TopTools_IndexedMapOfShape> aNameToShMap;
theObject->GetBoundaries( aBoundShapes, aBoundNames );
continue;
QString aBoundName = i<aBoundNames.size() ? aBoundNames[i] : "";
+
+ if (!aNameToShMap.contains(aBoundName))
+ {
+ TopTools_IndexedMapOfShape IM;
+ IM.Add(aShape);
+ aNameToShMap[aBoundName] = IM;
+ }
+ else
+ aNameToShMap[aBoundName].Add(aShape);
+
+ }
+
+ foreach( QString K, aNameToShMap.keys() )
+ {
+ const TopTools_IndexedMapOfShape& IM = aNameToShMap.value(K);
+ TopTools_ListOfShape LSE;
+ for (int i = 1; i <= IM.Extent(); i++)
+ {
+ const TopoDS_Edge& E = TopoDS::Edge(IM(i));
+ if (E.IsNull())
+ continue;
+ LSE.Append(E);
+ }
+
+
+ TopoDS_Shape aShapeOut;
+ if (LSE.Extent() == 1)
+ {
+ aShapeOut = LSE.First();
+ }
+ else if (LSE.Extent() > 1)
+ {
+ BRepLib_MakeWire WM;
+ WM.Add(LSE);
+ if (WM.IsDone())
+ aShapeOut = WM.Wire();
+ else
+ continue;
+ }
+ else continue;
Handle( HYDROData_PolylineXY ) aPolyline =
Handle( HYDROData_PolylineXY )::DownCast( theDocument->CreateObject( KIND_POLYLINEXY ) );
-
+
if( aPolyline.IsNull() )
return false;
- aPolyline->SetShape( aShape );
+ aPolyline->SetShape( aShapeOut );
int anIndex = 0;
- QString aName = aBoundName;
+ QString aName = K;
while( !theDocument->FindObjectByName( aName ).IsNull() )
{
anIndex++;
- aName = aBoundName + "_" + QString::number( anIndex );
+ aName = K + "_" + QString::number( anIndex );
}
aPolyline->SetName( aName );
}
