X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_MergePolylinesOp.cxx;h=b97ca96cea23a3c695990ff80992e5b6dd3f03e6;hb=80b3ef265c1b8564a52097094156256956017ae1;hp=9e0eaf0ccea3f59905530671f787a34d8c86f473;hpb=8db2a634f4e26d4c58a13c3c09e319eab144e067;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_MergePolylinesOp.cxx b/src/HYDROGUI/HYDROGUI_MergePolylinesOp.cxx index 9e0eaf0c..b97ca96c 100644 --- a/src/HYDROGUI/HYDROGUI_MergePolylinesOp.cxx +++ b/src/HYDROGUI/HYDROGUI_MergePolylinesOp.cxx @@ -58,9 +58,11 @@ bool HYDROGUI_MergePolylinesOp::processApply( int& theUpdateFlags, return false; QString aName = aPanel->GetResultName(); + bool isConnectByNewSegment = aPanel->IsConnectByNewSegment(); HYDROData_SequenceOfObjects aPolylinesList = aPanel->selectedPolylines(); HYDROData_PolylineOperator anOp; - anOp.Merge( doc(), aName.toLatin1().data(), aPolylinesList ); + double aTolerance = 1E-7; //TODO + anOp.Merge( doc(), aName.toLatin1().data(), aPolylinesList, isConnectByNewSegment, aTolerance ); theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer; return true;