From 1db636b7ff138bd7b3ac84f1c77a42299b259983 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 6 Oct 2015 15:09:51 +0300 Subject: [PATCH] 0052898: TC 7.7.0: Regression "Glue Faces" dialog glues all faces instead selected faces --- src/GEOM/GEOM_PythonDump.cxx | 4 ++-- src/RepairGUI/RepairGUI_GlueDlg.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/GEOM/GEOM_PythonDump.cxx b/src/GEOM/GEOM_PythonDump.cxx index 6d697dd99..bcee3dc04 100644 --- a/src/GEOM/GEOM_PythonDump.cxx +++ b/src/GEOM/GEOM_PythonDump.cxx @@ -144,7 +144,7 @@ namespace GEOM TPythonDump::operator<< (const std::list& theObjects) { Standard_Integer aLength = theObjects.size(); - if ( aLength > 1 ) { + if ( aLength != 1 ) { myStream << "["; } std::list::const_iterator obj = theObjects.begin(); @@ -152,7 +152,7 @@ namespace GEOM *this << *obj; if ( i < aLength ) myStream << ", "; } - if ( aLength > 1 ) { + if ( aLength != 1 ) { myStream << "]"; } return *this; diff --git a/src/RepairGUI/RepairGUI_GlueDlg.cxx b/src/RepairGUI/RepairGUI_GlueDlg.cxx index 3d9c5cc1d..2c288851b 100644 --- a/src/RepairGUI/RepairGUI_GlueDlg.cxx +++ b/src/RepairGUI/RepairGUI_GlueDlg.cxx @@ -615,8 +615,6 @@ bool RepairGUI_GlueDlg::onAcceptLocal() return false; } - erasePreview(false); - try { if (openCommand()) { SUIT_OverrideCursor wc; @@ -672,6 +670,8 @@ bool RepairGUI_GlueDlg::onAcceptLocal() abortCommand(); } + erasePreview(false); + updateViewer(); activateSelection(); updateButtonState();