X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FModelAPI_Result.cpp;h=c0b1716313a016d61fdf41bb97cf369bdcbc5ec9;hb=06e7f5859095193fc7f498bd89a7d28009794f53;hp=9e38ffb46a4894d5498fd17a3e17843bc0d27652;hpb=631375bfe684e0eb11834499c88e835da7ff9d13;p=modules%2Fshaper.git diff --git a/src/ModelAPI/ModelAPI_Result.cpp b/src/ModelAPI/ModelAPI_Result.cpp index 9e38ffb46..c0b171631 100644 --- a/src/ModelAPI/ModelAPI_Result.cpp +++ b/src/ModelAPI/ModelAPI_Result.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// Copyright (C) 2014-2023 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -23,6 +23,7 @@ #include #include #include +#include #include @@ -37,6 +38,12 @@ void ModelAPI_Result::initAttributes() aData->addAttribute(COLOR_ID(), ModelAPI_AttributeIntArray::typeId())->setIsArgument(false); aData->addAttribute(DEFLECTION_ID(), ModelAPI_AttributeDouble::typeId())->setIsArgument(false); aData->addAttribute(TRANSPARENCY_ID(), ModelAPI_AttributeDouble::typeId())->setIsArgument(false); + aData->addAttribute(ISO_LINES_ID(), ModelAPI_AttributeIntArray::typeId())->setIsArgument(false); + aData->addAttribute(SHOW_ISO_LINES_ID(), ModelAPI_AttributeBoolean::typeId())->setIsArgument(false); + aData->addAttribute(SHOW_EDGES_DIRECTION_ID(), ModelAPI_AttributeBoolean::typeId())->setIsArgument(false); + // Add the "Bring To Front" attribute to the Result base class, as we may support it in the future + // for all type of results. Actually, only ResultGroups are supported. + aData->addAttribute(BRING_TO_FRONT_ID(), ModelAPI_AttributeBoolean::typeId())->setIsArgument(false); } bool ModelAPI_Result::setDisabled(std::shared_ptr theThis, const bool theFlag) @@ -65,7 +72,7 @@ bool ModelAPI_Result::setDisabled(std::shared_ptr theThis, cons bool ModelAPI_Result::isDisabled() { - if (myIsDisabled != data()->isDeleted()) + if (data()->isValid() && myIsDisabled != data()->isDeleted()) setDisabled(std::dynamic_pointer_cast( data()->owner()), data()->isDeleted()); // restore from the data model the correct value return myIsDisabled; @@ -76,7 +83,7 @@ bool ModelAPI_Result::isConcealed() return myIsConcealed; } -void ModelAPI_Result::setIsConcealed(const bool theValue, const bool theForced) +void ModelAPI_Result::setIsConcealed(const bool theValue, const bool /*theForced*/) { if (myIsConcealed != theValue) { myIsConcealed = theValue;