X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=c09625924e83a1b377cf08caee693ce665b489b8;hb=656b2b25f58ce91c661437af3b35cb7e8da09f6a;hp=cc56f1abd88dd668a1cd44e1bb51a5198fff065d;hpb=2a180ef10197cde8d43ae2d08cc9e1e40bdbc1e5;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp index cc56f1abd..c09625924 100644 --- a/src/PartSet/PartSet_WidgetSketchLabel.cpp +++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp @@ -7,6 +7,7 @@ #include "PartSet_WidgetSketchLabel.h" #include "PartSet_Tools.h" #include "PartSet_Module.h" +#include "PartSet_PreviewPlanes.h" #include "SketchPlugin_SketchEntity.h" @@ -16,6 +17,7 @@ #include #include #include +#include #include #include @@ -31,6 +33,7 @@ #include #include #include +#include #include #include @@ -58,8 +61,7 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, ModuleBase_IWorkshop* theWorkshop, const Config_WidgetAPI* theData, const QMap& toShowConstraints) -: ModuleBase_WidgetValidated(theParent, theWorkshop, theData), - myPreviewDisplayed(false) +: ModuleBase_WidgetValidated(theParent, theWorkshop, theData) { QVBoxLayout* aLayout = new QVBoxLayout(this); ModuleBase_Tools::zeroMargins(aLayout); @@ -122,13 +124,15 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, myStackWidget->addWidget(aSecondWgt); //setLayout(aLayout); + + myPreviewPlanes = new PartSet_PreviewPlanes(); } PartSet_WidgetSketchLabel::~PartSet_WidgetSketchLabel() { } -bool PartSet_WidgetSketchLabel::setSelection(QList& theValues, +bool PartSet_WidgetSketchLabel::setSelection(QList& theValues, const bool theToValidate) { // do not use the given selection if the plane of the sketch has been already set. @@ -137,11 +141,10 @@ bool PartSet_WidgetSketchLabel::setSelection(QList& theVal if (plane().get()) return true; - ModuleBase_ViewerPrs aPrs = theValues.first(); - bool aDone = ModuleBase_WidgetValidated::setSelection(theValues, theToValidate); + ModuleBase_ViewerPrsPtr aPrs = theValues.first(); + bool aDone = setSelectionInternal(theValues, theToValidate); if (aDone) updateByPlaneSelected(aPrs); - return aDone; } @@ -154,13 +157,12 @@ QList PartSet_WidgetSketchLabel::getControls() const void PartSet_WidgetSketchLabel::onSelectionChanged() { - QList aSelected = getFilteredSelected(); + QList aSelected = getFilteredSelected(); if (aSelected.empty()) return; - ModuleBase_ViewerPrs aPrs = aSelected.first(); - - bool aDone = ModuleBase_WidgetValidated::setSelection(aSelected, false); + ModuleBase_ViewerPrsPtr aPrs = aSelected.first(); + bool aDone = setSelectionInternal(aSelected, false); if (aDone) { updateByPlaneSelected(aPrs); updateObject(myFeature); @@ -185,10 +187,11 @@ void PartSet_WidgetSketchLabel::onShowConstraint(bool theOn) emit showConstraintToggled(aState, theOn); } -void PartSet_WidgetSketchLabel::blockAttribute(const bool& theToBlock, bool& isFlushesActived, +void PartSet_WidgetSketchLabel::blockAttribute(const AttributePtr& theAttribute, + const bool& theToBlock, bool& isFlushesActived, bool& isAttributeSetInitializedBlocked) { - ModuleBase_WidgetValidated::blockAttribute(theToBlock, isFlushesActived, + ModuleBase_WidgetValidated::blockAttribute(theAttribute, theToBlock, isFlushesActived, isAttributeSetInitializedBlocked); // We do not restore the previous state of isAttributeSetInitializedBlocked for each of // attributes. It it is necessary, these states should be append to the method attributes @@ -206,12 +209,32 @@ void PartSet_WidgetSketchLabel::blockAttribute(const bool& theToBlock, bool& isF } } -void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs& thePrs) +bool PartSet_WidgetSketchLabel::setSelectionInternal(const QList& theValues, + const bool theToValidate) +{ + bool aDone = false; + if (theValues.empty()) { + // In order to make reselection possible, set empty object and shape should be done + setSelectionCustom(std::shared_ptr( + new ModuleBase_ViewerPrs(ObjectPtr(), GeomShapePtr(), NULL))); + aDone = false; + } + else { + // it removes the processed value from the parameters list + ModuleBase_ViewerPrsPtr aValue = theValues.first();//.takeFirst(); + if (!theToValidate || isValidInFilters(aValue)) + aDone = setSelectionCustom(aValue); + } + + return aDone; +} + +void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrsPtr& thePrs) { // 1. hide main planes if they have been displayed - erasePreviewPlanes(); + myPreviewPlanes->erasePreviewPlanes(myWorkshop); // 2. if the planes were displayed, change the view projection - const GeomShapePtr& aShape = thePrs.shape(); + const GeomShapePtr& aShape = thePrs->shape(); std::shared_ptr aGShape; std::shared_ptr aBaseShape; @@ -234,7 +257,8 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs } if (aGShape.get() != NULL) { // get plane parameters - std::shared_ptr aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape); + std::shared_ptr aFace(new GeomAPI_Face(aGShape)); + std::shared_ptr aPlane = GeomAlgoAPI_FaceBuilder::plane(aFace); std::shared_ptr aDir = aPlane->direction(); gp_XYZ aXYZ = aDir->impl().XYZ(); double aTwist = 0.0; @@ -258,13 +282,14 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs myStackWidget->setCurrentIndex(1); //myLabel->setText(""); //myLabel->setToolTip(""); - disconnect(workshop()->selector(), SIGNAL(selectionChanged()), + XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myWorkshop); + disconnect(aWorkshop->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); // 4. deactivate face selection filter activateFilters(false); // 5. Clear selection mode and define sketching mode - //XGUI_Displayer* aDisp = workshop()->displayer(); + //XGUI_Displayer* aDisp = aWorkshop->displayer(); //aDisp->closeLocalContexts(); emit planeSelected(plane()); // after the plane is selected in the sketch, the sketch selection should be activated @@ -273,7 +298,7 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs activateSelection(true); // 6. Update sketcher actions - XGUI_ActionsMgr* anActMgr = workshop()->actionsMgr(); + XGUI_ActionsMgr* anActMgr = aWorkshop->actionsMgr(); myWorkshop->updateCommandStatus(); myWorkshop->viewer()->update(); } @@ -295,14 +320,15 @@ void PartSet_WidgetSketchLabel::enableFocusProcessing() myStackWidget->installEventFilter(this); } -void PartSet_WidgetSketchLabel::storeAttributeValue() +void PartSet_WidgetSketchLabel::storeAttributeValue(const AttributePtr& theAttribute) { - ModuleBase_WidgetValidated::storeAttributeValue(); + ModuleBase_WidgetValidated::storeAttributeValue(theAttribute); } -void PartSet_WidgetSketchLabel::restoreAttributeValue(const bool theValid) +void PartSet_WidgetSketchLabel::restoreAttributeValue(const AttributePtr& theAttribute, + const bool theValid) { - ModuleBase_WidgetValidated::restoreAttributeValue(theValid); + ModuleBase_WidgetValidated::restoreAttributeValue(theAttribute, theValid); // it is not necessary to save the previous plane value because the plane is chosen once DataPtr aData = feature()->data(); @@ -315,17 +341,16 @@ void PartSet_WidgetSketchLabel::restoreAttributeValue(const bool theValid) } } -bool PartSet_WidgetSketchLabel::setSelectionCustom(const ModuleBase_ViewerPrs& thePrs) +bool PartSet_WidgetSketchLabel::setSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs) { return fillSketchPlaneBySelection(feature(), thePrs); } -#include -bool PartSet_WidgetSketchLabel::canFillSketch(const ModuleBase_ViewerPrs& thePrs) +bool PartSet_WidgetSketchLabel::canFillSketch(const ModuleBase_ViewerPrsPtr& thePrs) { bool aCanFillSketch = true; // avoid any selection on sketch object - ObjectPtr anObject = thePrs.object(); + ObjectPtr anObject = thePrs->object(); ResultPtr aResult = std::dynamic_pointer_cast(anObject); if (aResult.get()) { FeaturePtr aFeature = ModelAPI_Feature::feature(aResult); @@ -334,10 +359,15 @@ bool PartSet_WidgetSketchLabel::canFillSketch(const ModuleBase_ViewerPrs& thePrs } // check plane or planar face of any non-sketch object if (aCanFillSketch) { - const TopoDS_Shape aShape = thePrs.shape(); - if (aShape.ShapeType() == TopAbs_FACE) { - std::shared_ptr aGeomFace(new GeomAPI_Face()); - aGeomFace->setImpl(new TopoDS_Shape(aShape)); + std::shared_ptr aGeomFace; + + GeomShapePtr aGeomShape = thePrs->shape(); + if ((!aGeomShape.get() || aGeomShape->isNull()) && aResult.get()) { + aGeomShape = aResult->shape(); + } + + if (aGeomShape.get() && aGeomShape->shapeType() == GeomAPI_Shape::FACE) { + std::shared_ptr aGeomFace(new GeomAPI_Face(aGeomShape)); aCanFillSketch = aGeomFace.get() && aGeomFace->isPlanar(); } else @@ -347,20 +377,20 @@ bool PartSet_WidgetSketchLabel::canFillSketch(const ModuleBase_ViewerPrs& thePrs } bool PartSet_WidgetSketchLabel::fillSketchPlaneBySelection(const FeaturePtr& theFeature, - const ModuleBase_ViewerPrs& thePrs) + const ModuleBase_ViewerPrsPtr& thePrs) { bool isOwnerSet = false; - const GeomShapePtr& aShape = thePrs.shape(); + const GeomShapePtr& aShape = thePrs->shape(); std::shared_ptr aDir; - if (thePrs.object() && (theFeature != thePrs.object())) { + if (thePrs->object() && (theFeature != thePrs->object())) { DataPtr aData = theFeature->data(); AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID())); if (aSelAttr) { - ResultPtr aRes = std::dynamic_pointer_cast(thePrs.object()); + ResultPtr aRes = std::dynamic_pointer_cast(thePrs->object()); if (aRes) { GeomShapePtr aShapePtr(new GeomAPI_Shape()); if (!aShape.get() || aShape->isNull()) { // selection happens in the OCC viewer @@ -378,7 +408,7 @@ bool PartSet_WidgetSketchLabel::fillSketchPlaneBySelection(const FeaturePtr& the } else if (aShape.get() && !aShape->isNull()) { const TopoDS_Shape& aTDShape = aShape->impl(); - aDir = setSketchPlane(aTDShape); + aDir = setSketchPlane(theFeature, aTDShape); isOwnerSet = aDir.get(); } return isOwnerSet; @@ -394,36 +424,32 @@ void PartSet_WidgetSketchLabel::activateCustom() } myStackWidget->setCurrentIndex(0); - bool aBodyIsVisualized = false; - XGUI_Displayer* aDisp = workshop()->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; - } - } + bool aBodyIsVisualized = myPreviewPlanes->hasVisualizedBodies(myWorkshop); + + // Clear previous selection mode It is necessary for correct activation of preview planes + XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myWorkshop); + XGUI_Displayer* aDisp = aWorkshop->displayer(); + aDisp->activateObjects(QIntList(), aDisp->displayedObjects(), false); if (!aBodyIsVisualized) { // We have to select a plane before any operation - showPreviewPlanes(); + myPreviewPlanes->showPreviewPlanes(myWorkshop); } activateSelection(true); //myLabel->setText(myText); //myLabel->setToolTip(myTooltip); - connect(workshop()->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); + connect(XGUI_Tools::workshop(myWorkshop)->selector(), SIGNAL(selectionChanged()), + this, SLOT(onSelectionChanged())); activateFilters(true); } void PartSet_WidgetSketchLabel::deactivate() { ModuleBase_ModelWidget::deactivate(); - bool aHidePreview = myPreviewDisplayed; - erasePreviewPlanes(); + bool aHidePreview = myPreviewPlanes->isPreviewDisplayed(); + myPreviewPlanes->erasePreviewPlanes(myWorkshop); activateSelection(false); activateFilters(false); @@ -448,66 +474,6 @@ void PartSet_WidgetSketchLabel::activateSelection(bool toActivate) } } -void PartSet_WidgetSketchLabel::erasePreviewPlanes() -{ - if (myPreviewDisplayed) { - XGUI_Displayer* aDisp = workshop()->displayer(); - aDisp->eraseAIS(myYZPlane, false); - aDisp->eraseAIS(myXZPlane, false); - aDisp->eraseAIS(myXYPlane, false); - myPreviewDisplayed = false; - } -} - -void PartSet_WidgetSketchLabel::showPreviewPlanes() -{ - if (myPreviewDisplayed) - return; - - if (!myYZPlane) { // If planes are not created - // Create Preview - std::shared_ptr anOrigin(new GeomAPI_Pnt(0, 0, 0)); - std::shared_ptr aYZDir(new GeomAPI_Dir(1, 0, 0)); - // -1, not 1 for correct internal sketch coords (issue 898) - std::shared_ptr aXZDir(new GeomAPI_Dir(0, -1, 0)); - std::shared_ptr aXYDir(new GeomAPI_Dir(0, 0, 1)); - - 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); - myXYPlane = createPreviewPlane(anOrigin, aXYDir, aB); - } - XGUI_Displayer* aDisp = workshop()->displayer(); - aDisp->displayAIS(myYZPlane, true, false); - aDisp->displayAIS(myXZPlane, true, false); - aDisp->displayAIS(myXYPlane, true, false); - myPreviewDisplayed = true; -} - - -AISObjectPtr PartSet_WidgetSketchLabel::createPreviewPlane(std::shared_ptr theOrigin, - std::shared_ptr theNorm, - const int theRGB[3]) -{ - 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); - aAIS->setWidth(Config_PropManager::integer("Sketch planes", "planes_thickness", SKETCH_WIDTH)); - aAIS->setColor(theRGB[0], theRGB[1], theRGB[2]); - return aAIS; -} - std::shared_ptr PartSet_WidgetSketchLabel::setSketchPlane(const FeaturePtr& theFeature, const TopoDS_Shape& theShape) @@ -522,7 +488,8 @@ std::shared_ptr PartSet_WidgetSketchLabel::setSketchPlane(const Fea // get plane parameters - std::shared_ptr aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape); + std::shared_ptr aFace(new GeomAPI_Face(aGShape)); + std::shared_ptr aPlane = GeomAlgoAPI_FaceBuilder::plane(aFace); if (!aPlane.get()) return std::shared_ptr(); @@ -558,13 +525,6 @@ std::shared_ptr PartSet_WidgetSketchLabel::setSketchPlane(const Fea return aDir; } -XGUI_Workshop* PartSet_WidgetSketchLabel::workshop() const -{ - XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); - return aConnector->workshop(); -} - - void PartSet_WidgetSketchLabel::onSetPlaneView() { std::shared_ptr aPlane = plane();