X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_SketchEntity.h;h=c207dd72b264b3f279483e3fa17021978e59a006;hb=aca54238175d75c25fa9b12ade0e274765a1cabd;hp=b56992b893ccb06b8e398e3c0f64da326096e8fe;hpb=cbde248859fb0072f6012907391ea90cfc254574;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_SketchEntity.h b/src/SketchPlugin/SketchPlugin_SketchEntity.h index b56992b89..c207dd72b 100644 --- a/src/SketchPlugin/SketchPlugin_SketchEntity.h +++ b/src/SketchPlugin/SketchPlugin_SketchEntity.h @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: SketchPlugin_SketchEntity.h -// Created: 05 Mar 2015 -// Author: Natalia ERMOLAEVA +// Copyright (C) 2014-2019 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 +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// 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 +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef SketchPlugin_SketchEntity_H_ #define SketchPlugin_SketchEntity_H_ @@ -11,22 +24,21 @@ #include "SketchPlugin_Feature.h" #include +#include #include #include #include #include #include +#include #include #include -#define SKETCH_ENTITY_COLOR "225,0,0" -#define SKETCH_EXTERNAL_COLOR "170,0,225" -#define SKETCH_AUXILIARY_COLOR "0,85,0" - /**\class SketchPlugin_SketchEntity * \ingroup Plugins - * \brief Sketch Entity for creation of the new feature in PartSet. This is an abstract class to give + * \brief Sketch Entity for creation of the new feature in PartSet. + * 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 @@ -46,6 +58,37 @@ class SketchPlugin_SketchEntity : public SketchPlugin_Feature, public GeomAPI_IC return MY_EXTERNAL_ID; } + /// Reference to the copy type of the feature + inline static const std::string& COPY_ID() + { + static const std::string MY_COPY_ID("Copy"); + return MY_COPY_ID; + } + + /// Width of the auxiliary line + inline static const double SKETCH_LINE_WIDTH_AUXILIARY() + { + return 2; + } + + /// Width of the line + inline static const double SKETCH_LINE_WIDTH() + { + return 3; + } + + /// Style of the auxiliary line + inline static const int SKETCH_LINE_STYLE_AUXILIARY() + { + return 3; + } + + /// Style of the line + inline static const int SKETCH_LINE_STYLE() + { + return 0; + } + /// Request for initialization of data model of the feature: adding all attributes virtual void initAttributes(); @@ -54,17 +97,44 @@ class SketchPlugin_SketchEntity : public SketchPlugin_Feature, public GeomAPI_IC { AttributeSelectionPtr aAttr = data()->selection(EXTERNAL_ID()); if (aAttr) - return aAttr->context().get() != NULL; + return aAttr->context().get() != NULL && !aAttr->isInvalid(); + return false; + } + + /// Returns true of the feature is a copy of other feature + virtual bool isCopy() const + { + AttributeBooleanPtr anAttr = data()->boolean(COPY_ID()); + if(anAttr.get()) { + return anAttr->value(); + } return false; } +// LCOV_EXCL_START /// Customize presentation of the feature virtual bool customisePresentation(ResultPtr theResult, AISObjectPtr thePrs, std::shared_ptr theDefaultPrs) { - bool isCustomized = false; + /// 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 + // 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; @@ -74,28 +144,35 @@ class SketchPlugin_SketchEntity : public SketchPlugin_Feature, public GeomAPI_IC data()->boolean(SketchPlugin_SketchEntity::AUXILIARY_ID()); bool isConstruction = anAuxiliaryAttr.get() != NULL && anAuxiliaryAttr->value(); if (isConstruction) { - aColor = Config_PropManager::color("Visualization", "sketch_auxiliary_color", - SKETCH_AUXILIARY_COLOR); + aColor = Config_PropManager::color("Visualization", "sketch_auxiliary_color"); } else if (isExternal()) { - aColor = Config_PropManager::color("Visualization", "sketch_external_color", - SKETCH_EXTERNAL_COLOR); + aColor = Config_PropManager::color("Visualization", "sketch_external_color"); } else { - aColor = Config_PropManager::color("Visualization", "sketch_entity_color", - SKETCH_ENTITY_COLOR); + 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 perasentation 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 (!aColor.empty()) - isCustomized = thePrs->setColor(aColor[0], aColor[1], aColor[2]) || isCustomized; if (aShapeType == 6 || aShapeType == 0) { // if this is an edge or a compound if (isConstruction) { - isCustomized = thePrs->setWidth(1) || isCustomized; - isCustomized = thePrs->setLineStyle(3) || isCustomized; + isCustomized = thePrs->setWidth(SKETCH_LINE_WIDTH_AUXILIARY()) || isCustomized; + isCustomized = thePrs->setLineStyle(SKETCH_LINE_STYLE_AUXILIARY()) || isCustomized; } else { - isCustomized = thePrs->setWidth(3) || isCustomized; - isCustomized = thePrs->setLineStyle(0) || isCustomized; + isCustomized = thePrs->setWidth(SKETCH_LINE_WIDTH()) || isCustomized; + isCustomized = thePrs->setLineStyle(SKETCH_LINE_STYLE()) || isCustomized; } } else if (aShapeType == 7) { // otherwise this is a vertex @@ -104,12 +181,26 @@ class SketchPlugin_SketchEntity : public SketchPlugin_Feature, public GeomAPI_IC 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; } +// LCOV_EXCL_STOP protected: /// initializes mySketch SketchPlugin_SketchEntity(); + + /// \brief Initializes attributes of derived class. + virtual void initDerivedClassAttributes(){}; + }; #endif