X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Recover.cpp;h=4bbfd76e858d294d47999b3f45cff366337897a5;hb=4f565b2204d3fba046aa8c851abada2a5a17bf6c;hp=5bdff264fcb0f19c7ac866d3bea76509edbecc81;hpb=0cf033e3d2d9a6419aac40d77cd200187562a159;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Recover.cpp b/src/FeaturesPlugin/FeaturesPlugin_Recover.cpp
index 5bdff264f..4bbfd76e8 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_Recover.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Recover.cpp
@@ -15,8 +15,7 @@
 #include <ModelAPI_Validator.h>
 #include <ModelAPI_Result.h>
 #include <ModelAPI_Tools.h>
-
-using namespace std;
+#include <GeomAlgoAPI_Copy.h>
 
 FeaturesPlugin_Recover::FeaturesPlugin_Recover()
 {
@@ -26,106 +25,54 @@ void FeaturesPlugin_Recover::initAttributes()
 {
   data()->addAttribute(BASE_FEATURE(), ModelAPI_AttributeReference::typeId());
   data()->addAttribute(RECOVERED_ENTITIES(), ModelAPI_AttributeRefList::typeId());
-  data()->addAttribute(PERSISTENT(), ModelAPI_AttributeBoolean::typeId());
-
-  myPersistent = boolean(PERSISTENT())->value();
-  // temporary modification for empty list
-  // ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), RECOVERED_ENTITIES());
 
-  synchronizeRegistered();
 }
 
 void FeaturesPlugin_Recover::execute()
 {
-  synchronizeRegistered();
-}
-
-void FeaturesPlugin_Recover::attributeChanged(const std::string& theID)
-{
-  synchronizeRegistered();
-}
-
-void FeaturesPlugin_Recover::synchronizeRegistered()
-{
-  FeaturePtr aBase = baseFeature();
-  bool aNewPersistent = boolean(PERSISTENT())->value();
-  if (aNewPersistent != myPersistent)
-    clearRegistered();
-
-  std::set<ObjectPtr> aRecoveredInList;
-  // add unconcealed which are not in the myRegistered map
-  if (isStable() && !isDisabled()) { // if unstable, clear any unconcealment effect
-    AttributeRefListPtr aRecovered = reflist(RECOVERED_ENTITIES());
-    for(int anIndex = aRecovered->size() - 1; anIndex >= 0; anIndex--) {
-      ObjectPtr anObj = aRecovered->object(anIndex);
-      aRecoveredInList.insert(anObj);
-      if (myRegistered.find(anObj) == myRegistered.end()) {
-        // not found, so register a new
-        ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(anObj);
-        ModelAPI_Session::get()->validators()->registerUnconcealment(
-          aRes, aNewPersistent ? FeaturePtr() : aBase);
-        myRegistered.insert(anObj);
-      }
+  int aResultIndex = 0;
+  AttributeRefListPtr aRecovered = reflist(RECOVERED_ENTITIES());
+  for(int anIndex = aRecovered->size() - 1; anIndex >= 0; anIndex--) {
+    ObjectPtr anObj = aRecovered->object(anIndex);
+    if (!anObj.get())
+      continue;
+    ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObj);
+    if (!aResult.get())
+      continue;
+    GeomShapePtr aShape = aResult->shape();
+    if (!aShape.get())
+      continue;
+
+    // Copy shape.
+    GeomAlgoAPI_Copy aCopyAlgo(aShape);
+    // Check that algo is done.
+    if(!aCopyAlgo.isDone()) {
+      setError("Error: recover algorithm failed.");
+      return;
     }
-  }
-  // remove unconcealed which are not in the stored list, but in the map
-  std::set<std::shared_ptr<ModelAPI_Object> >::iterator aMyReg = myRegistered.begin();
-  while(aMyReg != myRegistered.end()) {
-    if (aRecoveredInList.find(*aMyReg) == aRecoveredInList.end()) {
-      ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(*aMyReg);
-      ModelAPI_Session::get()->validators()->disableUnconcealment(
-        aRes, aNewPersistent ? FeaturePtr() : myCurrentBase);
-      myRegistered.erase(aMyReg);
-      aMyReg = myRegistered.begin(); // restart iteration because after erase iterator may be bad
-    } else {
-      aMyReg++;
+    // Check if shape is not null.
+    if(!aCopyAlgo.shape().get() || aCopyAlgo.shape()->isNull()) {
+      setError("Error: resulting shape is null.");
+      return;
+    }
+    // Check that resulting shape is valid.
+    if(!aCopyAlgo.isValid()) {
+      setError("Error: resulting shape is not valid.");
+      return;
     }
-  }
-  myCurrentBase = aBase;
-  myPersistent = aNewPersistent;
-}
-
-void FeaturesPlugin_Recover::erase()
-{
-  // clears myRegistered before all information is destroyed
-  clearRegistered();
-  ModelAPI_Feature::erase();
-}
-
-bool FeaturesPlugin_Recover::setStable(const bool theFlag)
-{
-  bool aRes = ModelAPI_Feature::setStable(theFlag);
-  synchronizeRegistered();
-  return aRes;
-}
-
-bool FeaturesPlugin_Recover::setDisabled(const bool theFlag)
-{
-  bool aRes = ModelAPI_Feature::setDisabled(theFlag);
-  synchronizeRegistered();
-  return aRes;
-}
-
-FeaturePtr FeaturesPlugin_Recover::baseFeature()
-{
-  // for the current moment it can be result of feature of feature: GUI is not debugged
-  ObjectPtr aBaseObj = reference(BASE_FEATURE())->value();
-  FeaturePtr aResult;
-  if (aBaseObj.get() == NULL)
-    return aResult;
-  aResult = std::dynamic_pointer_cast<ModelAPI_Feature>(aBaseObj);
-  if (aResult.get() == NULL)
-    aResult = aBaseObj->document()->feature(std::dynamic_pointer_cast<ModelAPI_Result>(aBaseObj));
-  return aResult;
-}
 
-void FeaturesPlugin_Recover::clearRegistered()
-{
-  std::set<std::shared_ptr<ModelAPI_Object> >::iterator aMyReg = myRegistered.begin();
-  for(; aMyReg != myRegistered.end(); aMyReg++) {
-    ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(*aMyReg);
-    ModelAPI_Session::get()->validators()->disableUnconcealment(
-      aRes, myPersistent ? FeaturePtr() : myCurrentBase);
+    // Store result.
+    ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
+    aResultBody->store(aCopyAlgo.shape());//, aCopyAlgo.shape());
+    std::shared_ptr<GeomAPI_DataMapOfShapeShape> aSubShapes = aCopyAlgo.mapOfSubShapes();
+    // like in import: forget any history
+    int aTag(1);
+    std::string aNameMS = "Shape";
+    aResultBody->loadFirstLevel(aCopyAlgo.shape(), aNameMS, aTag);
+
+    setResult(aResultBody, aResultIndex);
+    ++aResultIndex;
   }
-  myRegistered.clear();
+
+  removeResults(aResultIndex);
 }