X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_SymbolPrs.cpp;h=f52a48c5dff67ffdeebcad64edd8d918ddd73637;hb=449259f5540f1e1d7e5e0595e10f80e18a15e038;hp=8a3a0fa7a415209dc719e659faedd0e064a6181f;hpb=5b6031b015602aa07f5a6fc668c13ac3faf7a8a9;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp b/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp index 8a3a0fa7a..f52a48c5d 100644 --- a/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp +++ b/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SketcherPrs_SymbolPrs.cpp -// Created: 12 March 2015 -// Author: Vitaly SMETANNIKOV +// Copyright (C) 2014-2019 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 +25,8 @@ #include #include +#include + #include #include @@ -28,6 +43,7 @@ #include #include #include +#include #include #include @@ -42,7 +58,7 @@ #endif /// Step between icons -static const double MyDist = 0.02; +static const double MyDist = 0.015; //************************************************************** @@ -51,9 +67,10 @@ class SketcherPrs_SymbolArray: public OpenGl_PrimitiveArray { public: SketcherPrs_SymbolArray(const OpenGl_GraphicDriver* theDriver, - const Handle(SketcherPrs_SymbolPrs)& theObj) + 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) {} + theObj->myPntArray->Attributes(), theObj->myPntArray->Bounds()), myObj(theObj), + myContext(theCtx) {} virtual void Render(const Handle(OpenGl_Workspace)& theWorkspace) const { @@ -62,7 +79,7 @@ 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) { if (myVboAttribs) { const Handle(OpenGl_Context)& aCtx = theWorkspace->GetGlContext(); @@ -78,10 +95,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; }; @@ -93,12 +118,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), + myIsCustomColor(false), + mySketcher(theSketcher) { SetAutoHilight(Standard_False); - myPntArray = new Graphic3d_ArrayOfPoints(1); - myPntArray->AddVertex(0., 0., 0.); } //********************************************************************************* @@ -107,6 +132,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 @@ -126,7 +168,7 @@ Handle(Image_AlienPixMap) SketcherPrs_SymbolPrs::icon() aFile = std::string(anEnv) + FSEP + "share" + FSEP + "salome" + FSEP + "resources" + FSEP + "shaper"; } else { - anEnv = getenv("OPENPARTS_ROOT_DIR"); + anEnv = getenv("CADBUILDER_ROOT_DIR"); if (anEnv) aFile = std::string(anEnv) + FSEP + "resources"; } @@ -135,12 +177,25 @@ Handle(Image_AlienPixMap) SketcherPrs_SymbolPrs::icon() aFile += iconName(); Handle(Image_AlienPixMap) aPixMap = new Image_AlienPixMap(); if (aPixMap->Load(aFile.c_str())) { + int aRatio = SketcherPrs_Tools::pixelRatio(); + if (aRatio > 1) { + Handle(Image_AlienPixMap) aSizedMap = new Image_AlienPixMap(); + Standard_Size aWidth = aPixMap->Width() * aRatio; + Standard_Size aHeigh = aPixMap->Height() * aRatio; + aSizedMap->InitTrash(aPixMap->Format(), aWidth, aHeigh); + for (Standard_Size i = 0; i < aWidth; i++) { + for (Standard_Size j = 0; j < aHeigh; j++) { + aSizedMap->SetPixelColor(int(i), int(j), aPixMap->PixelColor(i / aRatio, j / aRatio)); + } + } + aPixMap = aSizedMap; + } myIconsMap[iconName()] = aPixMap; return aPixMap; } // The icon for constraint is not found static const char aMsg[] = "Error! constraint images are not found"; - cout<SetColor(myCustomColor); } } @@ -185,7 +242,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()); @@ -198,7 +254,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); @@ -218,6 +274,8 @@ void SketcherPrs_SymbolPrs::Compute( const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode) { + if (!plane().get()) + return; // Create an icon prepareAspect(); @@ -231,7 +289,7 @@ void SketcherPrs_SymbolPrs::Compute( // 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()) { @@ -243,9 +301,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 @@ -254,16 +315,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); + 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, @@ -283,28 +344,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 = @@ -328,12 +405,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) @@ -344,7 +424,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); } } @@ -360,4 +440,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()); } -