Merge branch 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc

diff --git a/src/HYDROData/HYDROData_PolylineOperator.cxx b/src/HYDROData/HYDROData_PolylineOperator.cxx
index f95789d6f5bcd981f9ff98df66abc1c390558189..ed7a4a93fe558a958bbe7a5d2476eb3540fd11ce 100644 (file)
--- a/src/HYDROData/HYDROData_PolylineOperator.cxx
+++ b/src/HYDROData/HYDROData_PolylineOperator.cxx
@@ -511,6 +511,7 @@ bool HYDROData_PolylineOperator::CreatePolylines( const Handle( HYDROData_Docume
     return false;
 
   int n = theShapes.size();
+  int anIndex = 1;
   for( int i=0; i<n; i++ )
   {
     Handle( HYDROData_PolylineXY ) aPolyline = 
@@ -519,7 +520,18 @@ bool HYDROData_PolylineOperator::CreatePolylines( const Handle( HYDROData_Docume
       return false;
 
     aPolyline->SetShape( theShapes[i] );
-    //TODO: set name
+
+    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++;
+    }
+    else
+    {
+      aPolyline->SetName( theNamePrefix );
+    }
   }
   return true;
 }

diff --git a/src/HYDROGUI/HYDROGUI_SplitPolylinesDlg.cxx b/src/HYDROGUI/HYDROGUI_SplitPolylinesDlg.cxx
index aa70371aac72b4a49798d1c8e364e2146979724c..58699e13bb53f902b7d5d6d24a066c6f022e22c7 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_SplitPolylinesDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_SplitPolylinesDlg.cxx
@@ -149,6 +149,7 @@ void HYDROGUI_SplitPolylinesDlg::setPolylinesFromSelection()
 {
   myMainPolyline1->reset();
   myMainPolyline2->reset();
+  myToolPolyline->reset();
   myPolylines->reset();
 
   Handle( HYDROData_Entity ) anObject = HYDROGUI_Tool::GetSelectedObject( module() );