From 717a547e50bdad68bdd925d6dcb5094f6e2b2da1 Mon Sep 17 00:00:00 2001 From: asl Date: Thu, 14 Jul 2005 11:53:16 +0000 Subject: [PATCH] getSMESHGUI()->isActiveStudyLocked() is replaced by isStudyLocked() In all other operations the second variant must be used --- src/SMESHGUI/SMESHGUI_AddMeshElementOp.cxx | 2 +- src/SMESHGUI/SMESHGUI_AddSubMeshOp.cxx | 2 +- src/SMESHGUI/SMESHGUI_EditHypothesesOp.cxx | 2 +- src/SMESHGUI/SMESHGUI_GroupOp.cxx | 2 +- src/SMESHGUI/SMESHGUI_InitMeshOp.cxx | 2 +- src/SMESHGUI/SMESHGUI_MoveNodesOp.cxx | 2 +- src/SMESHGUI/SMESHGUI_NodesOp.cxx | 2 +- src/SMESHGUI/SMESHGUI_RemoveNodesOp.cxx | 2 +- src/SMESHGUI/SMESHGUI_RenumberingOp.cxx | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI_AddMeshElementOp.cxx b/src/SMESHGUI/SMESHGUI_AddMeshElementOp.cxx index 5942cd6b6..8afb8ce2f 100644 --- a/src/SMESHGUI/SMESHGUI_AddMeshElementOp.cxx +++ b/src/SMESHGUI/SMESHGUI_AddMeshElementOp.cxx @@ -274,7 +274,7 @@ bool SMESHGUI_AddMeshElementOp::onApply() return false; IdList ids; selectedIds( 0, ids ); - if( ids.count()>=myNbNodes && !getSMESHGUI()->isActiveStudyLocked() ) { + if( ids.count()>=myNbNodes && !isStudyLocked() ) { //myBusy = true; SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array; anArrayOfIdeces->length(myNbNodes); diff --git a/src/SMESHGUI/SMESHGUI_AddSubMeshOp.cxx b/src/SMESHGUI/SMESHGUI_AddSubMeshOp.cxx index ddc14b47d..d43d47586 100644 --- a/src/SMESHGUI/SMESHGUI_AddSubMeshOp.cxx +++ b/src/SMESHGUI/SMESHGUI_AddSubMeshOp.cxx @@ -141,7 +141,7 @@ SUIT_SelectionFilter* SMESHGUI_AddSubMeshOp::createFilter( const int id ) const //================================================================================= bool SMESHGUI_AddSubMeshOp::onApply() { - if( getSMESHGUI()->isActiveStudyLocked() ) + if( isStudyLocked() ) return false; QString myNameSubMesh = myDlg->subMeshName(); diff --git a/src/SMESHGUI/SMESHGUI_EditHypothesesOp.cxx b/src/SMESHGUI/SMESHGUI_EditHypothesesOp.cxx index 115ce0e14..ceef91df8 100644 --- a/src/SMESHGUI/SMESHGUI_EditHypothesesOp.cxx +++ b/src/SMESHGUI/SMESHGUI_EditHypothesesOp.cxx @@ -109,7 +109,7 @@ void SMESHGUI_EditHypothesesOp::selectionDone() //================================================================================= bool SMESHGUI_EditHypothesesOp::onApply() { - if( getSMESHGUI()->isActiveStudyLocked() ) + if( isStudyLocked() ) return false; bool aRes = false; diff --git a/src/SMESHGUI/SMESHGUI_GroupOp.cxx b/src/SMESHGUI/SMESHGUI_GroupOp.cxx index 2b96f1c68..d95aa5604 100644 --- a/src/SMESHGUI/SMESHGUI_GroupOp.cxx +++ b/src/SMESHGUI/SMESHGUI_GroupOp.cxx @@ -80,7 +80,7 @@ SalomeApp_Dialog* SMESHGUI_GroupOp::dlg() const //======================================================================= bool SMESHGUI_GroupOp::onApply() { - if( !myDlg || !isValid() || getSMESHGUI()->isActiveStudyLocked() ) + if( !myDlg || !isValid() || isStudyLocked() ) return false; QStringList selGroup[2]; diff --git a/src/SMESHGUI/SMESHGUI_InitMeshOp.cxx b/src/SMESHGUI/SMESHGUI_InitMeshOp.cxx index 0ae7d92aa..97467a25d 100644 --- a/src/SMESHGUI/SMESHGUI_InitMeshOp.cxx +++ b/src/SMESHGUI/SMESHGUI_InitMeshOp.cxx @@ -137,7 +137,7 @@ SUIT_SelectionFilter* SMESHGUI_InitMeshOp::createFilter( const int id ) const //================================================================================= bool SMESHGUI_InitMeshOp::onApply() { - if( getSMESHGUI()->isActiveStudyLocked() ) + if( isStudyLocked() ) return false; QString myNameMesh = myDlg->meshName(); diff --git a/src/SMESHGUI/SMESHGUI_MoveNodesOp.cxx b/src/SMESHGUI/SMESHGUI_MoveNodesOp.cxx index 09a65cc43..30cdb7543 100644 --- a/src/SMESHGUI/SMESHGUI_MoveNodesOp.cxx +++ b/src/SMESHGUI/SMESHGUI_MoveNodesOp.cxx @@ -151,7 +151,7 @@ void SMESHGUI_MoveNodesOp::initDialog() //======================================================================= bool SMESHGUI_MoveNodesOp::onApply() { - if( getSMESHGUI()->isActiveStudyLocked() ) + if( isStudyLocked() ) return false; if( !myDlg->hasSelection( 0 ) ) diff --git a/src/SMESHGUI/SMESHGUI_NodesOp.cxx b/src/SMESHGUI/SMESHGUI_NodesOp.cxx index 4e2f6ae3c..c2082bd86 100644 --- a/src/SMESHGUI/SMESHGUI_NodesOp.cxx +++ b/src/SMESHGUI/SMESHGUI_NodesOp.cxx @@ -309,7 +309,7 @@ void SMESHGUI_NodesOp::initDialog() //================================================================================= bool SMESHGUI_NodesOp::onApply() { - if( getSMESHGUI()->isActiveStudyLocked() || !mySimulation ) + if( isStudyLocked() || !mySimulation ) return false; if( mesh()->_is_nil()) { diff --git a/src/SMESHGUI/SMESHGUI_RemoveNodesOp.cxx b/src/SMESHGUI/SMESHGUI_RemoveNodesOp.cxx index 15c443e65..795c622e4 100644 --- a/src/SMESHGUI/SMESHGUI_RemoveNodesOp.cxx +++ b/src/SMESHGUI/SMESHGUI_RemoveNodesOp.cxx @@ -106,7 +106,7 @@ void SMESHGUI_RemoveNodesOp::updateDialog() //================================================================================= bool SMESHGUI_RemoveNodesOp::onApply() { - if( getSMESHGUI()->isActiveStudyLocked() ) + if( isStudyLocked() ) return false; IdList ids; selectedIds( 0, ids ); diff --git a/src/SMESHGUI/SMESHGUI_RenumberingOp.cxx b/src/SMESHGUI/SMESHGUI_RenumberingOp.cxx index a77c9a3cd..f24640e3f 100644 --- a/src/SMESHGUI/SMESHGUI_RenumberingOp.cxx +++ b/src/SMESHGUI/SMESHGUI_RenumberingOp.cxx @@ -125,7 +125,7 @@ void SMESHGUI_RenumberingOp::updateDialog() //================================================================================= bool SMESHGUI_RenumberingOp::onApply() { - if( getSMESHGUI()->isActiveStudyLocked() ) + if( isStudyLocked() ) return false; if( myDlg->hasSelection( 0 ) )