X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_ConstraintPerpendicular.cpp;h=b44ad3d0cdd0b61201ab91dee79bf75226fe3e73;hb=05e2e4a31fa248d71445c40e35eeafa44f5d3b1b;hp=770eac2efe531b974aab0e1dacfa437141db53d1;hpb=f069f05f6800a491c1ea61a2490fbfdb9583193c;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_ConstraintPerpendicular.cpp b/src/SketchPlugin/SketchPlugin_ConstraintPerpendicular.cpp index 770eac2ef..b44ad3d0c 100644 --- a/src/SketchPlugin/SketchPlugin_ConstraintPerpendicular.cpp +++ b/src/SketchPlugin/SketchPlugin_ConstraintPerpendicular.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: SketchPlugin_ConstraintPerpendicular.cpp -// Created: 26 May 2014 -// Author: Artem ZHIDKOV +// 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 +// 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 +// #include "SketchPlugin_ConstraintPerpendicular.h" #include "SketchPlugin_ConstraintParallel.h" @@ -14,6 +27,8 @@ #include #include +#include + #include #include #include @@ -26,8 +41,8 @@ SketchPlugin_ConstraintPerpendicular::SketchPlugin_ConstraintPerpendicular() void SketchPlugin_ConstraintPerpendicular::initAttributes() { - data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefAttr::type()); - data()->addAttribute(SketchPlugin_Constraint::ENTITY_B(), ModelAPI_AttributeRefAttr::type()); + data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefAttr::typeId()); + data()->addAttribute(SketchPlugin_Constraint::ENTITY_B(), ModelAPI_AttributeRefAttr::typeId()); } void SketchPlugin_ConstraintPerpendicular::execute() @@ -39,55 +54,8 @@ AISObjectPtr SketchPlugin_ConstraintPerpendicular::getAISObject(AISObjectPtr the if (!sketch()) return thePrevious; - std::shared_ptr aData = data(); - std::shared_ptr anAttr1 = std::dynamic_pointer_cast< - ModelAPI_AttributeRefAttr>(aData->attribute(SketchPlugin_Constraint::ENTITY_A())); - std::shared_ptr anAttr2 = std::dynamic_pointer_cast< - ModelAPI_AttributeRefAttr>(aData->attribute(SketchPlugin_Constraint::ENTITY_B())); - if (!anAttr1 || !anAttr1->isObject() || !anAttr2 || !anAttr2->isObject()) - return thePrevious; - - FeaturePtr aFeature = ModelAPI_Feature::feature(anAttr1->object()); - if (!aFeature) - return thePrevious; - std::shared_ptr aLine1Feature = - std::dynamic_pointer_cast(aFeature); - - aFeature = ModelAPI_Feature::feature(anAttr2->object()); - if (!aFeature) - return thePrevious; - std::shared_ptr aLine2Feature = - std::dynamic_pointer_cast(aFeature); - - if (!aLine1Feature || !aLine2Feature) - return thePrevious; - - std::shared_ptr aPlane = sketch()->plane(); - std::shared_ptr aLine1, aLine2; - std::shared_ptr aConst1 = std::dynamic_pointer_cast< - ModelAPI_ResultConstruction>(anAttr1->object()); - if (aConst1) - aLine1 = aConst1->shape(); - std::shared_ptr aConst2 = std::dynamic_pointer_cast< - ModelAPI_ResultConstruction>(anAttr2->object()); - if (aConst2) - aLine2 = aConst2->shape(); - - AISObjectPtr anAIS = thePrevious; - if (!anAIS) - anAIS = AISObjectPtr(new GeomAPI_AISObject); - anAIS->createPerpendicular(aLine1, aLine2, aPlane); - - // Set color from preferences - std::vector aRGB = Config_PropManager::color("Visualization", "sketch_parallel_color", - SKETCH_CONSTRAINT_COLOR); - anAIS->setColor(aRGB[0], aRGB[1], aRGB[2]); + AISObjectPtr anAIS = SketcherPrs_Factory::perpendicularConstraint(this, sketch(), + thePrevious); return anAIS; } -void SketchPlugin_ConstraintPerpendicular::move(double theDeltaX, double theDeltaY) -{ - //Flyout point of the constraint follows it's features - return; -} -