X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_DisplayEntitiesDlg.cxx;h=c26925804953a9f0d089bafc9ac2d9b5a49f5602;hp=741c0dbdec7b45f9c1fff98d1e5dba03ce304322;hb=38a77c4a9810f4715212368ac53315689ba9150f;hpb=f5b69ee44c7918a89e5fd9d21d3bd2a10a724b5d diff --git a/src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx b/src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx index 741c0dbde..c26925804 100644 --- a/src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_DisplayEntitiesDlg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2014-2015 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -22,22 +22,23 @@ #include "SMESHGUI_DisplayEntitiesDlg.h" #include "SMESHGUI.h" +#include "SMESHGUI_MeshUtils.h" #include "SMESHGUI_Utils.h" #include "SMESHGUI_VTKUtils.h" -#include "SMESHGUI_MeshUtils.h" -#include -#include -#include -#include -#include - -#include -#include -#include #include #include -#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include const int MARGIN = 9; const int SPACING = 6; @@ -176,7 +177,7 @@ SMESHGUI_DisplayEntitiesDlg::~SMESHGUI_DisplayEntitiesDlg() } void SMESHGUI_DisplayEntitiesDlg::InverseEntityMode(unsigned int& theOutputMode, - unsigned int theMode) + unsigned int theMode) { bool anIsNotPresent = ~theOutputMode & theMode; if(anIsNotPresent) @@ -193,7 +194,7 @@ void SMESHGUI_DisplayEntitiesDlg::onChangeEntityMode( bool isChecked ) QCheckBox* aSender = (QCheckBox*)sender(); if ( myNbCheckedButtons == 1 && !isChecked ) { SUIT_MessageBox::warning(this, tr("SMESH_WRN_WARNING"), - tr("WRN_AT_LEAST_ONE")); + tr("WRN_AT_LEAST_ONE")); disconnect( aSender, SIGNAL(toggled(bool)), this, SLOT(onChangeEntityMode(bool)) ); aSender->setChecked( true ); connect( aSender, SIGNAL(toggled(bool)), this, SLOT(onChangeEntityMode(bool)) ); @@ -228,11 +229,13 @@ void SMESHGUI_DisplayEntitiesDlg::onHelp() */ void SMESHGUI_DisplayEntitiesDlg::onOk() { + SUIT_OverrideCursor wc; + const char* entry = myIObject->getEntry(); if ( !myActor ) { myActor = SMESH::CreateActor(SMESH::GetActiveStudyDocument(), - entry, true); + entry, true); } if( myEntityMode != myActor->GetEntityMode() ) {