X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Parallel.cpp;h=cfdad6de9bd196631590aa5fcaed0281bc652487;hb=e675b9eb8df755fff9763560ddf36d5bfeb6fe35;hp=74e97723b7cc3874852792ad64f2bf337d4f2bdb;hpb=d11d4ba5e291b60c458d15e11081515990cc27fe;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Parallel.cpp b/src/SketcherPrs/SketcherPrs_Parallel.cpp index 74e97723b..cfdad6de9 100644 --- a/src/SketcherPrs/SketcherPrs_Parallel.cpp +++ b/src/SketcherPrs/SketcherPrs_Parallel.cpp @@ -1,124 +1,91 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SketcherPrs_Parallel.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_Parallel.h" #include "SketcherPrs_Tools.h" - -#include +#include "SketcherPrs_PositionMgr.h" #include -#include -#include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -extern std::shared_ptr getFeaturePoint(DataPtr theData, - const std::string& theAttribute); -#ifdef WIN32 -# define FSEP "\\" -#else -# define FSEP "/" -#endif - -IMPLEMENT_STANDARD_HANDLE(SketcherPrs_Parallel, AIS_InteractiveObject); -IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Parallel, AIS_InteractiveObject); +IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Parallel, SketcherPrs_SymbolPrs); static Handle(Image_AlienPixMap) MyPixMap; -SketcherPrs_Parallel::SketcherPrs_Parallel(SketchPlugin_Constraint* theConstraint, - const std::shared_ptr& thePlane) - : AIS_InteractiveObject(), myConstraint(theConstraint), myPlane(thePlane) +SketcherPrs_Parallel::SketcherPrs_Parallel(ModelAPI_Feature* theConstraint, + const std::shared_ptr& thePlane) + : SketcherPrs_SymbolPrs(theConstraint, thePlane) { - if (MyPixMap.IsNull()) { - TCollection_AsciiString aFile(getenv("NewGeomResources")); - aFile += FSEP; - aFile += "parallel.png"; - MyPixMap = new Image_AlienPixMap(); - if (!MyPixMap->Load(aFile)) - MyPixMap.Nullify(); - } - if (!MyPixMap.IsNull()) { - myAspect = new Graphic3d_AspectMarker3d(MyPixMap); - myPntArray = new Graphic3d_ArrayOfPoints(2); - myPntArray->AddVertex(0., 0., 0.); - myPntArray->AddVertex(0. ,0., 0.); - } -} - -void SketcherPrs_Parallel::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode) +} + +bool SketcherPrs_Parallel::IsReadyToDisplay(ModelAPI_Feature* theConstraint, + const std::shared_ptr&/* thePlane*/) { - if (myAspect.IsNull()) - return; - - std::shared_ptr aLine1 = SketcherPrs_Tools::getLine(myConstraint, SketchPlugin_Constraint::ENTITY_A()); - if (aLine1.get() == NULL) - return; - - std::shared_ptr aLine2 = SketcherPrs_Tools::getLine(myConstraint, SketchPlugin_Constraint::ENTITY_B()); - if (aLine2.get() == NULL) - return; - - std::shared_ptr aPnt1 = aLine1->firstPoint(); - std::shared_ptr aPnt2 = aLine1->lastPoint(); - gp_Pnt aP1((aPnt1->x() + aPnt2->x())/2., - (aPnt1->y() + aPnt2->y())/2., - (aPnt1->z() + aPnt2->z())/2.); - - gp_Vec aVec1(aPnt1->impl(), aPnt2->impl()); - gp_Vec aShift = aVec1.Crossed(myPlane->norm()->impl()); - aShift.Normalize(); - aShift.Multiply(20); - aP1.Translate(aShift); - - aPnt1 = aLine2->firstPoint(); - aPnt2 = aLine2->lastPoint(); - gp_Pnt aP2((aPnt1->x() + aPnt2->x())/2., - (aPnt1->y() + aPnt2->y())/2., - (aPnt1->z() + aPnt2->z())/2.); - - gp_Vec aVec2(aPnt1->impl(), aPnt2->impl()); - aShift = aVec1.Crossed(myPlane->norm()->impl()); - aShift.Normalize(); - aShift.Multiply(20); - aP2.Translate(aShift); - - Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(thePresentation); - aGroup->SetPrimitivesAspect(myAspect); - myPntArray->SetVertice(1, aP1); - myPntArray->SetVertice(2, aP2); - aGroup->AddPrimitiveArray(myPntArray); + bool aReadyToDisplay = false; + + ObjectPtr aObj1 = + SketcherPrs_Tools::getResult(theConstraint, SketchPlugin_Constraint::ENTITY_A()); + ObjectPtr aObj2 = + SketcherPrs_Tools::getResult(theConstraint, SketchPlugin_Constraint::ENTITY_B()); + + aReadyToDisplay = SketcherPrs_Tools::getShape(aObj1).get() != NULL && + SketcherPrs_Tools::getShape(aObj2).get() != NULL; + return aReadyToDisplay; } -void SketcherPrs_Parallel::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection, - const Standard_Integer aMode) +bool SketcherPrs_Parallel::updateIfReadyToDisplay(double theStep, bool withColor) const { - std::shared_ptr aLine1 = SketcherPrs_Tools::getLine(myConstraint, SketchPlugin_Constraint::ENTITY_A()); - if (aLine1.get() == NULL) - return; - - std::shared_ptr aLine2 = SketcherPrs_Tools::getLine(myConstraint, SketchPlugin_Constraint::ENTITY_B()); - if (aLine2.get() == NULL) - return; - - Handle(SelectMgr_EntityOwner) eown = new SelectMgr_EntityOwner(this); - Handle(Select3D_SensitivePoint) aSP1 = new Select3D_SensitivePoint(eown, myPntArray->Vertice(1)); - Handle(Select3D_SensitivePoint) aSP2 = new Select3D_SensitivePoint(eown, myPntArray->Vertice(2)); - aSelection->Add(aSP1); - aSelection->Add(aSP2); + if (!IsReadyToDisplay(myConstraint, myPlane)) + return false; + + ObjectPtr aObj1 = + SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_A()); + ObjectPtr aObj2 = + SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_B()); + + // Compute position of symbols + SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get(); + gp_Pnt aP1 = aMgr->getPosition(aObj1, this, theStep); + gp_Pnt aP2 = aMgr->getPosition(aObj2, this, theStep); + myPntArray = new Graphic3d_ArrayOfPoints(2, withColor); + myPntArray->AddVertex(aP1); + myPntArray->AddVertex(aP2); + return true; +} + + +void SketcherPrs_Parallel::drawLines(const Handle(Prs3d_Presentation)& thePrs, + Quantity_Color theColor) const +{ + Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(thePrs); + + Handle(Graphic3d_AspectLine3d) aLineAspect = + new Graphic3d_AspectLine3d(theColor, Aspect_TOL_SOLID, 2); + aGroup->SetPrimitivesAspect(aLineAspect); + + // Draw constrained lines + addLine(aGroup, SketchPlugin_Constraint::ENTITY_A()); + addLine(aGroup, SketchPlugin_Constraint::ENTITY_B()); }