X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Transformation.cpp;h=a409bcc94c770dfae15d8f4c1a4e211cf2db7a33;hb=665435f0512e2f26abdbe7832b90af6f560b6451;hp=347f8c3578b9358717c1c6b8baaa365613acd689;hpb=cd6bf982e7dc443e050e4d93b4954951daebcf15;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Transformation.cpp b/src/SketcherPrs/SketcherPrs_Transformation.cpp index 347f8c357..a409bcc94 100644 --- a/src/SketcherPrs/SketcherPrs_Transformation.cpp +++ b/src/SketcherPrs/SketcherPrs_Transformation.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SketcherPrs_Transformation.cpp -// Created: 16 February 2015 -// Author: Vitaly SMETANNIKOV +// Copyright (C) 2014-2017 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,17 +37,16 @@ -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, +SketcherPrs_Transformation::SketcherPrs_Transformation(ModelAPI_Feature* theConstraint, const std::shared_ptr& thePlane, - bool isTranslation) + bool isTranslation) : SketcherPrs_SymbolPrs(theConstraint, thePlane), myIsTranslation(isTranslation) { -} +} bool SketcherPrs_Transformation::IsReadyToDisplay(ModelAPI_Feature* theConstraint, const std::shared_ptr&/* thePlane*/) @@ -42,23 +55,45 @@ bool SketcherPrs_Transformation::IsReadyToDisplay(ModelAPI_Feature* theConstrain std::shared_ptr aData = theConstraint->data(); // Get transformated objects list - 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 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::updatePoints(double theStep) const +bool SketcherPrs_Transformation::updateIfReadyToDisplay(double theStep, bool withColor) const { if (!IsReadyToDisplay(myConstraint, myPlane)) return false; std::shared_ptr aData = myConstraint->data(); // Get transformated objects list - std::shared_ptr anAttrB = aData->reflist(SketchPlugin_Constraint::ENTITY_B()); + std::shared_ptr anAttrB = + aData->reflist(SketchPlugin_Constraint::ENTITY_B()); int aNbB = anAttrB->size(); if (aNbB == 0) @@ -70,7 +105,7 @@ bool SketcherPrs_Transformation::updatePoints(double theStep) const } SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get(); - myPntArray = new Graphic3d_ArrayOfPoints(aNbB); + myPntArray = new Graphic3d_ArrayOfPoints(aNbB, withColor); int i; ObjectPtr aObj; @@ -82,28 +117,25 @@ bool SketcherPrs_Transformation::updatePoints(double theStep) const 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()) { // If it is translation AttributePoint2DPtr aStart = GeomDataAPI_Point2D::getPoint2D(aData, @@ -124,7 +156,8 @@ void SketcherPrs_Transformation::drawLines(const Handle(Prs3d_Presentation)& the } } else if (myConstraint->getKind() == SketchPlugin_MultiRotation::ID()) { // if it is rotation - AttributePoint2DPtr aCenter = GeomDataAPI_Point2D::getPoint2D(aData, SketchPlugin_MultiRotation::CENTER_ID()); + AttributePoint2DPtr aCenter = + GeomDataAPI_Point2D::getPoint2D(aData, SketchPlugin_MultiRotation::CENTER_ID()); if (aCenter.get() && aCenter->isInitialized()) { // Show center of rotation std::shared_ptr aPnt = myPlane->to3D(aCenter->x(), aCenter->y());