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
Copyright update 2022
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_ShapeByMeshDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
index 409c700b7a8b552be6d80a140812573166e0c068..175372ab59e3f53c9312f3e18521726779b7df67 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
22
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) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-318,14
+318,14
@@
void SMESHGUI_ShapeByMeshOp::commitOperation()
}
else
{
}
else
{
- GEOM::GEOM_
Gen_var geomGen = SMESH::GetGEOMGen
();
+ GEOM::GEOM_
Object_var aMeshShape = myMesh->GetShapeToMesh
();
- if (geomGen->_is_nil())
+ GEOM::GEOM_Gen_var geomGen = SMESH::GetGEOMGen( aMeshShape );
+ if ( geomGen->_is_nil() )
return;
return;
- GEOM::GEOM_IShapesOperations_wrap aShapesOp =
- geomGen->GetIShapesOperations();
- if (aShapesOp->_is_nil() )
+ GEOM::GEOM_IShapesOperations_wrap aShapesOp = geomGen->GetIShapesOperations();
+ if ( aShapesOp->_is_nil() )
return;
TopAbs_ShapeEnum aGroupType = TopAbs_SHAPE;
return;
TopAbs_ShapeEnum aGroupType = TopAbs_SHAPE;
@@
-333,8
+333,6
@@
void SMESHGUI_ShapeByMeshOp::commitOperation()
std::map<int, GEOM::GEOM_Object_wrap> aGeomObjectsMap;
GEOM::GEOM_Object_wrap aGeomObject;
std::map<int, GEOM::GEOM_Object_wrap> aGeomObjectsMap;
GEOM::GEOM_Object_wrap aGeomObject;
- GEOM::GEOM_Object_var aMeshShape = myMesh->GetShapeToMesh();
-
for ( int i = 0; i < aListId.count(); i++ )
{
aGeomObject = // received object need UnRegister()!
for ( int i = 0; i < aListId.count(); i++ )
{
aGeomObject = // received object need UnRegister()!
@@
-362,9
+360,8
@@
void SMESHGUI_ShapeByMeshOp::commitOperation()
}
else if (aNumberOfGO > 1)
{
}
else if (aNumberOfGO > 1)
{
- GEOM::GEOM_IGroupOperations_wrap aGroupOp =
- geomGen->GetIGroupOperations();
- if(aGroupOp->_is_nil())
+ GEOM::GEOM_IGroupOperations_wrap aGroupOp = geomGen->GetIGroupOperations();
+ if ( aGroupOp->_is_nil() )
return;
GEOM::ListOfGO_var aGeomObjects = new GEOM::ListOfGO();
return;
GEOM::ListOfGO_var aGeomObjects = new GEOM::ListOfGO();
@@
-379,7
+376,7
@@
void SMESHGUI_ShapeByMeshOp::commitOperation()
aGeomObject = aGroupOp->CreateGroup(aMeshShape, aGroupType);
aGroupOp->UnionList(aGeomObject, aGeomObjects);
aGeomObject = aGroupOp->CreateGroup(aMeshShape, aGroupType);
aGroupOp->UnionList(aGeomObject, aGeomObjects);
- if (
!aGroupOp->IsDone()
)
+ if (
!aGroupOp->IsDone()
)
return;
}
return;
}
@@
-419,7
+416,7
@@
void SMESHGUI_ShapeByMeshOp::onSelectionDone()
try {
SALOME_ListIO aList;
selectionMgr()->selectedObjects(aList);
try {
SALOME_ListIO aList;
selectionMgr()->selectedObjects(aList);
- if (
!myIsMultipleAllowed && aList.Extent() != 1
)
+ if (
aList.IsEmpty() || ( !myIsMultipleAllowed && aList.Extent() != 1)
)
return;
SMESH::SMESH_Mesh_var aMesh = SMESH::GetMeshByIO(aList.First());
return;
SMESH::SMESH_Mesh_var aMesh = SMESH::GetMeshByIO(aList.First());
@@
-472,7
+469,7
@@
void SMESHGUI_ShapeByMeshOp::activateSelection()
//purpose : SLOT. Called when element type changed.
//=======================================================================
//purpose : SLOT. Called when element type changed.
//=======================================================================
-void SMESHGUI_ShapeByMeshOp::onTypeChanged (int
theType
)
+void SMESHGUI_ShapeByMeshOp::onTypeChanged (int
/*theType*/
)
{
setElementID("");
activateSelection();
{
setElementID("");
activateSelection();
@@
-501,7
+498,7
@@
void SMESHGUI_ShapeByMeshOp::onElemIdChanged(const QString& theNewText)
case VOLUME: type = SMDSAbs_Volume; break;
default: return;
}
case VOLUME: type = SMDSAbs_Volume; break;
default: return;
}
-
TColStd_MapOfInteger
newIndices;
+
SVTK_TVtkIDsMap
newIndices;
QStringList aListId = theNewText.split( " ", QString::SkipEmptyParts);
for ( int i = 0; i < aListId.count(); i++ ) {
if ( const SMDS_MeshElement * e = aMesh->FindElement( aListId[ i ].toInt() ))
QStringList aListId = theNewText.split( " ", QString::SkipEmptyParts);
for ( int i = 0; i < aListId.count(); i++ ) {
if ( const SMDS_MeshElement * e = aMesh->FindElement( aListId[ i ].toInt() ))