Right reset of the selection attribute: to be tested on all cases

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

diff --git a/src/Model/Model_Data.cpp b/src/Model/Model_Data.cpp
index 89c13889236960a1df1aa188276a5521d97b0302..a863d55dd6a961c44a7277cd50ca3923c512b15f 100644 (file)
--- a/src/Model/Model_Data.cpp
+++ b/src/Model/Model_Data.cpp
@@ -133,8 +133,19 @@ void Model_Data::setName(const std::string& theName)
     isModified = !aName->Get().IsEqual(theName.c_str());
     if (isModified) {
       aName->Set(theName.c_str());
-      // name is changed, thus special attribute is set
-      TDataStd_UAttribute::Set(myLab, kUSER_DEFINED_NAME);
+
+      // check the name of result is defined by user
+      // (name of result does not composed of the name of feature and the result index)
+      bool isUserDefined = true;
+      ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(myObject);
+      if (aResult) {
+        std::string aDefaultName = ModelAPI_Tools::getDefaultName(aResult);
+        isUserDefined = aDefaultName != theName;
+      }
+      if (isUserDefined) {
+        // name is user-defined, thus special attribute is set
+        TDataStd_UAttribute::Set(myLab, kUSER_DEFINED_NAME);
+      }
     }
   }
   if (mySendAttributeUpdated && isModified)
@@ -578,7 +589,8 @@ std::set<std::string> usedParameters(const AttributePoint2DPtr& theAttribute)
   return anUsedParameters;
 }
 
-std::list<ResultParameterPtr> findVariables(const std::set<std::string>& theParameters)
+std::list<ResultParameterPtr> findVariables(const std::set<std::string>& theParameters,
+                                            const DocumentPtr& theDocument)
 {
   std::list<ResultParameterPtr> aResult;
   std::set<std::string>::const_iterator aParamIt = theParameters.cbegin();
@@ -588,7 +600,7 @@ std::list<ResultParameterPtr> findVariables(const std::set<std::string>& thePara
     ResultParameterPtr aParam;
     // theSearcher is not needed here: in expressions
     // of features the parameters history is not needed
-    if (ModelAPI_Tools::findVariable(FeaturePtr(), aName, aValue, aParam))
+    if (ModelAPI_Tools::findVariable(FeaturePtr(), aName, aValue, aParam, theDocument))
       aResult.push_back(aParam);
   }
   return aResult;
@@ -649,25 +661,29 @@ void Model_Data::referencesToObjects(
       AttributeIntegerPtr anAttribute =
           std::dynamic_pointer_cast<ModelAPI_AttributeInteger>(anAttr);
       std::set<std::string> anUsedParameters = anAttribute->usedParameters();
-      std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters);
+      std::list<ResultParameterPtr> aParameters =
+        findVariables(anUsedParameters, owner()->document());
       aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end());
     } else if (aType == ModelAPI_AttributeDouble::typeId()) { // double attribute
       AttributeDoublePtr anAttribute =
           std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(anAttr);
       std::set<std::string> anUsedParameters = anAttribute->usedParameters();
-      std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters);
+      std::list<ResultParameterPtr> aParameters =
+        findVariables(anUsedParameters, owner()->document());
       aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end());
     } else if (aType == GeomDataAPI_Point::typeId()) { // point attribute
       AttributePointPtr anAttribute =
         std::dynamic_pointer_cast<GeomDataAPI_Point>(anAttr);
       std::set<std::string> anUsedParameters = usedParameters(anAttribute);
-      std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters);
+      std::list<ResultParameterPtr> aParameters =
+        findVariables(anUsedParameters, owner()->document());
       aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end());
     } else if (aType == GeomDataAPI_Point2D::typeId()) { // point attribute
       AttributePoint2DPtr anAttribute =
         std::dynamic_pointer_cast<GeomDataAPI_Point2D>(anAttr);
       std::set<std::string> anUsedParameters = usedParameters(anAttribute);
-      std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters);
+      std::list<ResultParameterPtr> aParameters =
+        findVariables(anUsedParameters, owner()->document());
       aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end());
     } else
       continue; // nothing to do, not reference