X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_SymbolPrs.cpp;h=5f79c5fbaec5d90b5dca3abe513ef441be0c4bf3;hb=ea593bc59e7e9461f6c4e2afd3f24d621edb1011;hp=ac03445a047a2015d089ae26d087bc84f16b8db2;hpb=0bb80500c3d6c9121980867067f2342ca92478fa;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp b/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp index ac03445a0..5f79c5fba 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; //************************************************************** @@ -82,7 +98,7 @@ public: // Update selection position only if there is no selected object // because it can corrupt selection of other objects - if ((myContext->NbCurrents() == 0) && (myContext->NbSelected() == 0)) { + if (myContext->NbSelected() == 0) { myContext->MainSelector()->RebuildSensitivesTree(myObj); myContext->MainSelector()->RebuildObjectsTree (false); } @@ -102,8 +118,10 @@ std::map SketcherPrs_SymbolPrs::myIconsM SketcherPrs_SymbolPrs::SketcherPrs_SymbolPrs(ModelAPI_Feature* theConstraint, - const std::shared_ptr& thePlane) - : AIS_InteractiveObject(), myConstraint(theConstraint), myPlane(thePlane), myIsCustomColor(false) + SketchPlugin_Sketch* theSketcher) + : AIS_InteractiveObject(), myConstraint(theConstraint), + myIsCustomColor(false), + mySketcher(theSketcher) { SetAutoHilight(Standard_False); } @@ -114,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 @@ -133,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"; } @@ -142,6 +177,19 @@ 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(i, j, aPixMap->PixelColor(i / aRatio, j / aRatio)); + } + } + aPixMap = aSizedMap; + } myIconsMap[iconName()] = aPixMap; return aPixMap; } @@ -194,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()); @@ -207,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); @@ -227,6 +274,8 @@ void SketcherPrs_SymbolPrs::Compute( const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode) { + if (!plane().get()) + return; // Create an icon prepareAspect(); @@ -256,7 +305,8 @@ void SketcherPrs_SymbolPrs::Compute( myPntArray->SetVertexColor(i, myCustomColor); } - Handle(OpenGl_Group) aGroup = Handle(OpenGl_Group)::DownCast(Prs3d_Root::CurrentGroup (thePresentation)); + Handle(OpenGl_Group) aGroup = + Handle(OpenGl_Group)::DownCast(Prs3d_Root::CurrentGroup (thePresentation)); aGroup->SetPrimitivesAspect(myAspect); // Recompute boundary box of the group @@ -305,12 +355,33 @@ void SketcherPrs_SymbolPrs::SetCustomColor(const std::vector& theColor) 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 = @@ -334,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) @@ -350,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); } } @@ -366,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()); } -