-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// 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
//
// 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<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "SketcherPrs_SymbolPrs.h"
#include <GeomAPI_Vertex.h>
#include <GeomAPI_Curve.h>
+#include <ModelAPI_Tools.h>
+
#include <Events_InfoMessage.h>
#include <Graphic3d_ArrayOfSegments.hxx>
#endif
/// Step between icons
-static const double MyDist = 0.02;
+static const double MyDist = 0.015;
//**************************************************************
// 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);
}
SketcherPrs_SymbolPrs::SketcherPrs_SymbolPrs(ModelAPI_Feature* theConstraint,
- const std::shared_ptr<GeomAPI_Ax3>& thePlane)
- : AIS_InteractiveObject(), myConstraint(theConstraint), myPlane(thePlane), myIsCustomColor(false)
+ SketchPlugin_Sketch* theSketcher)
+ : AIS_InteractiveObject(), myConstraint(theConstraint),
+ myIsCustomColor(false),
+ mySketcher(theSketcher)
{
SetAutoHilight(Standard_False);
}
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";
}
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;
}
//*********************************************************************************
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);
const Handle(Prs3d_Presentation)& thePresentation,
const Standard_Integer theMode)
{
+ if (!plane().get())
+ return;
// Create an icon
prepareAspect();
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();
+ }
+ }
}
//*********************************************************************************
const Handle(Prs3d_Presentation)& thePrs,
Quantity_Color theColor) const
{
- int aColNam = theColor.Name();
- //cout<<"### SketcherPrs_SymbolPrs::drawShape "<<theColor.Name()<<endl;
Handle(Graphic3d_AspectLine3d) aLineAspect =
new Graphic3d_AspectLine3d(theColor, Aspect_TOL_SOLID, 2);
theBndBox.Update (aTmpBox.CornerMin().x(), aTmpBox.CornerMin().y(), aTmpBox.CornerMin().z(),
aTmpBox.CornerMax().x(), aTmpBox.CornerMax().y(), aTmpBox.CornerMax().z());
}
-