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
23080: [CEA 1497] Do not merge a middle node in quadratic with the extreme nodes...
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_ShapeByMeshDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
index 511d0d5fa446b4be88354d55dda8202c341c082f..a89bc1935909364b1e3b9ea247c42a98d83845d1 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-331,7
+331,7
@@
void SMESHGUI_ShapeByMeshOp::commitOperation()
TopAbs_ShapeEnum aGroupType = TopAbs_SHAPE;
TopAbs_ShapeEnum aGroupType = TopAbs_SHAPE;
- std::map<
double
, GEOM::GEOM_Object_wrap> aGeomObjectsMap;
+ std::map<
int
, GEOM::GEOM_Object_wrap> aGeomObjectsMap;
GEOM::GEOM_Object_wrap aGeomObject;
GEOM::GEOM_Object_var aMeshShape = myMesh->GetShapeToMesh();
GEOM::GEOM_Object_wrap aGeomObject;
GEOM::GEOM_Object_var aMeshShape = myMesh->GetShapeToMesh();
@@
-343,7
+343,7
@@
void SMESHGUI_ShapeByMeshOp::commitOperation()
if (aGeomObject->_is_nil()) continue;
if (aGeomObject->_is_nil()) continue;
-
double
anId = aShapesOp->GetSubShapeIndex(aMeshShape, aGeomObject);
+
int
anId = aShapesOp->GetSubShapeIndex(aMeshShape, aGeomObject);
if (aShapesOp->IsDone() && !aGeomObjectsMap.count(anId) )
{
aGeomObjectsMap[anId] = aGeomObject;
if (aShapesOp->IsDone() && !aGeomObjectsMap.count(anId) )
{
aGeomObjectsMap[anId] = aGeomObject;
@@
-372,13
+372,13
@@
void SMESHGUI_ShapeByMeshOp::commitOperation()
aGeomObjects->length( aNumberOfGO );
int i = 0;
aGeomObjects->length( aNumberOfGO );
int i = 0;
- std::map<
double
, GEOM::GEOM_Object_wrap>::iterator anIter;
+ std::map<
int
, GEOM::GEOM_Object_wrap>::iterator anIter;
for (anIter = aGeomObjectsMap.begin(); anIter!=aGeomObjectsMap.end(); anIter++)
for (anIter = aGeomObjectsMap.begin(); anIter!=aGeomObjectsMap.end(); anIter++)
- aGeomObjects[i++] =
(*anIter).second.in(
);
+ aGeomObjects[i++] =
GEOM::GEOM_Object::_duplicate( (*anIter).second.in()
);
//create geometry group
aGeomObject = aGroupOp->CreateGroup(aMeshShape, aGroupType);
//create geometry group
aGeomObject = aGroupOp->CreateGroup(aMeshShape, aGroupType);
- aGroupOp->UnionList(
myGeomObj
, aGeomObjects);
+ aGroupOp->UnionList(
aGeomObject
, aGeomObjects);
if (!aGroupOp->IsDone())
return;
if (!aGroupOp->IsDone())
return;
@@
-420,7
+420,7
@@
void SMESHGUI_ShapeByMeshOp::onSelectionDone()
try {
SALOME_ListIO aList;
try {
SALOME_ListIO aList;
- selectionMgr()->selectedObjects(aList
, SVTK_Viewer::Type()
);
+ selectionMgr()->selectedObjects(aList);
if (!myIsMultipleAllowed && aList.Extent() != 1)
return;
if (!myIsMultipleAllowed && aList.Extent() != 1)
return;