X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Transformation.cpp;h=341117a10bc62d3c166ce527a3252267f4225728;hb=ca95b8880b63f9998cb09d3ea7d91716f3ea4390;hp=b783a75440db11ceb1baaf856f28e9318d11ad2d;hpb=ae8a12befcedc3433eb3f461311946458360516f;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Transformation.cpp b/src/SketcherPrs/SketcherPrs_Transformation.cpp index b783a7544..341117a10 100644 --- a/src/SketcherPrs/SketcherPrs_Transformation.cpp +++ b/src/SketcherPrs/SketcherPrs_Transformation.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SketcherPrs_Transformation.cpp -// Created: 16 February 2015 -// Author: Vitaly SMETANNIKOV +// Copyright (C) 2014-2020 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 "SketcherPrs_Transformation.h" #include "SketcherPrs_Tools.h" @@ -23,25 +36,66 @@ -IMPLEMENT_STANDARD_HANDLE(SketcherPrs_Transformation, SketcherPrs_SymbolPrs); IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Transformation, SketcherPrs_SymbolPrs); static Handle(Image_AlienPixMap) MyPixMap; -SketcherPrs_Transformation::SketcherPrs_Transformation(ModelAPI_Feature* theConstraint, - const std::shared_ptr& thePlane, - bool isTranslation) - : SketcherPrs_SymbolPrs(theConstraint, thePlane), myIsTranslation(isTranslation) +SketcherPrs_Transformation::SketcherPrs_Transformation(ModelAPI_Feature* theConstraint, + SketchPlugin_Sketch* theSketcher, + bool isTranslation) + : SketcherPrs_SymbolPrs(theConstraint, theSketcher), myIsTranslation(isTranslation) { -} +} -bool SketcherPrs_Transformation::updatePoints(double theStep) const +bool SketcherPrs_Transformation::IsReadyToDisplay(ModelAPI_Feature* theConstraint, + const std::shared_ptr& thePlane) { - std::shared_ptr aData = myConstraint->data(); - std::shared_ptr anAttrB = aData->reflist(SketchPlugin_Constraint::ENTITY_B()); + bool aReadyToDisplay = false; + if (!thePlane) + return aReadyToDisplay; + + std::shared_ptr aData = theConstraint->data(); + // Get transformated objects list + std::shared_ptr anAttrB = + aData->reflist(SketchPlugin_Constraint::ENTITY_B()); if (anAttrB.get() == NULL) + return aReadyToDisplay; + + int aNbB = anAttrB->size(); + aReadyToDisplay = aNbB > 0; + +#ifdef DEBUG_HIDE_COPY_ATTRIBUTE + // additional check + if (theConstraint->getKind() == SketchPlugin_MultiTranslation::ID()) { + // If it is translation + AttributePoint2DPtr aStart = GeomDataAPI_Point2D::getPoint2D(aData, + SketchPlugin_MultiTranslation::START_POINT_ID()); + AttributePoint2DPtr aEnd = GeomDataAPI_Point2D::getPoint2D(aData, + SketchPlugin_MultiTranslation::END_POINT_ID()); + + aReadyToDisplay = + aStart.get() && aEnd.get() && aStart->isInitialized() && aEnd->isInitialized(); + } + else if (theConstraint->getKind() == SketchPlugin_MultiRotation::ID()) { + // if it is rotation + AttributePoint2DPtr aCenter = + GeomDataAPI_Point2D::getPoint2D(aData, SketchPlugin_MultiRotation::CENTER_ID()); + aReadyToDisplay = aCenter.get() && aCenter->isInitialized(); + } +#endif + return aReadyToDisplay; +} + +bool SketcherPrs_Transformation::updateIfReadyToDisplay(double theStep, bool withColor) const +{ + if (!IsReadyToDisplay(myConstraint, plane())) return false; + std::shared_ptr aData = myConstraint->data(); + // Get transformated objects list + std::shared_ptr anAttrB = + aData->reflist(SketchPlugin_Constraint::ENTITY_B()); + int aNbB = anAttrB->size(); if (aNbB == 0) { @@ -49,61 +103,65 @@ bool SketcherPrs_Transformation::updatePoints(double theStep) const //if (!myPntArray.IsNull()) // mySPoints.Clear(); #endif - return false; } SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get(); - myPntArray = new Graphic3d_ArrayOfPoints(aNbB); + myPntArray = new Graphic3d_ArrayOfPoints(aNbB, withColor); int i; ObjectPtr aObj; gp_Pnt aP1; + // Compute points of symbols for (i = 0; i < aNbB; i++) { aObj = anAttrB->object(i); + if (SketcherPrs_Tools::getShape(aObj).get() == NULL) + continue; aP1 = aMgr->getPosition(aObj, this, theStep); myPntArray->SetVertice(i + 1, aP1); - } + } return true; } -void SketcherPrs_Transformation::drawLines(const Handle(Prs3d_Presentation)& thePrs, Quantity_Color theColor) const +void SketcherPrs_Transformation::drawLines(const Handle(Prs3d_Presentation)& thePrs, + Quantity_Color theColor) const { std::shared_ptr aData = myConstraint->data(); - std::shared_ptr anAttrB = aData->reflist(SketchPlugin_Constraint::ENTITY_B()); + std::shared_ptr anAttrB = + aData->reflist(SketchPlugin_Constraint::ENTITY_B()); if (anAttrB.get() == NULL) return; - Handle(Graphic3d_Group) aGroup = Prs3d_Root::NewGroup(thePrs); - - //Handle(Graphic3d_AspectLine3d) aLineAspect = new Graphic3d_AspectLine3d(theColor, Aspect_TOL_SOLID, 2); - //aGroup->SetPrimitivesAspect(aLineAspect); - // drawListOfShapes uses myDrawer for attributes definition - Handle(Prs3d_LineAspect) aLnAspect = new Prs3d_LineAspect(theColor, Aspect_TOL_SOLID, 1); - myDrawer->SetLineAspect(aLnAspect); + //Handle(Prs3d_LineAspect) aLnAspect = new Prs3d_LineAspect(theColor, Aspect_TOL_SOLID, 1); + //myDrawer->SetLineAspect(aLnAspect); - drawListOfShapes(anAttrB, thePrs); + drawListOfShapes(anAttrB, thePrs, theColor); if (myConstraint->getKind() == SketchPlugin_MultiTranslation::ID()) { - std::shared_ptr aStart = std::dynamic_pointer_cast( - aData->attribute(SketchPlugin_MultiTranslation::START_POINT_ID())); - std::shared_ptr aEnd = std::dynamic_pointer_cast( - aData->attribute(SketchPlugin_MultiTranslation::END_POINT_ID())); - + // If it is translation + AttributePoint2DPtr aStart = GeomDataAPI_Point2D::getPoint2D(aData, + SketchPlugin_MultiTranslation::START_POINT_ID()); + AttributePoint2DPtr aEnd = GeomDataAPI_Point2D::getPoint2D(aData, + SketchPlugin_MultiTranslation::END_POINT_ID()); + if (aStart.get() && aEnd.get() && aStart->isInitialized() && aEnd->isInitialized()) { - std::shared_ptr aPnt = myPlane->to3D(aStart->x(), aStart->y()); + // Add start point + std::shared_ptr aPnt = plane()->to3D(aStart->x(), aStart->y()); Handle(Geom_CartesianPoint) aPoint = new Geom_CartesianPoint(aPnt->impl()); StdPrs_Point::Add(thePrs, aPoint, myDrawer); - aPnt = myPlane->to3D(aEnd->x(), aEnd->y()); + // Add end point + aPnt = plane()->to3D(aEnd->x(), aEnd->y()); aPoint = new Geom_CartesianPoint(aPnt->impl()); StdPrs_Point::Add(thePrs, aPoint, myDrawer); } } else if (myConstraint->getKind() == SketchPlugin_MultiRotation::ID()) { - std::shared_ptr aCenter = std::dynamic_pointer_cast( - aData->attribute(SketchPlugin_MultiRotation::CENTER_ID())); + // if it is rotation + AttributePoint2DPtr aCenter = + GeomDataAPI_Point2D::getPoint2D(aData, SketchPlugin_MultiRotation::CENTER_ID()); if (aCenter.get() && aCenter->isInitialized()) { - std::shared_ptr aPnt = myPlane->to3D(aCenter->x(), aCenter->y()); + // Show center of rotation + std::shared_ptr aPnt = plane()->to3D(aCenter->x(), aCenter->y()); Handle(Geom_CartesianPoint) aPoint = new Geom_CartesianPoint(aPnt->impl()); StdPrs_Point::Add(thePrs, aPoint, myDrawer); }