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
#16459 EDF 14133 - Complete Merge Nodes / Merge Elements operations
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshOrderOp.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MeshOrderOp.cxx
b/src/SMESHGUI/SMESHGUI_MeshOrderOp.cxx
index 34aaa5b00bfed5a04ce2f5dcba922ba42278575c..dc2e34e9868bd6396b1cd3774dfe3c4074363ca6 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MeshOrderOp.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MeshOrderOp.cxx
@@
-24,6
+24,7
@@
#include "SMESHGUI.h"
#include "SMESHGUI_Utils.h"
#include "SMESHGUI.h"
#include "SMESHGUI_Utils.h"
+#include "SMESHGUI_VTKUtils.h"
#include "SMESHGUI_MeshUtils.h"
// SALOME GUI includes
#include "SMESHGUI_MeshUtils.h"
// SALOME GUI includes
@@
-120,7
+121,7
@@
void SMESHGUI_MeshOrderOp::initDialog()
if ( !myMgr->GetMeshOrder() ) {
SUIT_MessageBox::information(desktop(),
tr("SMESH_INFORMATION"),
if ( !myMgr->GetMeshOrder() ) {
SUIT_MessageBox::information(desktop(),
tr("SMESH_INFORMATION"),
- tr("SMESH_NO_CONCUR
R
ENT_MESH"));
+ tr("SMESH_NO_CONCURENT_MESH"));
onCancel();
return;
onCancel();
return;
@@
-139,7
+140,10
@@
bool SMESHGUI_MeshOrderOp::onApply()
bool res = myMgr ? myMgr->SetMeshOrder() : false;
if( res )
bool res = myMgr ? myMgr->SetMeshOrder() : false;
if( res )
+ {
SMESHGUI::Modified();
SMESHGUI::Modified();
+ SMESH::UpdateView();
+ }
delete myMgr;
myMgr = 0;
delete myMgr;
myMgr = 0;
@@
-280,7
+284,7
@@
bool SMESHGUI_MeshOrderMgr::SetMeshOrder( const ListListId& theListListIds )
if (theListListIds.isEmpty() || myMesh->_is_nil())
return false;
if (theListListIds.isEmpty() || myMesh->_is_nil())
return false;
- _PTR(Study) aStudy = SMESH::
GetActiveStudyDocument
();
+ _PTR(Study) aStudy = SMESH::
getStudy
();
_PTR(SObject) aMeshSObj = SMESH::FindSObject(myMesh);
if ( !aStudy || !aMeshSObj )
return false;
_PTR(SObject) aMeshSObj = SMESH::FindSObject(myMesh);
if ( !aStudy || !aMeshSObj )
return false;
@@
-300,11
+304,6
@@
bool SMESHGUI_MeshOrderMgr::SetMeshOrder( const ListListId& theListListIds )
}
}
}
}
- // is it enough to set modified attribute on root mesh objects only?
- // it is seems that modifcation flag will be set on child submeshes
- // automatically (see SMESH::ModifiedMesh for details)
- SMESH::ModifiedMesh( aMeshSObj, false, false );
-
SMESH::submesh_array_array_var meshOrder = new SMESH::submesh_array_array();
meshOrder->length(theListListIds.count() );
ListListId::const_iterator it = theListListIds.constBegin();
SMESH::submesh_array_array_var meshOrder = new SMESH::submesh_array_array();
meshOrder->length(theListListIds.count() );
ListListId::const_iterator it = theListListIds.constBegin();