Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from BR_phase16 branch (09/12/09)
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_ConvToQuadOp.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
index 962b11abdf95ddca42b1ac344acaa8c4961664b3..15a6d8ff80b15fe5860f6921cffdfdfd203f7373 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
+++ b/
src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
@@
-32,9
+32,10
@@
#include <SMESH_TypeFilter.hxx>
// SALOME GUI includes
#include <SMESH_TypeFilter.hxx>
// SALOME GUI includes
-#include <SalomeApp_Tools.h>
-#include <SUIT_MessageBox.h>
#include <LightApp_UpdateFlags.h>
#include <LightApp_UpdateFlags.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_OverrideCursor.h>
+#include <SalomeApp_Tools.h>
// IDL includes
#include <SALOMEconfig.h>
// IDL includes
#include <SALOMEconfig.h>
@@
-176,6
+177,7
@@
SUIT_SelectionFilter* SMESHGUI_ConvToQuadOp::createFilter( const int theId ) con
//================================================================================
bool SMESHGUI_ConvToQuadOp::onApply()
{
//================================================================================
bool SMESHGUI_ConvToQuadOp::onApply()
{
+ SUIT_OverrideCursor aWaitCursor;
QString aMess;
QString aMess;
@@
-185,7
+187,7
@@
bool SMESHGUI_ConvToQuadOp::onApply()
{
dlg()->show();
SUIT_MessageBox::warning( myDlg,
{
dlg()->show();
SUIT_MessageBox::warning( myDlg,
- tr( "SMESH_WRN_WARNING" ), tr("MESH_IS_NOT_SELECTED") );
+
tr( "SMESH_WRN_WARNING" ), tr("MESH_IS_NOT_SELECTED") );
return false;
}
return false;
}
@@
-196,7
+198,7
@@
bool SMESHGUI_ConvToQuadOp::onApply()
if( CORBA::is_nil(mesh) )
{
SUIT_MessageBox::warning( myDlg,
if( CORBA::is_nil(mesh) )
{
SUIT_MessageBox::warning( myDlg,
- tr( "SMESH_WRN_WARNING" ), tr("REF_IS_NULL") );
+
tr( "SMESH_WRN_WARNING" ), tr("REF_IS_NULL") );
return false;
}
return false;
}
@@
-210,7
+212,7
@@
bool SMESHGUI_ConvToQuadOp::onApply()
{
bool aParam = true;
if( myDlg->IsEnabledCheck() )
{
bool aParam = true;
if( myDlg->IsEnabledCheck() )
- aParam = myDlg->IsMediumNdsOnGeom();
+
aParam = myDlg->IsMediumNdsOnGeom();
aEditor->ConvertToQuadratic( aParam );
aResult = true;
aEditor->ConvertToQuadratic( aParam );
aResult = true;