X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_PolylineOperator.cxx;h=d36f5fa115e2c0147d164ae1fa40be0fc21a3273;hb=c5ae2ec8ffa7b30a77bcef4fbb316c6ece4928b5;hp=6dbbd74562279b6c59b9958cf67c250f233b92e2;hpb=2f02a5b7680c10ed7fcd63f4ffb75af0932f5bb9;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_PolylineOperator.cxx b/src/HYDROData/HYDROData_PolylineOperator.cxx
index 6dbbd745..d36f5fa1 100644
--- a/src/HYDROData/HYDROData_PolylineOperator.cxx
+++ b/src/HYDROData/HYDROData_PolylineOperator.cxx
@@ -51,6 +51,11 @@
 #include <QColor>
 #include <Geom_BSplineCurve.hxx>
 
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+#include <BRepTools.hxx>
+#include <sstream>
+
 template<class T> void append( std::vector<T>& theList, const std::vector<T>& theList2 )
 {
   int aSize = theList.size();
@@ -83,8 +88,7 @@ bool HYDROData_PolylineOperator::Split( const Handle( HYDROData_Document )& theD
   {
     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;
@@ -127,46 +131,47 @@ bool HYDROData_PolylineOperator::Merge( const Handle( HYDROData_Document )& theD
                                         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;
 }
 
@@ -211,6 +216,7 @@ bool HYDROData_PolylineOperator::split( const Handle( HYDROData_Document )& theD
   for (int aPSI = 0; aPSI < aPSCount; ++aPSI)
   {
     HYDROData_TopoCurve aCurve;
+    //DEBTRACE("Initialize curve " << aPSI);
     if (!aCurve.Initialize(aCurves[aPSI]))
     {
       continue;
@@ -228,13 +234,18 @@ bool HYDROData_PolylineOperator::split( const Handle( HYDROData_Document )& theD
       aSplitCurves.begin();
     std::deque<HYDROData_TopoCurve>::const_iterator aLastCIt =
       aSplitCurves.end();
-    for (; aCIt != aLastCIt; ++aCIt)
+    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());
     }
   }
 
-  CreatePolylines( theDoc, thePolyline->GetName(), aResult, true, thePolyline->GetWireColor() );
+  CreatePolylines( theDoc, thePolyline, aResult, true );
   return true;
 }
 
@@ -284,15 +295,20 @@ void HYDROData_PolylineOperator::Split(
 }
 
 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);
   int anIndex = 1;
   for( int i=0; i<n; i++ )
   {
@@ -301,14 +317,17 @@ bool HYDROData_PolylineOperator::CreatePolylines( const Handle( HYDROData_Docume
     if( aPolyline.IsNull() )
       return false;
 
-    aPolyline->SetShape( theShapes[i] );
+    aPolyline->ImportShape(theShapes[i], false, theOldPolyline, false);
 
     if( isUseIndices )
     {
       QString aNewName = theNamePrefix + "_" + QString::number( anIndex );
-      if( theDoc->FindObjectByName( aNewName ).IsNull() )  // the object with such a name is not found
-        aPolyline->SetName( aNewName );
-      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
     {