Revert insufficient changes to avoid compilation error on Linux

[modules/shaper.git] / src / Model / Model_ResultCompSolid.cpp

diff --git a/src/Model/Model_ResultCompSolid.cpp b/src/Model/Model_ResultCompSolid.cpp
index 9022902982baa17301b3f14d8b5303f8c96f3320..00ca3915dcf558830a21b2eff65517d88e287793 100755 (executable)
--- a/src/Model/Model_ResultCompSolid.cpp
+++ b/src/Model/Model_ResultCompSolid.cpp
@@ -10,8 +10,6 @@
 #include <Model_Objects.h>
 #include <Model_BodyBuilder.h>
 #include <Model_Document.h>
-#include <ModelAPI_AttributeRefList.h>
-#include <ModelAPI_AttributeIntArray.h>
 #include <ModelAPI_Object.h>
 #include <ModelAPI_Events.h>
 #include <Events_Loop.h>
@@ -32,12 +30,6 @@ Model_ResultCompSolid::~Model_ResultCompSolid()
   updateSubs(std::shared_ptr<GeomAPI_Shape>()); // erase sub-results
 }
 
-void Model_ResultCompSolid::initAttributes()
-{
-  DataPtr aData = data();
-  aData->addAttribute(COLOR_ID(), ModelAPI_AttributeIntArray::typeId());
-}
-
 void Model_ResultCompSolid::store(const std::shared_ptr<GeomAPI_Shape>& theShape)
 {
   ModelAPI_ResultCompSolid::store(theShape);
@@ -60,7 +52,7 @@ void Model_ResultCompSolid::storeModified(const std::shared_ptr<GeomAPI_Shape>&
 
 int Model_ResultCompSolid::numberOfSubs(bool forTree) const
 {
-  return mySubs.size();
+  return int(mySubs.size());
 }
 
 std::shared_ptr<ModelAPI_ResultBody> Model_ResultCompSolid::subResult(const int theIndex,
@@ -151,8 +143,10 @@ void Model_ResultCompSolid::setIsConcealed(const bool theValue)
       }
     }
     ModelAPI_ResultCompSolid::setIsConcealed(theValue);
+    // to set correct myLastConcealed
+    isConcealed();
   }
-  myLastConcealed = theValue;
+  //myLastConcealed = theValue;
 }
 
 void Model_ResultCompSolid::updateSubs(const std::shared_ptr<GeomAPI_Shape>& theThisShape)
@@ -169,10 +163,10 @@ void Model_ResultCompSolid::updateSubs(const std::shared_ptr<GeomAPI_Shape>& the
     bool aWasEmpty = mySubs.empty();
     Model_Objects* anObjects = std::dynamic_pointer_cast<Model_Document>(document())->objects();
     unsigned int aSubIndex = 0;
-    TopExp_Explorer aSolids(aThisShape, TopAbs_SOLID);
-    for(; aSolids.More(); aSolids.Next(), aSubIndex++) {
-      std::shared_ptr<GeomAPI_Shape> aSolidShape(new GeomAPI_Shape);
-      aSolidShape->setImpl(new TopoDS_Shape(aSolids.Current()));
+    TopoDS_Iterator aShapesIter(aThisShape);
+    for(; aShapesIter.More(); aShapesIter.Next(), aSubIndex++) {
+      std::shared_ptr<GeomAPI_Shape> aShape(new GeomAPI_Shape);
+      aShape->setImpl(new TopoDS_Shape(aShapesIter.Value()));
       ResultBodyPtr aSub;
       if (mySubs.size() <= aSubIndex) { // it is needed to create a new sub-result
         aSub = anObjects->createBody(this->data(), aSubIndex);
@@ -180,8 +174,8 @@ void Model_ResultCompSolid::updateSubs(const std::shared_ptr<GeomAPI_Shape>& the
       } else { // just update shape of this result
         aSub = mySubs[aSubIndex];
       }
-      if (!aSolidShape->isEqual(aSub->shape())) {
-        aSub->store(aSolidShape);
+      if (!aShape->isEqual(aSub->shape())) {
+        aSub->store(aShape, false);
         aECreator->sendUpdated(aSub, EVENT_DISP);
         aECreator->sendUpdated(aSub, EVENT_UPD);
       }