X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSketcherPrs%2FSketcherPrs_Mirror.cpp;h=33a650116deaed59f480758d9db6355352847e6b;hb=047a6c0106078a9953f72510f4e204313f2bcf72;hp=9719dc8cd066175fdc641e7fa98217cfe5f865f7;hpb=c3ae28ba30027cc4a6a757ef623f40adaae96ead;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Mirror.cpp b/src/SketcherPrs/SketcherPrs_Mirror.cpp index 9719dc8cd..33a650116 100644 --- a/src/SketcherPrs/SketcherPrs_Mirror.cpp +++ b/src/SketcherPrs/SketcherPrs_Mirror.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SketcherPrs_Mirror.cpp -// Created: 6 April 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_Mirror.h" #include "SketcherPrs_Tools.h" @@ -16,68 +30,104 @@ -IMPLEMENT_STANDARD_HANDLE(SketcherPrs_Mirror, SketcherPrs_SymbolPrs); IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Mirror, SketcherPrs_SymbolPrs); static Handle(Image_AlienPixMap) MyPixMap; -SketcherPrs_Mirror::SketcherPrs_Mirror(ModelAPI_Feature* theConstraint, - const std::shared_ptr& thePlane) - : SketcherPrs_SymbolPrs(theConstraint, thePlane) +SketcherPrs_Mirror::SketcherPrs_Mirror(ModelAPI_Feature* theConstraint, + ModelAPI_CompositeFeature* theSketcher, + const std::shared_ptr& thePlane) + : SketcherPrs_SymbolPrs(theConstraint, theSketcher, thePlane) { -} - +} -bool SketcherPrs_Mirror::updatePoints(double theStep) const +bool SketcherPrs_Mirror::IsReadyToDisplay(ModelAPI_Feature* theConstraint, + const std::shared_ptr&/* thePlane*/) { + bool aReadyToDisplay = false; + // Get axis of mirror - ObjectPtr aAxisObj = SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_A()); + ObjectPtr aAxisObj = + SketcherPrs_Tools::getResult(theConstraint, SketchPlugin_Constraint::ENTITY_A()); if (SketcherPrs_Tools::getShape(aAxisObj).get() == NULL) - return false; + return aReadyToDisplay; - std::shared_ptr aData = myConstraint->data(); + std::shared_ptr aData = theConstraint->data(); // Get source objects - 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 false; + return aReadyToDisplay; // Get mirrored objects - std::shared_ptr anAttrC = aData->reflist(SketchPlugin_Constraint::ENTITY_C()); + std::shared_ptr anAttrC = + aData->reflist(SketchPlugin_Constraint::ENTITY_C()); if (anAttrC.get() == NULL) - return false; + return aReadyToDisplay; SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get(); int aNb = anAttrB->size(); // If size of source objects and mirrored ones is not equal then the constraint is not computed if (aNb != anAttrC->size()) + return aReadyToDisplay; + + aReadyToDisplay = true; + return aReadyToDisplay; +} + +bool SketcherPrs_Mirror::updateIfReadyToDisplay(double theStep, bool withColor) const +{ + if (!IsReadyToDisplay(myConstraint, myPlane)) return false; - myPntArray = new Graphic3d_ArrayOfPoints(2 * aNb); + // Get axis of mirror + ObjectPtr aAxisObj = + SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_A()); + + std::shared_ptr aData = myConstraint->data(); + // Get source objects + std::shared_ptr anAttrB = + aData->reflist(SketchPlugin_Constraint::ENTITY_B()); + // Get mirrored objects + std::shared_ptr anAttrC = + aData->reflist(SketchPlugin_Constraint::ENTITY_C()); + + SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get(); + int aNb = anAttrB->size(); + + myPntArray = new Graphic3d_ArrayOfPoints(2 * aNb, withColor); int i; ObjectPtr aObj; gp_Pnt aP1; // get position for each source object for (i = 0; i < aNb; i++) { aObj = anAttrB->object(i); + if (SketcherPrs_Tools::getShape(aObj).get() == NULL) + continue; aP1 = aMgr->getPosition(aObj, this, theStep); myPntArray->SetVertice(i + 1, aP1); - } + } // Get position of each mirrored object for (i = 0; i < aNb; i++) { aObj = anAttrC->object(i); + if (SketcherPrs_Tools::getShape(aObj).get() == NULL) + continue; aP1 = aMgr->getPosition(aObj, this, theStep); myPntArray->SetVertice(aNb + i + 1, aP1); - } + } return true; } -void SketcherPrs_Mirror::drawLines(const Handle(Prs3d_Presentation)& thePrs, Quantity_Color theColor) const +void SketcherPrs_Mirror::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; - std::shared_ptr anAttrC = aData->reflist(SketchPlugin_Constraint::ENTITY_C()); + std::shared_ptr anAttrC = + aData->reflist(SketchPlugin_Constraint::ENTITY_C()); if (anAttrC.get() == NULL) return; @@ -85,7 +135,7 @@ void SketcherPrs_Mirror::drawLines(const Handle(Prs3d_Presentation)& thePrs, Qua if (aNb != anAttrC->size()) return; - Handle(Graphic3d_Group) aGroup = Prs3d_Root::NewGroup(thePrs); + Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(thePrs); // drawListOfShapes uses myDrawer for attributes definition Handle(Prs3d_LineAspect) aLnAspect = new Prs3d_LineAspect(theColor, Aspect_TOL_SOLID, 1); @@ -95,9 +145,9 @@ void SketcherPrs_Mirror::drawLines(const Handle(Prs3d_Presentation)& thePrs, Qua addLine(aGroup, SketchPlugin_Constraint::ENTITY_A()); // Draw source objects - drawListOfShapes(anAttrB, thePrs); + drawListOfShapes(anAttrB, thePrs, theColor); // draw mirrored objects - drawListOfShapes(anAttrC, thePrs); + drawListOfShapes(anAttrC, thePrs, theColor); }