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
Implement Cancel Compute (begin)
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GroupOnShapeDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
b/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
index 1b4fb4adbc6fa996bad1ea4159e4813c47c1790f..581aa53265474bc1eb8ae2a55150c67a504da002 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
@@
-1,7
+1,4
@@
-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2007-2010 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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-19,6
+16,7
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI_GroupOnShapeDlg.cxx
// Created : Wed Sep 17 18:36:51 2008
// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI_GroupOnShapeDlg.cxx
// Created : Wed Sep 17 18:36:51 2008
@@
-29,6
+27,7
@@
#include "SMESHGUI_GroupOnShapeDlg.h"
#include "SMESH_TypeFilter.hxx"
#include "SMESHGUI_GroupOnShapeDlg.h"
#include "SMESH_TypeFilter.hxx"
+#include "SMESHGUI.h"
#include "SMESHGUI_Utils.h"
#include "SMESHGUI_GEOMGenUtils.h"
#include "SMESHGUI_Utils.h"
#include "SMESHGUI_GEOMGenUtils.h"
@@
-178,7
+177,7
@@
SMESHGUI_GroupOnShapeOp::SMESHGUI_GroupOnShapeOp()
: SMESHGUI_SelectionOp(ActorSelection),
myDlg( 0 )
{
: SMESHGUI_SelectionOp(ActorSelection),
myDlg( 0 )
{
- myHelpFileName = "creat
ing_groups
_page.html";
+ myHelpFileName = "creat
e_groups_from_geometry
_page.html";
}
SMESHGUI_GroupOnShapeOp::~SMESHGUI_GroupOnShapeOp()
}
SMESHGUI_GroupOnShapeOp::~SMESHGUI_GroupOnShapeOp()
@@
-302,7
+301,7
@@
bool SMESHGUI_GroupOnShapeOp::onApply()
if ( !aStudy ) return false;
// mesh
if ( !aStudy ) return false;
// mesh
- _PTR(SObject)
meshSO = aStudy->FindObjectID( myMeshID.toLatin1().data() );
+ _PTR(SObject) meshSO = aStudy->FindObjectID( myMeshID.toLatin1().data() );
SMESH::SMESH_Mesh_var mesh = SMESH::SObjectToInterface<SMESH::SMESH_Mesh>( meshSO );
if ( mesh->_is_nil() ) return false;
SMESH::SMESH_Mesh_var mesh = SMESH::SObjectToInterface<SMESH::SMESH_Mesh>( meshSO );
if ( mesh->_is_nil() ) return false;
@@
-349,9
+348,19
@@
bool SMESHGUI_GroupOnShapeOp::onApply()
group = mesh->CreateGroupFromGEOM( elemType, name.toLatin1().data(), geom );
}
}
group = mesh->CreateGroupFromGEOM( elemType, name.toLatin1().data(), geom );
}
}
+ SMESHGUI::Modified();
+
update( UF_ObjBrowser | UF_Model );
update( UF_ObjBrowser | UF_Model );
- init();
+ // Re-init controls to create the next group
+ myElemGeoIDs.clear();
+ myNodeGeoIDs.clear();
+ removeCustomFilters();
+ myDlg->myNodeGeomList->clear();
+ myDlg->myElemGeomList->clear();
+ myDlg->myElemGeomBtn->setChecked(false);
+ myDlg->myNodeGeomBtn->setChecked(false);
+ myDlg->updateButtons();
return !group->_is_nil();
}
return !group->_is_nil();
}