Issue #2811: Update content of Object node on creation moment

[modules/shaper.git] / src / GeomValidators / GeomValidators_ZeroOffset.cpp

diff --git a/src/GeomValidators/GeomValidators_ZeroOffset.cpp b/src/GeomValidators/GeomValidators_ZeroOffset.cpp
index 20d324edd59db1d70acaf4c152607a02cf6b75fd..d6181783f4931cb7a9e647070e3c60d28dd5abfc 100644 (file)
--- a/src/GeomValidators/GeomValidators_ZeroOffset.cpp
+++ b/src/GeomValidators/GeomValidators_ZeroOffset.cpp
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomValidators_ZeroOffset.cpp
-// Created:     13 May 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 <GeomValidators_ZeroOffset.h>
 
@@ -17,6 +31,7 @@
 #include <GeomAPI_Dir.h>
 #include <GeomAPI_Face.h>
 #include <GeomAPI_Shape.h>
+#include <GeomAPI_ShapeIterator.h>
 #include <GeomAPI_Pln.h>
 #include <GeomAPI_Pnt.h>
 
@@ -43,11 +58,13 @@ bool GeomValidators_ZeroOffset::isValid(const std::shared_ptr<ModelAPI_Feature>&
   ListOfShape aFacesList;
   if(theFeature->selection(*anIt)) {
     AttributeSelectionPtr aFaceSelection = theFeature->selection(*anIt);
-    ResultConstructionPtr aConstruction = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aFaceSelection->context());
+    ResultConstructionPtr aConstruction =
+      std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aFaceSelection->context());
     if(aConstruction.get()) {
       int aSketchFacesNum = aConstruction->facesNum();
       for(int aFaceIndex = 0; aFaceIndex < aSketchFacesNum; aFaceIndex++) {
-        std::shared_ptr<GeomAPI_Shape> aFace = std::dynamic_pointer_cast<GeomAPI_Shape>(aConstruction->face(aFaceIndex));
+        std::shared_ptr<GeomAPI_Shape> aFace =
+          std::dynamic_pointer_cast<GeomAPI_Shape>(aConstruction->face(aFaceIndex));
         if(aFace->isFace() && aFace->isPlanar()) {
           aFacesList.push_back(aFace);
         }
@@ -68,7 +85,8 @@ bool GeomValidators_ZeroOffset::isValid(const std::shared_ptr<ModelAPI_Feature>&
         if(!aContextShape.get()) {
           break;
         }
-        ResultConstructionPtr aConstruction = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContext);
+        ResultConstructionPtr aConstruction =
+          std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContext);
         if(!aConstruction.get()) {
           break;
         }
@@ -87,11 +105,11 @@ bool GeomValidators_ZeroOffset::isValid(const std::shared_ptr<ModelAPI_Feature>&
   double aToSize = 0.0;
   double aFromSize = 0.0;
 
-  if(theFeature->real(*anIt)) {
+  if(theFeature->real(*anIt) && theFeature->real(*anIt)->isInitialized()) {
     aToSize = theFeature->real(*anIt)->value();
   }
   anIt++;
-  if(theFeature->real(*anIt)) {
+  if(theFeature->real(*anIt) && theFeature->real(*anIt)->isInitialized()) {
     aFromSize = theFeature->real(*anIt)->value();
   }
   anIt++;
@@ -109,31 +127,39 @@ bool GeomValidators_ZeroOffset::isValid(const std::shared_ptr<ModelAPI_Feature>&
   std::shared_ptr<GeomAPI_Shape> aFromShape;
 
   std::shared_ptr<ModelAPI_AttributeSelection> anAttrSel = theFeature->selection(*anIt);
-  if(anAttrSel) {
+  if(anAttrSel && anAttrSel->isInitialized()) {
     aToShape = std::dynamic_pointer_cast<GeomAPI_Shape>(anAttrSel->value());
     if(aToShape.get() == NULL && anAttrSel->context().get() != NULL) {
       aToShape =  anAttrSel->context()->shape();
     }
+    if (aToShape->isCompound()) {
+      GeomAPI_ShapeIterator anIt(aToShape);
+      aToShape = anIt.current();
+    }
   }
   anIt++;
 
   std::shared_ptr<ModelAPI_AttributeDouble> anAttrDouble = theFeature->real(*anIt);
-  if(anAttrDouble) {
+  if(anAttrDouble && anAttrDouble->isInitialized()) {
     aToSize = anAttrDouble->value();
   }
   anIt++;
 
   anAttrSel = theFeature->selection(*anIt);
-  if(anAttrSel) {
+  if(anAttrSel && anAttrSel->isInitialized()) {
     aFromShape = std::dynamic_pointer_cast<GeomAPI_Shape>(anAttrSel->value());
     if(aFromShape.get() == NULL && anAttrSel->context().get() != NULL) {
       aFromShape = anAttrSel->context()->shape();
     }
+    if (aFromShape->isCompound()) {
+      GeomAPI_ShapeIterator anIt(aFromShape);
+      aFromShape = anIt.current();
+    }
   }
   anIt++;
 
   anAttrDouble = theFeature->real(*anIt);
-  if(anAttrDouble) {
+  if(anAttrDouble && anAttrDouble->isInitialized()) {
     aFromSize = anAttrDouble->value();
   }
 
@@ -175,7 +201,8 @@ bool GeomValidators_ZeroOffset::isValid(const std::shared_ptr<ModelAPI_Feature>&
     }
     std::shared_ptr<GeomAPI_Pln> aPln = aFace->getPlane();
     if(aPln.get()) {
-      for(ListOfShape::const_iterator anIter = aFacesList.cbegin(); anIter != aFacesList.cend(); anIter++) {
+      for(ListOfShape::const_iterator
+          anIter = aFacesList.cbegin(); anIter != aFacesList.cend(); anIter++) {
         std::shared_ptr<GeomAPI_Shape> aSketchShape = *anIter;
         std::shared_ptr<GeomAPI_Face> aSketchFace(new GeomAPI_Face(aSketchShape));
         std::shared_ptr<GeomAPI_Pln>  aSketchPln = aSketchFace->getPlane();