X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=96435f627a95826200c5ed20017793ba04989e46;hb=0b503091623876eda1ae9214e32f8831ef03778b;hp=37cd834450a68835ba3a0c0d22f29c88fa037067;hpb=9ef2d81a8b97eee85d6506d95f2481fe7fae1e56;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp index 37cd83445..96435f627 100644 --- a/src/PartSet/PartSet_WidgetSketchLabel.cpp +++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp @@ -1,3 +1,5 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + // File: PartSet_WidgetSketchLabel.cpp // Created: 07 July 2014 // Author: Vitaly SMETANNIKOV @@ -5,6 +7,8 @@ #include "PartSet_WidgetSketchLabel.h" #include "PartSet_Tools.h" +#include "SketchPlugin_SketchEntity.h" + #include #include #include @@ -14,6 +18,7 @@ #include #include +#include #include #include @@ -33,15 +38,17 @@ #include #include - -#define PLANE_SIZE "200" -#define SKETCH_WIDTH "4" +#include +#include +#include PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, const Config_WidgetAPI* theData, const std::string& theParentId) - : ModuleBase_ModelWidget(theParent, theData, theParentId), myPreviewDisplayed(false) + : ModuleBase_ModelWidget(theParent, theData, theParentId), + myPreviewDisplayed(false), + myWorkshop(NULL) { myText = QString::fromStdString(theData->getProperty("title")); myLabel = new QLabel("", theParent); @@ -49,6 +56,15 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, myTooltip = QString::fromStdString(theData->getProperty("tooltip")); myLabel->setToolTip(""); myLabel->setIndent(5); + + mySelectionTimer = new QTimer(this); + connect(mySelectionTimer, SIGNAL(timeout()), SLOT(setSketchingMode())); + mySelectionTimer->setSingleShot(true); + + QVBoxLayout* aLayout = new QVBoxLayout(this); + ModuleBase_Tools::zeroMargins(aLayout); + aLayout->addWidget(myLabel); + setLayout(aLayout); } PartSet_WidgetSketchLabel::~PartSet_WidgetSketchLabel() @@ -58,12 +74,9 @@ PartSet_WidgetSketchLabel::~PartSet_WidgetSketchLabel() QList PartSet_WidgetSketchLabel::getControls() const { - return QList(); -} - -QWidget* PartSet_WidgetSketchLabel::getControl() const -{ - return myLabel; + QList aResult; + aResult << myLabel; + return aResult; } void PartSet_WidgetSketchLabel::onPlaneSelected() @@ -82,7 +95,7 @@ void PartSet_WidgetSketchLabel::onPlaneSelected() DataPtr aData = feature()->data(); AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast - (aData->attribute(SketchPlugin_Feature::EXTERNAL_ID())); + (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID())); if (aSelAttr) { ResultPtr aRes = std::dynamic_pointer_cast(aPrs.object()); if (aRes) { @@ -102,14 +115,15 @@ void PartSet_WidgetSketchLabel::onPlaneSelected() // Clear selection mode and define sketching mode XGUI_Displayer* aDisp = myWorkshop->displayer(); - aDisp->removeSelectionFilter(myPlaneFilter); - aDisp->closeLocalContexts(); + aDisp->removeSelectionFilter(myFaceFilter); + //aDisp->closeLocalContexts(); emit planeSelected(plane()); setSketchingMode(); // Update sketcher actions XGUI_ActionsMgr* anActMgr = myWorkshop->actionsMgr(); anActMgr->update(); + myWorkshop->viewer()->update(); } } } @@ -122,24 +136,37 @@ std::shared_ptr PartSet_WidgetSketchLabel::plane() const } -void PartSet_WidgetSketchLabel::activate() +bool PartSet_WidgetSketchLabel::focusTo() +{ + myLabel->setFocus(); + return true; +} + +void PartSet_WidgetSketchLabel::enableFocusProcessing() +{ + myLabel->installEventFilter(this); +} + +void PartSet_WidgetSketchLabel::activateCustom() { std::shared_ptr aPlane = plane(); if (aPlane) { - setSketchingMode(); + //setSketchingMode(); + // In order to avoid Opening/Closing of context too often + mySelectionTimer->start(20); } else { // We have to select a plane before any operation showPreviewPlanes(); XGUI_Displayer* aDisp = myWorkshop->displayer(); - aDisp->openLocalContext(); - aDisp->activateObjectsOutOfContext(QIntList()); - if (myPlaneFilter.IsNull()) - myPlaneFilter = new StdSelect_FaceFilter(StdSelect_Plane); - aDisp->addSelectionFilter(myPlaneFilter); + //aDisp->openLocalContext(); + //aDisp->activateObjects(QIntList()); + if (myFaceFilter.IsNull()) + myFaceFilter = new StdSelect_FaceFilter(StdSelect_Plane); + aDisp->addSelectionFilter(myFaceFilter); QIntList aModes; aModes << TopAbs_FACE; - aDisp->setSelectionModes(aModes); + aDisp->activateObjects(aModes); myLabel->setText(myText); myLabel->setToolTip(myTooltip); @@ -151,11 +178,12 @@ void PartSet_WidgetSketchLabel::activate() void PartSet_WidgetSketchLabel::deactivate() { - + // Do not set selection mode if the widget was activated for a small moment + mySelectionTimer->stop(); XGUI_Displayer* aDisp = myWorkshop->displayer(); - aDisp->removeSelectionFilter(myPlaneFilter); + aDisp->removeSelectionFilter(myFaceFilter); //aDisp->removeSelectionFilter(mySketchFilter); - aDisp->closeLocalContexts(); + //aDisp->closeLocalContexts(); erasePreviewPlanes(); } @@ -182,9 +210,16 @@ void PartSet_WidgetSketchLabel::showPreviewPlanes() std::shared_ptr aXZDir(new GeomAPI_Dir(0, 1, 0)); std::shared_ptr aXYDir(new GeomAPI_Dir(0, 0, 1)); - int aR[] = {255, 0, 0}; - int aG[] = {0, 255, 0}; - int aB[] = {0, 0, 255}; + std::vector aYZRGB, aXZRGB, aXYRGB; + aYZRGB = Config_PropManager::color("Visualization", "yz_plane_color", + YZ_PLANE_COLOR); + aXZRGB = Config_PropManager::color("Visualization", "xz_plane_color", + XZ_PLANE_COLOR); + aXYRGB = Config_PropManager::color("Visualization", "xy_plane_color", + XY_PLANE_COLOR); + int aR[] = {aYZRGB[0], aYZRGB[1], aYZRGB[2]}; + int aG[] = {aXZRGB[0], aXZRGB[1], aXZRGB[2]}; + int aB[] = {aXYRGB[0], aXYRGB[1], aXYRGB[2]}; myYZPlane = createPreviewPlane(anOrigin, aYZDir, aR); myXZPlane = createPreviewPlane(anOrigin, aXZDir, aG); @@ -202,7 +237,7 @@ AISObjectPtr PartSet_WidgetSketchLabel::createPreviewPlane(std::shared_ptr theNorm, const int theRGB[3]) { - double aSize = Config_PropManager::integer("Sketch planes", "Size of planes", PLANE_SIZE); + double aSize = Config_PropManager::integer("Sketch planes", "planes_size", PLANE_SIZE); std::shared_ptr aFace = GeomAlgoAPI_FaceBuilder::square(theOrigin, theNorm, aSize); AISObjectPtr aAIS = AISObjectPtr(new GeomAPI_AISObject()); aAIS->createShape(aFace); @@ -263,25 +298,16 @@ std::shared_ptr PartSet_WidgetSketchLabel::setSketchPlane(const Top void PartSet_WidgetSketchLabel::setSketchingMode() { XGUI_Displayer* aDisp = myWorkshop->displayer(); - QIntList aModes; // Clear standard selection modes if they are defined - aDisp->setSelectionModes(aModes); - aDisp->openLocalContext(); - - // Set filter - std::shared_ptr aPlane = plane(); - double aA, aB, aC, aD; - aPlane->coefficients(aA, aB, aC, aD); - gp_Pln aPln(aA, aB, aC, aD); - // No selection of external objects - //mySketchFilter = new ModuleBase_ShapeInPlaneFilter(aPln); - //aDisp->addSelectionFilter(mySketchFilter); + //aDisp->activateObjects(aModes); + //aDisp->openLocalContext(); // Get default selection modes + QIntList aModes; aModes.append(AIS_DSM_Text); aModes.append(AIS_DSM_Line); aModes.append(AIS_Shape::SelectionMode((TopAbs_ShapeEnum) TopAbs_VERTEX)); aModes.append(AIS_Shape::SelectionMode((TopAbs_ShapeEnum) TopAbs_EDGE)); - aDisp->activateObjectsOutOfContext(aModes); + aDisp->activateObjects(aModes); }