-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File: GeomAlgoAPI_MakeShapeListList.cpp
-// Created: 27 May 2015
-// Author: Dmitry Bobylev
-
-#include <GeomAlgoAPI_MakeShapeList.h>
-
-#include <BRepBuilderAPI_MakeShape.hxx>
+// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+//
+// 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, 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
+
+#include "GeomAlgoAPI_MakeShapeList.h"
+
+
+#include <NCollection_List.hxx>
#include <NCollection_Map.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopoDS_Shape.hxx>
//=================================================================================================
GeomAlgoAPI_MakeShapeList::GeomAlgoAPI_MakeShapeList()
//=================================================================================================
void GeomAlgoAPI_MakeShapeList::init(const ListOfMakeShape& theMakeShapeList)
{
+ if(myMap.get()) {
+ myMap->clear();
+ } else {
+ myMap.reset(new GeomAPI_DataMapOfShapeShape);
+ }
+
myListOfMakeShape = theMakeShapeList;
-}
-//=================================================================================================
-void GeomAlgoAPI_MakeShapeList::append(const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape)
-{
- myListOfMakeShape.push_back(theMakeShape);
+ for(ListOfMakeShape::const_iterator anIt = theMakeShapeList.cbegin();
+ anIt != theMakeShapeList.cend(); ++anIt) {
+ myMap->merge((*anIt)->mapOfSubShapes());
+ }
}
//=================================================================================================
-void GeomAlgoAPI_MakeShapeList::append(const GeomAlgoAPI_MakeShapeList& theMakeShapeList)
+void GeomAlgoAPI_MakeShapeList::appendAlgo(
+ const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape)
{
- for(ListOfMakeShape::const_iterator anIt = theMakeShapeList.myListOfMakeShape.cbegin();
- anIt != theMakeShapeList.myListOfMakeShape.cend(); anIt++) {
- myListOfMakeShape.push_back(*anIt);
+ myListOfMakeShape.push_back(theMakeShape);
+ if(!myMap.get()) {
+ myMap.reset(new GeomAPI_DataMapOfShapeShape());
}
+ myMap->merge(theMakeShape->mapOfSubShapes());
}
//=================================================================================================
const std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_MakeShapeList::shape() const
{
- if(myListOfMakeShape.empty()) {
- return std::shared_ptr<GeomAPI_Shape>();
- } else {
+ std::shared_ptr<GeomAPI_Shape> aShape = GeomAlgoAPI_MakeShape::shape();
+ if(aShape.get() && !aShape->impl<TopoDS_Shape>().IsNull()) {
+ return aShape;
+ } else if(!myListOfMakeShape.empty()) {
return myListOfMakeShape.back()->shape();
}
+ return std::shared_ptr<GeomAPI_Shape>();
}
//=================================================================================================
void GeomAlgoAPI_MakeShapeList::generated(const std::shared_ptr<GeomAPI_Shape> theShape,
ListOfShape& theHistory)
{
- result(theShape, theHistory, GeomAlgoAPI_MakeShapeList::Generated);
+ result(theShape, GeomAlgoAPI_MakeShapeList::Generated, theHistory);
}
//=================================================================================================
void GeomAlgoAPI_MakeShapeList::modified(const std::shared_ptr<GeomAPI_Shape> theShape,
ListOfShape& theHistory)
{
- result(theShape, theHistory, GeomAlgoAPI_MakeShapeList::Modified);
+ result(theShape, GeomAlgoAPI_MakeShapeList::Modified, theHistory);
}
bool GeomAlgoAPI_MakeShapeList::isDeleted(const std::shared_ptr<GeomAPI_Shape> theShape)
{
- for(ListOfMakeShape::iterator aBuilderIt = myListOfMakeShape.begin(); aBuilderIt != myListOfMakeShape.end(); aBuilderIt++) {
+ for(ListOfMakeShape::iterator aBuilderIt = myListOfMakeShape.begin();
+ aBuilderIt != myListOfMakeShape.end(); aBuilderIt++) {
std::shared_ptr<GeomAlgoAPI_MakeShape> aMakeShape = *aBuilderIt;
if(aMakeShape->isDeleted(theShape)) {
return true;
}
void GeomAlgoAPI_MakeShapeList::result(const std::shared_ptr<GeomAPI_Shape> theShape,
- ListOfShape& theHistory,
- OperationType theOperationType)
+ OperationType theOperationType,
+ ListOfShape& theHistory)
{
if(myListOfMakeShape.empty()) {
return;
}
NCollection_Map<TopoDS_Shape> anAlgoShapes;
- NCollection_Map<TopoDS_Shape> aResultShapes;
+ NCollection_Map<TopoDS_Shape> aResultShapesMap;
+ NCollection_List<TopoDS_Shape> aResultShapesList;
anAlgoShapes.Add(theShape->impl<TopoDS_Shape>());
- aResultShapes.Add(theShape->impl<TopoDS_Shape>());
+ aResultShapesMap.Add(theShape->impl<TopoDS_Shape>());
+ aResultShapesList.Append(theShape->impl<TopoDS_Shape>());
- for(ListOfMakeShape::iterator aBuilderIt = myListOfMakeShape.begin(); aBuilderIt != myListOfMakeShape.end(); aBuilderIt++) {
+ for(ListOfMakeShape::iterator aBuilderIt = myListOfMakeShape.begin();
+ aBuilderIt != myListOfMakeShape.end(); aBuilderIt++) {
std::shared_ptr<GeomAlgoAPI_MakeShape> aMakeShape = *aBuilderIt;
NCollection_Map<TopoDS_Shape> aTempShapes;
- bool hasResults = false;
- for(NCollection_Map<TopoDS_Shape>::Iterator aShapeIt(anAlgoShapes); aShapeIt.More(); aShapeIt.Next()) {
+ for(NCollection_Map<TopoDS_Shape>::Iterator
+ aShapeIt(anAlgoShapes); aShapeIt.More(); aShapeIt.Next()) {
+ bool hasResults = false;
std::shared_ptr<GeomAPI_Shape> aShape(new GeomAPI_Shape);
aShape->setImpl(new TopoDS_Shape(aShapeIt.Value()));
ListOfShape aGeneratedShapes;
- const TopoDS_Shape& aSh = aShape->impl<TopoDS_Shape>();
aMakeShape->generated(aShape, aGeneratedShapes);
- for(ListOfShape::const_iterator anIt = aGeneratedShapes.cbegin(); anIt != aGeneratedShapes.cend(); anIt++) {
- TopoDS_Shape aSh = (*anIt)->impl<TopoDS_Shape>();
- aTempShapes.Add((*anIt)->impl<TopoDS_Shape>());
- aResultShapes.Add((*anIt)->impl<TopoDS_Shape>());
+ for(ListOfShape::const_iterator
+ anIt = aGeneratedShapes.cbegin(); anIt != aGeneratedShapes.cend(); anIt++) {
+ const TopoDS_Shape& anItShape = (*anIt)->impl<TopoDS_Shape>();
+ aTempShapes.Add(anItShape);
+ if(aResultShapesMap.Add(anItShape) == Standard_True) {
+ aResultShapesList.Append(anItShape);
+ }
hasResults = true;
}
ListOfShape aModifiedShapes;
aMakeShape->modified(aShape, aModifiedShapes);
- for(ListOfShape::const_iterator anIt = aModifiedShapes.cbegin(); anIt != aModifiedShapes.cend(); anIt++) {
- TopoDS_Shape aSH = (*anIt)->impl<TopoDS_Shape>();
- aTempShapes.Add((*anIt)->impl<TopoDS_Shape>());
- aResultShapes.Add((*anIt)->impl<TopoDS_Shape>());
+ for(ListOfShape::const_iterator
+ anIt = aModifiedShapes.cbegin(); anIt != aModifiedShapes.cend(); anIt++) {
+ const TopoDS_Shape& anItShape = (*anIt)->impl<TopoDS_Shape>();
+ aTempShapes.Add(anItShape);
+ if(aResultShapesMap.Add(anItShape) == Standard_True) {
+ aResultShapesList.Append(anItShape);
+ }
hasResults = true;
}
if(hasResults) {
- aResultShapes.Remove(aShape->impl<TopoDS_Shape>());
+ const TopoDS_Shape& aTopoDSShape = aShapeIt.Value();
+ if(aResultShapesMap.Remove(aTopoDSShape) == Standard_True) {
+ for(NCollection_List<TopoDS_Shape>::Iterator
+ aResIt(aResultShapesList); aResIt.More(); aResIt.Next()) {
+ if(aTopoDSShape.IsEqual(aResIt.Value())) {
+ aResultShapesList.Remove(aResIt);
+ break;
+ }
+ }
+ }
}
}
anAlgoShapes.Unite(aTempShapes);
}
- for(NCollection_Map<TopoDS_Shape>::Iterator aShapeIt(aResultShapes); aShapeIt.More(); aShapeIt.Next()) {
+ for(NCollection_List<TopoDS_Shape>::Iterator
+ aShapeIt(aResultShapesList); aShapeIt.More(); aShapeIt.Next()) {
std::shared_ptr<GeomAPI_Shape> aShape(new GeomAPI_Shape());
aShape->setImpl(new TopoDS_Shape(aShapeIt.Value()));
theHistory.push_back(aShape);
