Issue #2560: Add Interpolation feature to Build plugin for creation a curve by the...

[modules/shaper.git] / src / GeomAlgoAPI / GeomAlgoAPI_MakeShapeCustom.cpp

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_MakeShapeCustom.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_MakeShapeCustom.cpp
index 318f9b6e5b01afbfdab97825fab51dcfa488bc16..01bf7a88a8af2c82ca0b94f1f90dabe9cfe212d4 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_MakeShapeCustom.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_MakeShapeCustom.cpp
@@ -1,20 +1,33 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomAlgoAPI_MakeShapeCustom.cpp
-// Created:     4 September 2015
-// Author:      Dmitry Bobylev
+// 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_MakeShapeCustom.h>
 
 //=================================================================================================
 GeomAlgoAPI_MakeShapeCustom::GeomAlgoAPI_MakeShapeCustom()
-: GeomAlgoAPI_MakeShape()
 {}
 
 //=================================================================================================
 void GeomAlgoAPI_MakeShapeCustom::setResult(const std::shared_ptr<GeomAPI_Shape> theShape)
 {
-  myShape = theShape;
+  setShape(theShape);
 }
 
 //=================================================================================================
@@ -37,19 +50,14 @@ bool GeomAlgoAPI_MakeShapeCustom::addDeleted(const std::shared_ptr<GeomAPI_Shape
   return myDeleted.bind(theShape, theShape);
 }
 
-//=================================================================================================
-const std::shared_ptr<GeomAPI_Shape> GeomAlgoAPI_MakeShapeCustom::shape() const
-{
-  return myShape;
-}
-
 //=================================================================================================
 void GeomAlgoAPI_MakeShapeCustom::generated(const std::shared_ptr<GeomAPI_Shape> theShape,
                                             ListOfShape& theHistory)
 {
   ListOfShape aGenerated;
-  myGenerated.find(theShape, aGenerated);
-  theHistory.insert(theHistory.end(), aGenerated.begin(), aGenerated.end());
+  if(myGenerated.find(theShape, aGenerated)) {
+    theHistory.insert(theHistory.end(), aGenerated.begin(), aGenerated.end());
+  }
 }
 
 //=================================================================================================
@@ -57,8 +65,9 @@ void GeomAlgoAPI_MakeShapeCustom::modified(const std::shared_ptr<GeomAPI_Shape>
                                            ListOfShape& theHistory)
 {
   ListOfShape aModified;
-  myModified.find(theShape, aModified);
-  theHistory.insert(theHistory.end(), aModified.begin(), aModified.end());
+  if(myModified.find(theShape, aModified)) {
+    theHistory.insert(theHistory.end(), aModified.begin(), aModified.end());
+  }
 }
 
 //=================================================================================================