Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #1278: by default objects in study are not expanded
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_MergePolylinesOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_MergePolylinesOp.cxx
b/src/HYDROGUI/HYDROGUI_MergePolylinesOp.cxx
index 9e0eaf0ccea3f59905530671f787a34d8c86f473..b97ca96cea23a3c695990ff80992e5b6dd3f03e6 100644
(file)
--- 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();
return false;
QString aName = aPanel->GetResultName();
+ bool isConnectByNewSegment = aPanel->IsConnectByNewSegment();
HYDROData_SequenceOfObjects aPolylinesList = aPanel->selectedPolylines();
HYDROData_PolylineOperator anOp;
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;
theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer;
return true;