X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_SketchEntity.h;h=84214ce014abd05eca8dcb13bfe5709c89061bf8;hb=88ee9b2b81cf93a6324336b57e30cc8a3a487499;hp=0f792ec5482b1afc9b13607afb03dedd5c99b22b;hpb=87b6a30a3afb8fb32e7e43ade8d9c947d9eb1684;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_SketchEntity.h b/src/SketchPlugin/SketchPlugin_SketchEntity.h index 0f792ec54..84214ce01 100644 --- a/src/SketchPlugin/SketchPlugin_SketchEntity.h +++ b/src/SketchPlugin/SketchPlugin_SketchEntity.h @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2022 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 @@ -12,10 +12,9 @@ // // 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 +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef SketchPlugin_SketchEntity_H_ @@ -25,11 +24,13 @@ #include "SketchPlugin_Feature.h" #include +#include #include #include #include #include #include +#include #include #include @@ -40,7 +41,7 @@ * This is an abstract class to give * an interface to create the entity features such as line, circle, arc and point. */ -class SketchPlugin_SketchEntity : public SketchPlugin_Feature, public GeomAPI_ICustomPrs +class SketchPlugin_SketchEntity : public SketchPlugin_Feature //, public GeomAPI_ICustomPrs { public: /// Reference to the construction type of the feature @@ -64,16 +65,23 @@ class SketchPlugin_SketchEntity : public SketchPlugin_Feature, public GeomAPI_IC return MY_COPY_ID; } + /// Reference to the parent feature if exist + inline static const std::string& PARENT_ID() + { + static const std::string& MY_PARENT_ID("ParentFeature"); + return MY_PARENT_ID; + } + /// Width of the auxiliary line - inline static const double SKETCH_LINE_WIDTH_AUXILIARY() + inline static const int SKETCH_LINE_WIDTH_AUXILIARY() { return 2; } /// Width of the line - inline static const double SKETCH_LINE_WIDTH() + inline static const int SKETCH_LINE_WIDTH() { - return 3; + return Config_PropManager::integer("Visualization", "sketch_line_width"); } /// Style of the auxiliary line @@ -110,79 +118,107 @@ class SketchPlugin_SketchEntity : public SketchPlugin_Feature, public GeomAPI_IC return false; } + //virtual bool isIncludeToResult() const + //{ + // AttributeBooleanPtr anAttr; + // std::set aRefsToMe = data()->refsToMe(); + // std::set::const_iterator aIt; + // for (aIt = aRefsToMe.cbegin(); aIt != aRefsToMe.cend(); ++aIt) { + // if ((*aIt)->id() == "ProjectedFeature") { + // FeaturePtr aFeature = std::dynamic_pointer_cast((*aIt)->owner()); + // if (aFeature.get()) { + // anAttr = aFeature->data()->boolean("IncludeToResult"); + // if (anAttr.get()) + // return anAttr->value(); + // } + // } + // } + // return true; + //} + +// LCOV_EXCL_START /// Customize presentation of the feature - virtual bool customisePresentation(ResultPtr theResult, AISObjectPtr thePrs, - std::shared_ptr theDefaultPrs) - { - /// Store previous color values of the presentation to check it after setting specific entity - /// color. Default color is set into presentation to have not modified isCustomized state - /// after default customize prs is completed. - std::vector aPrevColor; - aPrevColor.resize(3); - thePrs->getColor(aPrevColor[0], aPrevColor[1], aPrevColor[2]); - if (theResult.get()) { - std::string aSection, aName, aDefault; - theResult->colorConfigInfo(aSection, aName, aDefault); - std::vector aColor; - aColor = Config_PropManager::color(aSection, aName); - thePrs->setColor(aColor[0], aColor[1], aColor[2]); - } - - bool isCustomized = theDefaultPrs.get() != NULL && - theDefaultPrs->customisePresentation(theResult, thePrs, theDefaultPrs); - int aShapeType = thePrs->getShapeType(); - // a compound is processed like the edge because the - // arc feature uses the compound for presentable AIS - if (aShapeType != 6/*an edge*/ && aShapeType != 7/*a vertex*/ && aShapeType != 0/*compound*/) - return false; - - // set color from preferences - std::vector aColor; - std::shared_ptr anAuxiliaryAttr = - data()->boolean(SketchPlugin_SketchEntity::AUXILIARY_ID()); - bool isConstruction = anAuxiliaryAttr.get() != NULL && anAuxiliaryAttr->value(); - if (isConstruction) { - aColor = Config_PropManager::color("Visualization", "sketch_auxiliary_color"); - } - else if (isExternal()) { - aColor = Config_PropManager::color("Visualization", "sketch_external_color"); - } - else { - aColor = Config_PropManager::color("Visualization", "sketch_entity_color"); - } - if (!aColor.empty()) { - thePrs->setColor(aColor[0], aColor[1], aColor[2]); - for (int i = 0; i < 3 && !isCustomized; i++) - isCustomized = aColor[i] != aPrevColor[i]; - } - - if (aShapeType == 6 || aShapeType == 0) { // if this is an edge or a compound - if (isConstruction) { - isCustomized = thePrs->setWidth(SKETCH_LINE_WIDTH_AUXILIARY()) || isCustomized; - isCustomized = thePrs->setLineStyle(SKETCH_LINE_STYLE_AUXILIARY()) || isCustomized; - } - else { - isCustomized = thePrs->setWidth(SKETCH_LINE_WIDTH()) || isCustomized; - isCustomized = thePrs->setLineStyle(SKETCH_LINE_STYLE()) || isCustomized; - } - } - else if (aShapeType == 7) { // otherwise this is a vertex - // The width value do not have effect on the point presentation. - // It is defined in order to extend selection area of the object. - thePrs->setWidth(17); - // thePrs->setPointMarker(1, 1.); // Set point as a '+' symbol - } - if(isCopy()) { - double aWidth = thePrs->width(); - isCustomized = thePrs->setWidth(aWidth / 2.5) || isCustomized; - } - - if (!theResult.get()) { - double aDeflection = Config_PropManager::real("Visualization", "construction_deflection"); - thePrs->setDeflection(aDeflection); - } - return isCustomized; - } + //virtual bool customisePresentation(ResultPtr theResult, AISObjectPtr thePrs, + // std::shared_ptr theDefaultPrs) + //{ + // /// Store previous color values of the presentation to check it after setting specific entity + // /// color. Default color is set into presentation to have not modified isCustomized state + // /// after default customize prs is completed. + // std::vector aPrevColor; + // aPrevColor.resize(3); + // thePrs->getColor(aPrevColor[0], aPrevColor[1], aPrevColor[2]); + // if (theResult.get()) { + // std::string aSection, aName, aDefault; + // theResult->colorConfigInfo(aSection, aName, aDefault); + // std::vector aColor; + // aColor = Config_PropManager::color(aSection, aName); + // thePrs->setColor(aColor[0], aColor[1], aColor[2]); + // } + + // bool isCustomized = theDefaultPrs.get() != NULL && + // theDefaultPrs->customisePresentation(theResult, thePrs, theDefaultPrs); + // int aShapeType = thePrs->getShapeType(); + // // a compound is processed like the edge because the + // // arc feature uses the compound for presentable AIS + // if (aShapeType != 6/*an edge*/ && aShapeType != 7/*a vertex*/ && aShapeType != 0/*compound*/) + // return false; + + // // set color from preferences + // std::vector aColor; + // std::shared_ptr anAuxiliaryAttr = + // data()->boolean(SketchPlugin_SketchEntity::AUXILIARY_ID()); + // bool isConstruction = anAuxiliaryAttr.get() != NULL && anAuxiliaryAttr->value(); + // if (isConstruction) { + // aColor = Config_PropManager::color("Visualization", "sketch_auxiliary_color"); + // } + // else if (isExternal()) { + // aColor = Config_PropManager::color("Visualization", "sketch_external_color"); + // } + // else { + // aColor = Config_PropManager::color("Visualization", "sketch_entity_color"); + // } + // if (!aColor.empty()) { + // if (theResult.get() && ModelAPI_Session::get()->isOperation()) { + // AttributeIntArrayPtr aColorAttr = + // theResult->data()->intArray(ModelAPI_Result::COLOR_ID()); + // aColorAttr->setSize(3); + // // Set the color attribute in order do not use default colors in the presentation object + // for (int i = 0; i < 3; i++) + // aColorAttr->setValue(i, aColor[i]); + // } + // thePrs->setColor(aColor[0], aColor[1], aColor[2]); + // for (int i = 0; i < 3 && !isCustomized; i++) + // isCustomized = aColor[i] != aPrevColor[i]; + // } + + // if (aShapeType == 6 || aShapeType == 0) { // if this is an edge or a compound + // if (isConstruction) { + // isCustomized = thePrs->setWidth(SKETCH_LINE_WIDTH_AUXILIARY()) || isCustomized; + // isCustomized = thePrs->setLineStyle(SKETCH_LINE_STYLE_AUXILIARY()) || isCustomized; + // } + // else { + // isCustomized = thePrs->setWidth(SKETCH_LINE_WIDTH()) || isCustomized; + // isCustomized = thePrs->setLineStyle(SKETCH_LINE_STYLE()) || isCustomized; + // } + // } + // else if (aShapeType == 7) { // otherwise this is a vertex + // // The width value do not have effect on the point presentation. + // // It is defined in order to extend selection area of the object. + // thePrs->setWidth(17); + // // thePrs->setPointMarker(1, 1.); // Set point as a '+' symbol + // } + // if(isCopy() && !isIncludeToResult()) { + // double aWidth = thePrs->width(); + // isCustomized = thePrs->setWidth(aWidth / 2.5) || isCustomized; + // } + + // if (!theResult.get()) { + // double aDeflection = Config_PropManager::real("Visualization", "construction_deflection"); + // thePrs->setDeflection(aDeflection); + // } + // return isCustomized; + //} +// LCOV_EXCL_STOP protected: /// initializes mySketch @@ -191,6 +227,9 @@ protected: /// \brief Initializes attributes of derived class. virtual void initDerivedClassAttributes(){}; + /// \brief Initializes attributes of derived class which were added recently. + virtual void initDerivedClassAttributes2(){}; + }; #endif