Salome HOME
Do not use Fields and Groups in selection in sketcher
[modules/shaper.git] / src / FeaturesAPI / FeaturesAPI_Revolution.cpp
index e073541390548852a3dfa017b25b74fdbc8e2f47..47a1ffc226e9decc5986c39795a4df84fb4624c1 100644 (file)
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
-
-// File:        FeaturesAPI_Revolution.cpp
-// Created:     09 June 2016
-// 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 "FeaturesAPI_Revolution.h"
 
@@ -19,10 +33,11 @@ FeaturesAPI_Revolution::FeaturesAPI_Revolution(const std::shared_ptr<ModelAPI_Fe
 }
 
 //==================================================================================================
-FeaturesAPI_Revolution::FeaturesAPI_Revolution(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                               const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                               const ModelHighAPI_Selection& theAxis,
-                                               const ModelHighAPI_Double& theAngle)
+FeaturesAPI_Revolution::FeaturesAPI_Revolution(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theAxis,
+  const ModelHighAPI_Double& theAngle)
 : ModelHighAPI_Interface(theFeature)
 {
   if(initialize()) {
@@ -33,11 +48,12 @@ FeaturesAPI_Revolution::FeaturesAPI_Revolution(const std::shared_ptr<ModelAPI_Fe
 }
 
 //==================================================================================================
-FeaturesAPI_Revolution::FeaturesAPI_Revolution(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                               const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                               const ModelHighAPI_Selection& theAxis,
-                                               const ModelHighAPI_Double& theToAngle,
-                                               const ModelHighAPI_Double& theFromAngle)
+FeaturesAPI_Revolution::FeaturesAPI_Revolution(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theAxis,
+  const ModelHighAPI_Double& theToAngle,
+  const ModelHighAPI_Double& theFromAngle)
 : ModelHighAPI_Interface(theFeature)
 {
   if(initialize()) {
@@ -48,13 +64,14 @@ FeaturesAPI_Revolution::FeaturesAPI_Revolution(const std::shared_ptr<ModelAPI_Fe
 }
 
 //==================================================================================================
-FeaturesAPI_Revolution::FeaturesAPI_Revolution(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                               const std::list<ModelHighAPI_Selection>& theBaseObjects,
-                                               const ModelHighAPI_Selection& theAxis,
-                                               const ModelHighAPI_Selection& theToObject,
-                                               const ModelHighAPI_Double& theToOffset,
-                                               const ModelHighAPI_Selection& theFromObject,
-                                               const ModelHighAPI_Double& theFromOffset)
+FeaturesAPI_Revolution::FeaturesAPI_Revolution(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theBaseObjects,
+  const ModelHighAPI_Selection& theAxis,
+  const ModelHighAPI_Selection& theToObject,
+  const ModelHighAPI_Double& theToOffset,
+  const ModelHighAPI_Selection& theFromObject,
+  const ModelHighAPI_Double& theFromOffset)
 : ModelHighAPI_Interface(theFeature)
 {
   if(initialize()) {
@@ -74,9 +91,16 @@ FeaturesAPI_Revolution::~FeaturesAPI_Revolution()
 void FeaturesAPI_Revolution::setNestedSketch(const ModelHighAPI_Reference& theSketch)
 {
   mysketch->setValue(theSketch.feature());
+
+  // To make Sketch feature execute and subfeatures execute.
+  feature()->document()->setCurrentFeature(feature(), false);
+
   // to inform that the history is updated due to the sketch moved under the composite feature
-  if (theSketch.feature().get())
+  if (theSketch.feature().get()) {
     theSketch.feature()->document()->updateHistory(ModelAPI_Feature::group());
+    if (theSketch.feature()->firstResult().get())
+      theSketch.feature()->firstResult()->setDisplayed(false);
+  }
   mybaseObjects->clear();
   mybaseObjects->append(theSketch.feature()->firstResult(), GeomShapePtr());
 
@@ -144,14 +168,16 @@ void FeaturesAPI_Revolution::dump(ModelHighAPI_Dumper& theDumper) const
   const std::string& aDocName = theDumper.name(aBase->document());
 
   AttributeReferencePtr anAttrSketch = aBase->reference(FeaturesPlugin_Revolution::SKETCH_ID());
-  AttributeSelectionListPtr anAttrObjects = aBase->selectionList(FeaturesPlugin_Revolution::BASE_OBJECTS_ID());
+  AttributeSelectionListPtr anAttrObjects =
+    aBase->selectionList(FeaturesPlugin_Revolution::BASE_OBJECTS_ID());
   AttributeSelectionPtr anAttrAxis = aBase->selection(FeaturesPlugin_Revolution::AXIS_OBJECT_ID());
 
   theDumper << aBase << " = model.addRevolution(" << aDocName << ", ";
   anAttrSketch->isInitialized() ? theDumper << "[]" : theDumper << anAttrObjects;
   theDumper << ", " << anAttrAxis;
 
-  std::string aCreationMethod = aBase->string(FeaturesPlugin_Revolution::CREATION_METHOD())->value();
+  std::string aCreationMethod =
+    aBase->string(FeaturesPlugin_Revolution::CREATION_METHOD())->value();
 
   if(aCreationMethod == FeaturesPlugin_Revolution::CREATION_METHOD_BY_ANGLES()) {
     AttributeDoublePtr anAttrToAngle = aBase->real(FeaturesPlugin_Revolution::TO_ANGLE_ID());
@@ -159,12 +185,15 @@ void FeaturesAPI_Revolution::dump(ModelHighAPI_Dumper& theDumper) const
 
     theDumper << ", " << anAttrToAngle << ", " << anAttrFromAngle;
   } else if(aCreationMethod == FeaturesPlugin_Revolution::CREATION_METHOD_BY_PLANES()) {
-    AttributeSelectionPtr anAttrToObject = aBase->selection(FeaturesPlugin_Revolution::TO_OBJECT_ID());
+    AttributeSelectionPtr anAttrToObject =
+      aBase->selection(FeaturesPlugin_Revolution::TO_OBJECT_ID());
     AttributeDoublePtr anAttrToOffset = aBase->real(FeaturesPlugin_Revolution::TO_OFFSET_ID());
-    AttributeSelectionPtr anAttrFromObject = aBase->selection(FeaturesPlugin_Revolution::FROM_OBJECT_ID());
+    AttributeSelectionPtr anAttrFromObject =
+      aBase->selection(FeaturesPlugin_Revolution::FROM_OBJECT_ID());
     AttributeDoublePtr anAttrFromOffset = aBase->real(FeaturesPlugin_Revolution::FROM_OFFSET_ID());
 
-    theDumper << ", " << anAttrToObject << ", " << anAttrToOffset << ", " << anAttrFromObject << ", " << anAttrFromOffset;
+    theDumper << ", " << anAttrToObject << ", " << anAttrToOffset <<
+      ", " << anAttrFromObject << ", " << anAttrFromOffset;
   }
 
   theDumper << ")" << std::endl;