X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_SymbolPrs.cpp;h=0d156d22b856eba92ce150bc36fd11a5b1e08362;hb=refs%2Fheads%2FV9_11_BR;hp=9e91f3ff4e2214738025091df3793a5ce1e19f6f;hpb=08f1aef6629e6a63cc4671d271ded4de6e826948;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp b/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp index 9e91f3ff4..0d156d22b 100644 --- a/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp +++ b/src/SketcherPrs/SketcherPrs_SymbolPrs.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2023 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -12,10 +12,9 @@ // // 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 +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "SketcherPrs_SymbolPrs.h" @@ -59,7 +58,7 @@ #endif /// Step between icons -static const double MyDist = 0.02; +static const double MyDist = 0.015; //************************************************************** @@ -99,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); } @@ -119,11 +118,11 @@ std::map SketcherPrs_SymbolPrs::myIconsM SketcherPrs_SymbolPrs::SketcherPrs_SymbolPrs(ModelAPI_Feature* theConstraint, - ModelAPI_CompositeFeature* theSketcher, - const std::shared_ptr& thePlane) - : AIS_InteractiveObject(), myConstraint(theConstraint), - myPlane(thePlane), myIsCustomColor(false), - mySketcher(theSketcher) + SketchPlugin_Sketch* theSketcher) + : AIS_InteractiveObject(), + myConstraint(theConstraint), + mySketcher(theSketcher), + myIsCustomColor(false) { SetAutoHilight(Standard_False); } @@ -170,7 +169,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"; } @@ -179,12 +178,26 @@ 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(int(i / aRatio), int(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< aPnt1 = aEdge->firstPoint(); std::shared_ptr aPnt2 = aEdge->lastPoint(); - gp_Pnt aP1 = aPnt1->impl(); - gp_Pnt aP2 = aPnt2->impl(); // Draw line by two points Handle(Graphic3d_ArrayOfSegments) aLines = new Graphic3d_ArrayOfSegments(2, 1); @@ -229,7 +240,7 @@ void SketcherPrs_SymbolPrs::addLine(const Handle(Graphic3d_Group)& theGroup, //********************************************************************************* void SketcherPrs_SymbolPrs::HilightSelected(const Handle(PrsMgr_PresentationManager3d)& thePM, - const SelectMgr_SequenceOfOwner& theOwners) + const SelectMgr_SequenceOfOwner& /*theOwners*/) { Handle( Prs3d_Presentation ) aSelectionPrs = GetSelectPresentation( thePM ); aSelectionPrs->Clear(); @@ -243,8 +254,8 @@ void SketcherPrs_SymbolPrs::HilightSelected(const Handle(PrsMgr_PresentationMana //********************************************************************************* void SketcherPrs_SymbolPrs::HilightOwnerWithColor( const Handle(PrsMgr_PresentationManager3d)& thePM, - const Handle(Graphic3d_HighlightStyle)& theStyle, - const Handle(SelectMgr_EntityOwner)& theOwner) + const Handle(Prs3d_Drawer)& theStyle, + const Handle(SelectMgr_EntityOwner)& /*theOwner*/) { thePM->Color(this, theStyle); @@ -259,10 +270,12 @@ void SketcherPrs_SymbolPrs::HilightOwnerWithColor( //********************************************************************************* void SketcherPrs_SymbolPrs::Compute( - const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + const Handle(PrsMgr_PresentationManager3d)& /*thePresentationManager*/, const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode) + const Standard_Integer /*theMode*/) { + if (!plane().get()) + return; // Create an icon prepareAspect(); @@ -342,6 +355,18 @@ 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(); + } + } } //********************************************************************************* @@ -349,8 +374,6 @@ void SketcherPrs_SymbolPrs::drawShape(const std::shared_ptr& theS const Handle(Prs3d_Presentation)& thePrs, Quantity_Color theColor) const { - int aColNam = theColor.Name(); - //cout<<"### SketcherPrs_SymbolPrs::drawShape "<