ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-28 18:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for bug IPAL19810(Qt4 porting: Modification - Smoothing after operation cursor remains to be "watches").

Browse Source
This commit is contained in:
mzn 2008-06-03 11:47:27 +00:00
parent 385b46d935
commit 6c3c99ea8d
11 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
View File

@ -39,6 +39,8 @@
#include <SUIT_MessageBox.h> #include <SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h> #include <SUIT_ResourceMgr.h>
#include <SalomeApp_Study.h> #include <SalomeApp_Study.h>
#include <SUIT_OverrideCursor.h>
#include <LightApp_Application.h> #include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
#include <SALOME_ListIO.hxx> #include <SALOME_ListIO.hxx>
@ -281,8 +283,8 @@ bool SMESHGUI_BuildCompoundDlg::ClickOnApply()
return false; return false;
if (!myMesh->_is_nil()) { if (!myMesh->_is_nil()) {
try { try {
QApplication::setOverrideCursor(Qt::WaitCursor); SUIT_OverrideCursor aWaitCursor;
SMESH::SMESH_Gen_var aSMESHGen = SMESHGUI::GetSMESHGen(); SMESH::SMESH_Gen_var aSMESHGen = SMESHGUI::GetSMESHGen();
// concatenate meshes // concatenate meshes
SMESH::SMESH_Mesh_var aCompoundMesh = SMESH::SMESH_Mesh_var aCompoundMesh =
@ -292,7 +294,6 @@ bool SMESHGUI_BuildCompoundDlg::ClickOnApply()
SpinBoxTol->GetValue()); SpinBoxTol->GetValue());
SMESH::SetName( SMESH::FindSObject( aCompoundMesh ), LineEditName->text() ); SMESH::SetName( SMESH::FindSObject( aCompoundMesh ), LineEditName->text() );
QApplication::restoreOverrideCursor();
mySMESHGUI->updateObjBrowser(); mySMESHGUI->updateObjBrowser();
} catch(...) { } catch(...) {
return false; return false;

7
src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
View File

@ -42,6 +42,7 @@
#include <SUIT_Session.h> #include <SUIT_Session.h>
#include <SUIT_MessageBox.h> #include <SUIT_MessageBox.h>
#include <SUIT_ViewManager.h> #include <SUIT_ViewManager.h>
#include <SUIT_OverrideCursor.h>
#include <SalomeApp_Application.h> #include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
@ -450,10 +451,9 @@ void SMESHGUI_CreatePolyhedralVolumeDlg::ClickOnApply()
anIdsOfNodes[aNbIdsOfNodes++] = It.Value(); anIdsOfNodes[aNbIdsOfNodes++] = It.Value();
try{ try{
SUIT_OverrideCursor aWaitCursor;
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor(); SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
QApplication::setOverrideCursor(Qt::WaitCursor);
aMeshEditor->AddPolyhedralVolume(anIdsOfNodes, aQuantities); aMeshEditor->AddPolyhedralVolume(anIdsOfNodes, aQuantities);
QApplication::restoreOverrideCursor();
}catch(SALOME::SALOME_Exception& exc){ }catch(SALOME::SALOME_Exception& exc){
INFOS("Follow exception was cought:\n\t"<<exc.details.text); INFOS("Follow exception was cought:\n\t"<<exc.details.text);
}catch(std::exception& exc){ }catch(std::exception& exc){
@ -472,10 +472,9 @@ void SMESHGUI_CreatePolyhedralVolumeDlg::ClickOnApply()
anIdsOfFaces[i] = aListId[i].toInt(); anIdsOfFaces[i] = aListId[i].toInt();
try{ try{
SUIT_OverrideCursor aWaitCursor;
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor(); SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
QApplication::setOverrideCursor(Qt::WaitCursor);
aMeshEditor->AddPolyhedralVolumeByFaces(anIdsOfFaces); aMeshEditor->AddPolyhedralVolumeByFaces(anIdsOfFaces);
QApplication::restoreOverrideCursor();
}catch(SALOME::SALOME_Exception& exc){ }catch(SALOME::SALOME_Exception& exc){
INFOS("Follow exception was cought:\n\t"<<exc.details.text); INFOS("Follow exception was cought:\n\t"<<exc.details.text);
}catch(std::exception& exc){ }catch(std::exception& exc){

10
src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
View File

@ -42,6 +42,7 @@
#include <SUIT_ResourceMgr.h> #include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h> #include <SUIT_Session.h>
#include <SUIT_MessageBox.h> #include <SUIT_MessageBox.h>
#include <SUIT_OverrideCursor.h>
#include <LightApp_Application.h> #include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
@ -581,10 +582,9 @@ bool SMESHGUI_EditMeshDlg::ClickOnApply()
return false; return false;
try { try {
SUIT_OverrideCursor aWaitCursor;
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor(); SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
QApplication::setOverrideCursor(Qt::WaitCursor);
SMESH::long_array_var anIds = new SMESH::long_array; SMESH::long_array_var anIds = new SMESH::long_array;
SMESH::array_of_long_array_var aGroupsOfElements = new SMESH::array_of_long_array; SMESH::array_of_long_array_var aGroupsOfElements = new SMESH::array_of_long_array;
@ -606,7 +606,6 @@ bool SMESHGUI_EditMeshDlg::ClickOnApply()
else else
aMeshEditor->MergeElements (aGroupsOfElements.inout()); aMeshEditor->MergeElements (aGroupsOfElements.inout());
QApplication::restoreOverrideCursor();
} catch(...) { } catch(...) {
} }
@ -712,9 +711,9 @@ void SMESHGUI_EditMeshDlg::onDetect()
return; return;
try { try {
SUIT_OverrideCursor aWaitCursor;
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor(); SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
QApplication::setOverrideCursor(Qt::WaitCursor);
ListCoincident->clear(); ListCoincident->clear();
ListEdit->clear(); ListEdit->clear();
@ -744,8 +743,7 @@ void SMESHGUI_EditMeshDlg::onDetect()
ListCoincident->addItem(anIDs.join(" ")); ListCoincident->addItem(anIDs.join(" "));
} }
QApplication::restoreOverrideCursor(); } catch(...) {
} catch(...) {
} }
ListCoincident->selectAll(); ListCoincident->selectAll();

4
src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
View File

@ -44,6 +44,7 @@
#include <SUIT_Desktop.h> #include <SUIT_Desktop.h>
#include <SUIT_MessageBox.h> #include <SUIT_MessageBox.h>
#include <SUIT_Session.h> #include <SUIT_Session.h>
#include <SUIT_OverrideCursor.h>
#include <LightApp_Application.h> #include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
@ -368,8 +369,8 @@ bool SMESHGUI_ExtrusionDlg::ClickOnApply()
long aNbSteps = (long)SpinBox_NbSteps->value(); long aNbSteps = (long)SpinBox_NbSteps->value();
try { try {
SUIT_OverrideCursor aWaitCursor;
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor(); SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
QApplication::setOverrideCursor(Qt::WaitCursor);
if ( MakeGroupsCheck->isEnabled() && MakeGroupsCheck->isChecked() ) if ( MakeGroupsCheck->isEnabled() && MakeGroupsCheck->isChecked() )
SMESH::ListOfGroups_var groups = SMESH::ListOfGroups_var groups =
@ -377,7 +378,6 @@ bool SMESHGUI_ExtrusionDlg::ClickOnApply()
else else
aMeshEditor->ExtrusionSweep(myElementsId.inout(), aVector, aNbSteps); aMeshEditor->ExtrusionSweep(myElementsId.inout(), aVector, aNbSteps);
QApplication::restoreOverrideCursor();
} catch (...) { } catch (...) {
} }

4
src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx
View File

@ -38,6 +38,7 @@
#include <SUIT_Session.h> #include <SUIT_Session.h>
#include <SUIT_ResourceMgr.h> #include <SUIT_ResourceMgr.h>
#include <SUIT_MessageBox.h> #include <SUIT_MessageBox.h>
#include <SUIT_OverrideCursor.h>
#include <LightApp_Application.h> #include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
@ -226,7 +227,7 @@ void SMESHGUI_RenumberingDlg::ClickOnApply()
if (isUnitsLabeled) anActor->SetCellsLabeled(false); if (isUnitsLabeled) anActor->SetCellsLabeled(false);
} }
QApplication::setOverrideCursor(Qt::WaitCursor); SUIT_OverrideCursor aWaitCursor;
if (myUnit == 0) { if (myUnit == 0) {
aMeshEditor->RenumberNodes(); aMeshEditor->RenumberNodes();
if (isUnitsLabeled && anActor) anActor->SetPointsLabeled(true); if (isUnitsLabeled && anActor) anActor->SetPointsLabeled(true);
@ -235,7 +236,6 @@ void SMESHGUI_RenumberingDlg::ClickOnApply()
aMeshEditor->RenumberElements(); aMeshEditor->RenumberElements();
if (isUnitsLabeled && anActor) anActor->SetCellsLabeled(true); if (isUnitsLabeled && anActor) anActor->SetCellsLabeled(true);
} }
QApplication::restoreOverrideCursor();
} }
catch(...) { catch(...) {
} }

7
src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
View File

@ -43,6 +43,7 @@
#include <SUIT_Session.h> #include <SUIT_Session.h>
#include <SUIT_MessageBox.h> #include <SUIT_MessageBox.h>
#include <SUIT_Desktop.h> #include <SUIT_Desktop.h>
#include <SUIT_OverrideCursor.h>
#include <LightApp_Application.h> #include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
@ -423,17 +424,15 @@ void SMESHGUI_RevolutionDlg::ClickOnApply()
double aTolerance = SpinBox_Tolerance->GetValue(); double aTolerance = SpinBox_Tolerance->GetValue();
try { try {
SUIT_OverrideCursor aWaitCursor;
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor(); SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
QApplication::setOverrideCursor(Qt::WaitCursor);
if ( MakeGroupsCheck->isEnabled() && MakeGroupsCheck->isChecked() ) if ( MakeGroupsCheck->isEnabled() && MakeGroupsCheck->isChecked() )
SMESH::ListOfGroups_var groups = SMESH::ListOfGroups_var groups =
aMeshEditor->RotationSweepMakeGroups(anElementsId.inout(), anAxis, aMeshEditor->RotationSweepMakeGroups(anElementsId.inout(), anAxis,
anAngle, aNbSteps, aTolerance); anAngle, aNbSteps, aTolerance);
else else
aMeshEditor->RotationSweep(anElementsId.inout(), anAxis, anAngle, aNbSteps, aTolerance); aMeshEditor->RotationSweep(anElementsId.inout(), anAxis, anAngle, aNbSteps, aTolerance);
QApplication::restoreOverrideCursor();
} catch (...) { } catch (...) {
} }

4
src/SMESHGUI/SMESHGUI_RotationDlg.cxx
View File

@ -43,6 +43,7 @@
#include <SUIT_Session.h> #include <SUIT_Session.h>
#include <SUIT_MessageBox.h> #include <SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h> #include <SUIT_ResourceMgr.h>
#include <SUIT_OverrideCursor.h>
#include <LightApp_Application.h> #include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
@ -381,8 +382,8 @@ void SMESHGUI_RotationDlg::ClickOnApply()
int actionButton = ActionGroup->checkedId(); int actionButton = ActionGroup->checkedId();
bool makeGroups = ( MakeGroupsCheck->isEnabled() && MakeGroupsCheck->isChecked() ); bool makeGroups = ( MakeGroupsCheck->isEnabled() && MakeGroupsCheck->isChecked() );
try { try {
SUIT_OverrideCursor aWaitCursor;
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor(); SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
QApplication::setOverrideCursor(Qt::WaitCursor);
switch ( actionButton ) { switch ( actionButton ) {
case MOVE_ELEMS_BUTTON: case MOVE_ELEMS_BUTTON:
aMeshEditor->Rotate(anElementsId, anAxis, anAngle, false); aMeshEditor->Rotate(anElementsId, anAxis, anAngle, false);
@ -399,7 +400,6 @@ void SMESHGUI_RotationDlg::ClickOnApply()
aMeshEditor->RotateMakeMesh(anElementsId, anAxis, anAngle, makeGroups, aMeshEditor->RotateMakeMesh(anElementsId, anAxis, anAngle, makeGroups,
LineEditNewMesh->text().toLatin1().data()); LineEditNewMesh->text().toLatin1().data());
} }
QApplication::restoreOverrideCursor();
} catch (...) { } catch (...) {
} }

5
src/SMESHGUI/SMESHGUI_SewingDlg.cxx
View File

@ -40,6 +40,7 @@
#include <SUIT_ResourceMgr.h> #include <SUIT_ResourceMgr.h>
#include <SUIT_Desktop.h> #include <SUIT_Desktop.h>
#include <SUIT_MessageBox.h> #include <SUIT_MessageBox.h>
#include <SUIT_OverrideCursor.h>
#include <LightApp_Application.h> #include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
@ -458,8 +459,8 @@ bool SMESHGUI_SewingDlg::ClickOnApply()
bool toCreatePolyedrs = CheckBoxPolyedrs->isChecked(); bool toCreatePolyedrs = CheckBoxPolyedrs->isChecked();
try { try {
SUIT_OverrideCursor aWaitCursor;
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor(); SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
QApplication::setOverrideCursor(Qt::WaitCursor);
int aConstructorId = GetConstructorId(); int aConstructorId = GetConstructorId();
SMESH::SMESH_MeshEditor::Sew_Error anError; SMESH::SMESH_MeshEditor::Sew_Error anError;
@ -514,8 +515,6 @@ bool SMESHGUI_SewingDlg::ClickOnApply()
if (toMerge && aResult) if (toMerge && aResult)
aMeshEditor->MergeEqualElements(); aMeshEditor->MergeEqualElements();
QApplication::restoreOverrideCursor();
if (!aResult) { if (!aResult) {
QString msg = tr(QString("ERROR_%1").arg(anError).toLatin1().data()); QString msg = tr(QString("ERROR_%1").arg(anError).toLatin1().data());
SUIT_MessageBox::warning(this, tr("SMESH_WRN_WARNING"), msg); SUIT_MessageBox::warning(this, tr("SMESH_WRN_WARNING"), msg);

4
src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
View File

@ -340,15 +340,15 @@ void SMESHGUI_SmoothingDlg::ClickOnApply()
bool aResult = false; bool aResult = false;
try { try {
SUIT_OverrideCursor aWaitCursor;
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor(); SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
QApplication::setOverrideCursor(Qt::WaitCursor);
if ( CheckBoxParametric->isChecked() ) if ( CheckBoxParametric->isChecked() )
aResult = aMeshEditor->SmoothParametric(anElementsId.inout(), aNodesId.inout(), aResult = aMeshEditor->SmoothParametric(anElementsId.inout(), aNodesId.inout(),
anIterationLimit, aMaxAspectRatio, aMethod); anIterationLimit, aMaxAspectRatio, aMethod);
else else
aResult = aMeshEditor->Smooth(anElementsId.inout(), aNodesId.inout(), aResult = aMeshEditor->Smooth(anElementsId.inout(), aNodesId.inout(),
anIterationLimit, aMaxAspectRatio, aMethod); anIterationLimit, aMaxAspectRatio, aMethod);
QApplication::restoreOverrideCursor();
} catch (...) { } catch (...) {
} }

5
src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
View File

@ -43,6 +43,7 @@
#include <SUIT_ResourceMgr.h> #include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h> #include <SUIT_Session.h>
#include <SUIT_MessageBox.h> #include <SUIT_MessageBox.h>
#include <SUIT_OverrideCursor.h>
#include <LightApp_Application.h> #include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
@ -468,8 +469,9 @@ void SMESHGUI_SymmetryDlg::ClickOnApply()
bool makeGroups = ( MakeGroupsCheck->isEnabled() && MakeGroupsCheck->isChecked() ); bool makeGroups = ( MakeGroupsCheck->isEnabled() && MakeGroupsCheck->isChecked() );
try { try {
SUIT_OverrideCursor aWaitCursor;
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor(); SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
QApplication::setOverrideCursor(Qt::WaitCursor);
switch ( actionButton ) { switch ( actionButton ) {
case MOVE_ELEMS_BUTTON: case MOVE_ELEMS_BUTTON:
aMeshEditor->Mirror(anElementsId, aMirror, aMirrorType, false ); aMeshEditor->Mirror(anElementsId, aMirror, aMirrorType, false );
@ -486,7 +488,6 @@ void SMESHGUI_SymmetryDlg::ClickOnApply()
aMeshEditor->MirrorMakeMesh(anElementsId, aMirror, aMirrorType, makeGroups, aMeshEditor->MirrorMakeMesh(anElementsId, aMirror, aMirrorType, makeGroups,
LineEditNewMesh->text().toLatin1().data()); LineEditNewMesh->text().toLatin1().data());
} }
QApplication::restoreOverrideCursor();
} catch (...) { } catch (...) {
} }

4
src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
View File

@ -43,6 +43,7 @@
#include <SUIT_ResourceMgr.h> #include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h> #include <SUIT_Session.h>
#include <SUIT_MessageBox.h> #include <SUIT_MessageBox.h>
#include <SUIT_OverrideCursor.h>
#include <LightApp_Application.h> #include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h> #include <LightApp_SelectionMgr.h>
@ -436,8 +437,8 @@ void SMESHGUI_TranslationDlg::ClickOnApply()
int actionButton = ActionGroup->checkedId(); int actionButton = ActionGroup->checkedId();
bool makeGroups = ( MakeGroupsCheck->isEnabled() && MakeGroupsCheck->isChecked() ); bool makeGroups = ( MakeGroupsCheck->isEnabled() && MakeGroupsCheck->isChecked() );
try { try {
SUIT_OverrideCursor aWaitCursor;
SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor(); SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
QApplication::setOverrideCursor(Qt::WaitCursor);
switch ( actionButton ) { switch ( actionButton ) {
case MOVE_ELEMS_BUTTON: case MOVE_ELEMS_BUTTON:
aMeshEditor->Translate(anElementsId, aVector, false); aMeshEditor->Translate(anElementsId, aVector, false);
@ -454,7 +455,6 @@ void SMESHGUI_TranslationDlg::ClickOnApply()
aMeshEditor->TranslateMakeMesh(anElementsId, aVector, makeGroups, aMeshEditor->TranslateMakeMesh(anElementsId, aVector, makeGroups,
LineEditNewMesh->text().toLatin1().data()); LineEditNewMesh->text().toLatin1().data());
} }
QApplication::restoreOverrideCursor();
} catch (...) { } catch (...) {
} }