From e78691501537a90b85a546433cd5d3bb8703f835 Mon Sep 17 00:00:00 2001 From: imn Date: Tue, 21 Apr 2015 15:53:05 +0300 Subject: [PATCH] INT PAL 0052699: Incorrect closing of "Manage dimensions" dialog box (edited) --- src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx | 9 ++++++--- src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx b/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx index f238a6152..46d244459 100644 --- a/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx @@ -134,7 +134,7 @@ MeasureGUI_ManageDimensionsDlg::MeasureGUI_ManageDimensionsDlg( GeometryGUI* the { myObjectSelector->PushButton1->click(); } - + isNeedRedisplay = false; setHelpFileName("managing_dimensions_page.html"); } @@ -805,6 +805,9 @@ void MeasureGUI_ManageDimensionsDlg::OnFinish() myEditObject->GetStudyEntry(), GEOM::propertyName( GEOM::Dimensions ), QVariant() ); + if ( isNeedRedisplay ) { + redisplay( myEditObject.get()); + } } //================================================================================= @@ -1103,8 +1106,8 @@ bool MeasureGUI_ManageDimensionsDlg::AllowedToCancelChanges() tr( "WRN_MSG_CHANGES_LOST" ), QMessageBox::Ok, QMessageBox::Cancel ); - - return aResponse == QMessageBox::Ok; + isNeedRedisplay = ( aResponse == QMessageBox::Ok ); + return isNeedRedisplay; } //================================================================================= diff --git a/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.h b/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.h index bed9d3465..39e04f254 100644 --- a/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.h +++ b/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.h @@ -114,7 +114,7 @@ private: private: GEOM::GeomObjPtr myEditObject; - + bool isNeedRedisplay; private: DlgRef_1Sel* myObjectSelector; MeasureGUI_1TreeWidget_4Button* myDimensionView;