X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_SymbolPrs.cpp;h=b8bdd9db71111e3cfbf3e5e3ca2bc6330fc25bbf;hb=53445a818411b3b71e3457f5e2e97c5f23d69cb7;hp=37841f4b195e1b98b6ef2a53ffff998c7a97f6a1;hpb=f82a9bc2556561838b08e0d320eba7d0fe3945c8;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp b/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp index 37841f4b1..b8bdd9db7 100644 --- a/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp +++ b/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SketcherPrs_SymbolPrs.cpp -// Created: 12 March 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_SymbolPrs.h" #include "SketcherPrs_Tools.h" @@ -12,6 +26,8 @@ #include #include +#include + #include #include @@ -28,6 +44,7 @@ #include #include #include +#include #include #include @@ -42,7 +59,7 @@ #endif /// Step between icons -static const double MyDist = 0.02; +static const double MyDist = 0.015; //************************************************************** @@ -50,10 +67,11 @@ static const double MyDist = 0.02; class SketcherPrs_SymbolArray: public OpenGl_PrimitiveArray { public: - SketcherPrs_SymbolArray(const OpenGl_GraphicDriver* theDriver, - const Handle(SketcherPrs_SymbolPrs)& theObj) - :OpenGl_PrimitiveArray(theDriver, theObj->myPntArray->Type(), theObj->myPntArray->Indices(), - theObj->myPntArray->Attributes(), theObj->myPntArray->Bounds()), myObj(theObj) {} + SketcherPrs_SymbolArray(const OpenGl_GraphicDriver* theDriver, + const Handle(SketcherPrs_SymbolPrs)& theObj, const Handle(AIS_InteractiveContext)& theCtx) + :OpenGl_PrimitiveArray(theDriver, theObj->myPntArray->Type(), theObj->myPntArray->Indices(), + theObj->myPntArray->Attributes(), theObj->myPntArray->Bounds()), myObj(theObj), + myContext(theCtx) {} virtual void Render(const Handle(OpenGl_Workspace)& theWorkspace) const { @@ -62,12 +80,15 @@ public: Handle(OpenGl_View) aView = theWorkspace->View(); double aScale = aView->Camera()->Scale(); // Update points coordinate taking the viewer scale into account - myObj->updateIfReadyToDisplay(MyDist * aScale); + myObj->updateIfReadyToDisplay(MyDist * aScale, myObj->myIsCustomColor); if (myIsVboInit) { - const Handle(OpenGl_Context)& aCtx = theWorkspace->GetGlContext(); - Handle(Graphic3d_Buffer) aAttr = myObj->myPntArray->Attributes(); - myVboAttribs->init(aCtx, 0, aAttr->NbElements, - aAttr->Data(), GL_NONE, aAttr->Stride); + if (myVboAttribs) { + const Handle(OpenGl_Context)& aCtx = theWorkspace->GetGlContext(); + Handle(Graphic3d_Buffer) aAttr = myObj->myPntArray->Attributes(); + myVboAttribs->init(aCtx, 0, aAttr->NbElements, + aAttr->Data(), GL_NONE, aAttr->Stride); + } else + myIsVboInit = false; } else { myAttribs = myObj->myPntArray->Attributes(); myIndices = myObj->myPntArray->Indices(); @@ -75,10 +96,18 @@ public: } } OpenGl_PrimitiveArray::Render(theWorkspace); + + // Update selection position only if there is no selected object + // because it can corrupt selection of other objects + if (myContext->NbSelected() == 0) { + myContext->MainSelector()->RebuildSensitivesTree(myObj); + myContext->MainSelector()->RebuildObjectsTree (false); + } } private: Handle(SketcherPrs_SymbolPrs) myObj; + Handle(AIS_InteractiveContext) myContext; }; @@ -90,12 +119,12 @@ std::map SketcherPrs_SymbolPrs::myIconsM SketcherPrs_SymbolPrs::SketcherPrs_SymbolPrs(ModelAPI_Feature* theConstraint, - const std::shared_ptr& thePlane) - : AIS_InteractiveObject(), myConstraint(theConstraint), myPlane(thePlane), myIsConflicting(false) + SketchPlugin_Sketch* theSketcher) + : AIS_InteractiveObject(), myConstraint(theConstraint), + myPlane(theSketcher->coordinatePlane()), myIsCustomColor(false), + mySketcher(theSketcher) { SetAutoHilight(Standard_False); - myPntArray = new Graphic3d_ArrayOfPoints(1); - myPntArray->AddVertex(0., 0., 0.); } //********************************************************************************* @@ -104,6 +133,23 @@ SketcherPrs_SymbolPrs::~SketcherPrs_SymbolPrs() SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get(); // Empty memory in position manager aMgr->deleteConstraint(this); + + Handle(Prs3d_Presentation) aSelPrs = + GetSelectPresentation(Handle(PrsMgr_PresentationManager3d)()); + if (!aSelPrs.IsNull()) { + if (!aSelPrs->Groups().IsEmpty()) { + aSelPrs->Clear(); + } + aSelPrs->Erase(); + } + Handle(Prs3d_Presentation) aHilightPrs = + GetHilightPresentation(Handle(PrsMgr_PresentationManager3d)()); + if (!aHilightPrs.IsNull()) { + if (!aHilightPrs->Groups().IsEmpty()) { + aHilightPrs->Clear(); + } + aHilightPrs->Erase(); + } } #ifdef _WINDOWS @@ -153,6 +199,8 @@ void SketcherPrs_SymbolPrs::prepareAspect() myAspect = new Graphic3d_AspectMarker3d(); else myAspect = new Graphic3d_AspectMarker3d(aIcon); + + myAspect->SetColor(myCustomColor); } } @@ -182,7 +230,6 @@ void SketcherPrs_SymbolPrs::addLine(const Handle(Graphic3d_Group)& theGroup, void SketcherPrs_SymbolPrs::HilightSelected(const Handle(PrsMgr_PresentationManager3d)& thePM, const SelectMgr_SequenceOfOwner& theOwners) { - Handle( Prs3d_Presentation ) aSelectionPrs = GetSelectPresentation( thePM ); aSelectionPrs->Clear(); drawLines(aSelectionPrs, GetContext()->SelectionStyle()->Color()); @@ -195,7 +242,7 @@ void SketcherPrs_SymbolPrs::HilightSelected(const Handle(PrsMgr_PresentationMana //********************************************************************************* void SketcherPrs_SymbolPrs::HilightOwnerWithColor( const Handle(PrsMgr_PresentationManager3d)& thePM, - const Handle(Graphic3d_HighlightStyle)& theStyle, + const Handle(Prs3d_Drawer)& theStyle, const Handle(SelectMgr_EntityOwner)& theOwner) { thePM->Color(this, theStyle); @@ -203,7 +250,7 @@ void SketcherPrs_SymbolPrs::HilightOwnerWithColor( Handle( Prs3d_Presentation ) aHilightPrs = GetHilightPresentation( thePM ); aHilightPrs->Clear(); drawLines(aHilightPrs, theStyle->Color()); - aHilightPrs->SetZLayer (Graphic3d_ZLayerId_Topmost); + aHilightPrs->SetZLayer(Graphic3d_ZLayerId_Topmost); if (thePM->IsImmediateModeOn()) thePM->AddToImmediateList(aHilightPrs); @@ -221,14 +268,14 @@ void SketcherPrs_SymbolPrs::Compute( Handle(AIS_InteractiveContext) aCtx = GetContext(); Handle(OpenGl_GraphicDriver) aDriver = Handle(OpenGl_GraphicDriver)::DownCast(aCtx->CurrentViewer()->Driver()); - if (aDriver.IsNull()) + if (aDriver.IsNull()) return; // Update points with default shift value // it updates array of points if the presentation is ready to display, or the array of points // contains the previous values - bool aReadyToDisplay = updateIfReadyToDisplay(20); + bool aReadyToDisplay = updateIfReadyToDisplay(20, myIsCustomColor); int aNbVertex = myPntArray->VertexNumber(); if (myOwner.IsNull()) { @@ -240,9 +287,12 @@ void SketcherPrs_SymbolPrs::Compute( for (int i = 1; i <= aNbVertex; i++) { Handle(SketcherPrs_SensitivePoint) aSP = new SketcherPrs_SensitivePoint(myOwner, i); mySPoints.Append(aSP); + if (myIsCustomColor) + myPntArray->SetVertexColor(i, myCustomColor); } - Handle(OpenGl_Group) aGroup = Handle(OpenGl_Group)::DownCast(thePresentation->NewGroup()); + Handle(OpenGl_Group) aGroup = + Handle(OpenGl_Group)::DownCast(Prs3d_Root::CurrentGroup (thePresentation)); aGroup->SetPrimitivesAspect(myAspect); // Recompute boundary box of the group @@ -251,16 +301,16 @@ void SketcherPrs_SymbolPrs::Compute( aBnd.Clear(); for (int i = 1; i <= myPntArray->ItemNumber(); i++) { aVert = myPntArray->Vertice(i); - aBnd.Add (Graphic3d_Vec4((float)aVert.X(), (float)aVert.Y(), (float)aVert.Z(), 1.0f)); + aBnd.Add(Graphic3d_Vec4((float)aVert.X(), (float)aVert.Y(), (float)aVert.Z(), 1.0f)); } // Pint the group with custom procedure (see Render) - SketcherPrs_SymbolArray* aElem = - new SketcherPrs_SymbolArray((OpenGl_GraphicDriver*)aDriver->This(), this); + SketcherPrs_SymbolArray* aElem = + new SketcherPrs_SymbolArray((OpenGl_GraphicDriver*)aDriver->This(), this, GetContext()); aGroup->AddElement(aElem); // Disable frustum culling for this object by marking it as mutable - //aGroup->Structure()->SetMutable(true); + aGroup->Structure()->SetMutable(true); if (!aReadyToDisplay) SketcherPrs_Tools::sendEmptyPresentationError(myConstraint, @@ -280,28 +330,44 @@ void SketcherPrs_SymbolPrs::ComputeSelection(const Handle(SelectMgr_Selection)& } //********************************************************************************* -void SketcherPrs_SymbolPrs::SetConflictingConstraint(const bool& theConflicting, - const std::vector& theColor) +void SketcherPrs_SymbolPrs::SetCustomColor(const std::vector& theColor) { - if (theConflicting) - { - if (!myAspect.IsNull()) - myAspect->SetColor (Quantity_Color (theColor[0] / 255., theColor[1] / 255., - theColor[2] / 255., Quantity_TOC_RGB)); - myIsConflicting = true; - } + myIsCustomColor = !theColor.empty(); + if (myIsCustomColor) + myCustomColor = Quantity_Color(theColor[0] / 255., theColor[1] / 255., + theColor[2] / 255., Quantity_TOC_RGB); else - { - if (!myAspect.IsNull()) - myAspect->SetColor (Quantity_Color (1.0, 1.0, 0.0, Quantity_TOC_RGB)); - myIsConflicting = false; + myCustomColor = Quantity_Color (1.0, 1.0, 0.0, Quantity_TOC_RGB); + + if (!myAspect.IsNull()) + myAspect->SetColor (myCustomColor); + + Handle(Prs3d_Presentation) aPrs = Presentation(); + if (!aPrs.IsNull()) { + if (myIsCustomColor) { + Handle(Graphic3d_PresentationAttributes) aAttr = new Graphic3d_PresentationAttributes(); + aAttr->SetColor(myCustomColor); + aPrs->Highlight(aAttr); + } + else { + aPrs->UnHighlight(); + } } } //********************************************************************************* void SketcherPrs_SymbolPrs::drawShape(const std::shared_ptr& theShape, - const Handle(Prs3d_Presentation)& thePrs) const + const Handle(Prs3d_Presentation)& thePrs, + Quantity_Color theColor) const { + Handle(Graphic3d_AspectLine3d) aLineAspect = + new Graphic3d_AspectLine3d(theColor, Aspect_TOL_SOLID, 2); + + Handle(Prs3d_LineAspect) aLinesStyle = myDrawer->LineAspect(); + Handle(Graphic3d_AspectLine3d) aOldStyle = aLinesStyle->Aspect(); + aLinesStyle->SetAspect(aLineAspect); + myDrawer->SetLineAspect(aLinesStyle); + if (theShape->isEdge()) { // The shape is edge std::shared_ptr aCurve = @@ -325,12 +391,15 @@ void SketcherPrs_SymbolPrs::drawShape(const std::shared_ptr& theS Handle(Geom_CartesianPoint) aPoint = new Geom_CartesianPoint(aPnt->impl()); StdPrs_Point::Add(thePrs, aPoint, myDrawer); } + + aLinesStyle->SetAspect(aOldStyle); + myDrawer->SetLineAspect(aLinesStyle); } //********************************************************************************* void SketcherPrs_SymbolPrs::drawListOfShapes( const std::shared_ptr& theListAttr, - const Handle(Prs3d_Presentation)& thePrs) const + const Handle(Prs3d_Presentation)& thePrs, Quantity_Color theColor) const { int aNb = theListAttr->size(); if (aNb == 0) @@ -341,7 +410,7 @@ void SketcherPrs_SymbolPrs::drawListOfShapes( aObj = theListAttr->object(i); std::shared_ptr aShape = SketcherPrs_Tools::getShape(aObj); if (aShape.get() != NULL) - drawShape(aShape, thePrs); + drawShape(aShape, thePrs, theColor); } } @@ -357,4 +426,3 @@ void SketcherPrs_SymbolPrs::BoundingBox(Bnd_Box& theBndBox) theBndBox.Update (aTmpBox.CornerMin().x(), aTmpBox.CornerMin().y(), aTmpBox.CornerMin().z(), aTmpBox.CornerMax().x(), aTmpBox.CornerMax().y(), aTmpBox.CornerMax().z()); } -