X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=c2ca8a4d2d863cefb118caf7f7dd05e92a5cb639;hb=4b1f76b455140cae5d18319b62627af3ba28f226;hp=def4e042e0e30b19c833cf5a2c6c40d577d184c5;hpb=976244bad37e04fcebaf8866d7d7a02efd2b7d35;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp index def4e042e..c2ca8a4d2 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,14 +7,22 @@ #include "PartSet_WidgetSketchLabel.h" #include "PartSet_Tools.h" +#include "SketchPlugin_SketchEntity.h" + #include #include #include #include #include +#include #include #include +#include +#include + +#include +#include #include #include @@ -20,6 +30,7 @@ #include #include +#include #include #include @@ -32,15 +43,19 @@ #include #include - -#define PLANE_SIZE "200" -#define SKETCH_WIDTH "4" +//#include +#include +#include +#include PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, const Config_WidgetAPI* theData, - const std::string& theParentId) - : ModuleBase_ModelWidget(theParent, theData, theParentId), myPreviewDisplayed(false) + const std::string& theParentId, + bool toShowConstraints) + : ModuleBase_WidgetValidated(theParent, theData, theParentId), + myPreviewDisplayed(false), + myWorkshop(NULL) { myText = QString::fromStdString(theData->getProperty("title")); myLabel = new QLabel("", theParent); @@ -48,6 +63,21 @@ 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); + + myShowConstraints = new QCheckBox(tr("Show constraints"), this); + aLayout->addWidget(myShowConstraints); + + setLayout(aLayout); + connect(myShowConstraints, SIGNAL(toggled(bool)), this, SIGNAL(showConstraintToggled(bool))); + myShowConstraints->setChecked(toShowConstraints); } PartSet_WidgetSketchLabel::~PartSet_WidgetSketchLabel() @@ -55,58 +85,79 @@ PartSet_WidgetSketchLabel::~PartSet_WidgetSketchLabel() erasePreviewPlanes(); } -QList PartSet_WidgetSketchLabel::getControls() const +bool PartSet_WidgetSketchLabel::setSelection(const QList& theValues, int& thePosition) { - return QList(); + // do not use the given selection if the plane of the sketch has been already set. + // If this check is absent, a selected plane in the viewer can be set in the sketch + // even if the sketch is built on another plane. + if (plane().get()) + return true; + + return ModuleBase_WidgetValidated::setSelection(theValues, thePosition); } -QWidget* PartSet_WidgetSketchLabel::getControl() const +QList PartSet_WidgetSketchLabel::getControls() const { - return myLabel; + QList aResult; + aResult << myLabel; + return aResult; } -void PartSet_WidgetSketchLabel::onPlaneSelected() +void PartSet_WidgetSketchLabel::onSelectionChanged() { - XGUI_Selection* aSelection = myWorkshop->selector()->selection(); - QList aSelected = aSelection->getSelected(); - if (!aSelected.empty()) { - ModuleBase_ViewerPrs aPrs = aSelected.first(); - TopoDS_Shape aShape = aPrs.shape(); - if (!aShape.IsNull()) { - std::shared_ptr aDir = setSketchPlane(aShape); - if (aDir) { - erasePreviewPlanes(); - - if (aPrs.object() && (feature() != aPrs.object())) { - DataPtr aData = feature()->data(); - AttributeSelectionPtr aSelAttr = - std::dynamic_pointer_cast - (aData->attribute(SketchPlugin_Feature::EXTERNAL_ID())); - if (aSelAttr) { - ResultPtr aRes = std::dynamic_pointer_cast(aPrs.object()); - if (aRes) { - GeomShapePtr aShapePtr(new GeomAPI_Shape()); - aShapePtr->setImpl(new TopoDS_Shape(aShape)); - aSelAttr->setValue(aRes, aShapePtr); - } - } - } else - myWorkshop->viewer()->setViewProjection(aDir->x(), aDir->y(), aDir->z()); - - // Clear text in the label - myLabel->setText(""); - myLabel->setToolTip(""); - disconnect(myWorkshop->selector(), SIGNAL(selectionChanged()), - this, SLOT(onPlaneSelected())); - - // Clear selection mode and define sketching mode - XGUI_Displayer* aDisp = myWorkshop->displayer(); - aDisp->removeSelectionFilter(myPlaneFilter); - aDisp->closeLocalContexts(); - setSketchingMode(); - } + QList aSelectedPrs = getSelectedEntitiesOrObjects( + myWorkshop->selector()->selection()); + if (aSelectedPrs.empty()) + return; + ModuleBase_ViewerPrs aPrs = aSelectedPrs.first(); + if (aPrs.isEmpty() || !isValidSelection(aPrs)) + return; + + // 2. set the selection to sketch + setSelectionCustom(aPrs); + // 3. hide main planes if they have been displayed + erasePreviewPlanes(); + // 4. if the planes were displayed, change the view projection + TopoDS_Shape aShape = aPrs.shape(); + std::shared_ptr aGShape; + // selection happens in OCC viewer + if (!aShape.IsNull()) { + aGShape = std::shared_ptr(new GeomAPI_Shape); + aGShape->setImpl(new TopoDS_Shape(aShape)); + } + else { // selection happens in OCC viewer(on body) of in the OB browser + DataPtr aData = feature()->data(); + AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast + (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID())); + if (aSelAttr) { + aGShape = aSelAttr->value(); } } + if (aGShape.get() != NULL) { + // get plane parameters + std::shared_ptr aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape); + std::shared_ptr aDir = aPlane->direction(); + + myWorkshop->viewer()->setViewProjection(aDir->x(), aDir->y(), aDir->z()); + } + // 5. Clear text in the label + myLabel->setText(""); + myLabel->setToolTip(""); + disconnect(myWorkshop->selector(), SIGNAL(selectionChanged()), + this, SLOT(onSelectionChanged())); + // 6. deactivate face selection filter + activateFilters(myWorkshop->module()->workshop(), false); + + // 7. Clear selection mode and define sketching mode + //XGUI_Displayer* aDisp = myWorkshop->displayer(); + //aDisp->closeLocalContexts(); + emit planeSelected(plane()); + //setSketchingMode(); + + // 8. Update sketcher actions + XGUI_ActionsMgr* anActMgr = myWorkshop->actionsMgr(); + anActMgr->update(); + myWorkshop->viewer()->update(); } std::shared_ptr PartSet_WidgetSketchLabel::plane() const @@ -116,41 +167,113 @@ 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::storeAttributeValue() +{ +} + +void PartSet_WidgetSketchLabel::restoreAttributeValue(const bool theValid) +{ + // it is not necessary to save the previous plane value because the plane is chosen once + DataPtr aData = feature()->data(); + AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast + (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID())); + if (aSelAttr) { + ResultPtr anEmptyResult; + GeomShapePtr anEmptyShape; + aSelAttr->setValue(anEmptyResult, anEmptyShape); + } +} + +bool PartSet_WidgetSketchLabel::setSelectionCustom(const ModuleBase_ViewerPrs& thePrs) +{ + bool isOwnerSet = false; + + const TopoDS_Shape& aShape = thePrs.shape(); + std::shared_ptr aDir; + + if (thePrs.object() && (feature() != thePrs.object())) { + DataPtr aData = feature()->data(); + AttributeSelectionPtr aSelAttr = + std::dynamic_pointer_cast + (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID())); + if (aSelAttr) { + ResultPtr aRes = std::dynamic_pointer_cast(thePrs.object()); + if (aRes) { + GeomShapePtr aShapePtr(new GeomAPI_Shape()); + if (aShape.IsNull()) { // selection happens in the OCC viewer + aShapePtr = ModelAPI_Tools::shape(aRes); + } + else { // selection happens in OB browser + aShapePtr->setImpl(new TopoDS_Shape(aShape)); + } + if (aShapePtr.get() != NULL) { + aSelAttr->setValue(aRes, aShapePtr); + isOwnerSet = true; + } + } + } + } + else if (!aShape.IsNull()) { + aDir = setSketchPlane(aShape); + isOwnerSet = aDir; + } + return isOwnerSet; +} + +void PartSet_WidgetSketchLabel::activateCustom() { std::shared_ptr aPlane = plane(); - if (aPlane) { - setSketchingMode(); - } else { + if (aPlane.get()) + return; + + bool aBodyIsVisualized = false; + XGUI_Displayer* aDisp = myWorkshop->displayer(); + QObjectPtrList aDisplayed = aDisp->displayedObjects(); + foreach (ObjectPtr anObj, aDisplayed) { + ResultPtr aResult = std::dynamic_pointer_cast(anObj); + if (aResult.get() != NULL) { + aBodyIsVisualized = aResult->groupName() == ModelAPI_ResultBody::group(); + if (aBodyIsVisualized) + break; + } + } + + if (!aBodyIsVisualized) { // 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); - QIntList aModes; - aModes << TopAbs_FACE; - aDisp->setSelectionModes(aModes); - - myLabel->setText(myText); - myLabel->setToolTip(myTooltip); - - connect(myWorkshop->selector(), SIGNAL(selectionChanged()), this, SLOT(onPlaneSelected())); - aDisp->updateViewer(); } + QIntList aModes; + aModes << TopAbs_FACE; + aDisp->activateObjects(aModes); + + myLabel->setText(myText); + myLabel->setToolTip(myTooltip); + + connect(myWorkshop->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); + activateFilters(myWorkshop->module()->workshop(), true); + + aDisp->updateViewer(); } void PartSet_WidgetSketchLabel::deactivate() { - - XGUI_Displayer* aDisp = myWorkshop->displayer(); - aDisp->removeSelectionFilter(myPlaneFilter); - //aDisp->removeSelectionFilter(mySketchFilter); - aDisp->closeLocalContexts(); + // Do not set selection mode if the widget was activated for a small moment + //mySelectionTimer->stop(); + //XGUI_Displayer* aDisp = myWorkshop->displayer(); + //aDisp->closeLocalContexts(); erasePreviewPlanes(); + activateFilters(myWorkshop->module()->workshop(), false); } void PartSet_WidgetSketchLabel::erasePreviewPlanes() @@ -176,9 +299,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); @@ -196,7 +326,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); @@ -246,36 +376,32 @@ std::shared_ptr PartSet_WidgetSketchLabel::setSketchPlane(const Top std::shared_ptr aDirX = std::dynamic_pointer_cast( aData->attribute(SketchPlugin_Sketch::DIRX_ID())); aDirX->setValue(aXDir); - std::shared_ptr aDirY = std::dynamic_pointer_cast( - aData->attribute(SketchPlugin_Sketch::DIRY_ID())); - aDirY->setValue(aYDir); std::shared_ptr aDir = aPlane->direction(); return aDir; } -void PartSet_WidgetSketchLabel::setSketchingMode() +/*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 - aModes.append(AIS_DSM_Text); - aModes.append(AIS_DSM_Line); + + QIntList aModes; + aModes.append(SketcherPrs_Tools::Sel_Dimension_Text); + aModes.append(SketcherPrs_Tools::Sel_Dimension_Line); + aModes.append(SketcherPrs_Tools::Sel_Constraint); aModes.append(AIS_Shape::SelectionMode((TopAbs_ShapeEnum) TopAbs_VERTEX)); aModes.append(AIS_Shape::SelectionMode((TopAbs_ShapeEnum) TopAbs_EDGE)); - aDisp->activateObjectsOutOfContext(aModes); + aDisp->activateObjects(aModes); +}*/ + +void PartSet_WidgetSketchLabel::showConstraints(bool theOn) +{ + myShowConstraints->setChecked(theOn); + emit showConstraintToggled(theOn); }