X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=e4df553d7cbe92289ce95475453f4205dde148df;hb=f39b615e10f48ab13b8346c1e0b4c64500d44f51;hp=e72f1bff547f1bbc19fd3cb83865c795077cfff1;hpb=a94eeab620f6c2a559f5fea9b7d638423d010e62;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp index e72f1bff5..e4df553d7 100644 --- a/src/PartSet/PartSet_WidgetSketchLabel.cpp +++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -50,12 +51,12 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, + ModuleBase_IWorkshop* theWorkshop, const Config_WidgetAPI* theData, const std::string& theParentId, bool toShowConstraints) - : ModuleBase_WidgetValidated(theParent, theData, theParentId), - myPreviewDisplayed(false), - myWorkshop(NULL) +: ModuleBase_WidgetValidated(theParent, theWorkshop, theData, theParentId), + myPreviewDisplayed(false) { myText = QString::fromStdString(theData->getProperty("title")); myLabel = new QLabel("", theParent); @@ -78,10 +79,10 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, PartSet_WidgetSketchLabel::~PartSet_WidgetSketchLabel() { - erasePreviewPlanes(); } -bool PartSet_WidgetSketchLabel::setSelection(const QList& theValues, int& thePosition) +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. // If this check is absent, a selected plane in the viewer can be set in the sketch @@ -89,7 +90,12 @@ bool PartSet_WidgetSketchLabel::setSelection(const QList& if (plane().get()) return true; - return ModuleBase_WidgetValidated::setSelection(theValues, thePosition); + ModuleBase_ViewerPrs aPrs = theValues.first(); + bool aDone = ModuleBase_WidgetValidated::setSelection(theValues, theToValidate); + if (aDone) + updateByPlaneSelected(aPrs); + + return aDone; } QList PartSet_WidgetSketchLabel::getControls() const @@ -101,30 +107,42 @@ QList PartSet_WidgetSketchLabel::getControls() const void PartSet_WidgetSketchLabel::onSelectionChanged() { - QList aSelectedPrs = myWorkshop->selector()->selection()->getSelected( - ModuleBase_ISelection::AllControls); - if (aSelectedPrs.empty()) - return; - ModuleBase_ViewerPrs aPrs = aSelectedPrs.first(); - if (aPrs.isEmpty() || !isValidSelection(aPrs)) + QList aSelected = getFilteredSelected(); + + if (aSelected.empty()) return; + ModuleBase_ViewerPrs aPrs = aSelected.first(); - // 2. set the selection to sketch - setSelectionCustom(aPrs); - // 3. hide main planes if they have been displayed + bool aDone = ModuleBase_WidgetValidated::setSelection(aSelected, false); + if (aDone) { + updateByPlaneSelected(aPrs); + updateObject(myFeature); + } +} + +void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs& thePrs) +{ + // 1. hide main planes if they have been displayed erasePreviewPlanes(); - // 4. if the planes were displayed, change the view projection - TopoDS_Shape aShape = aPrs.shape(); + // 2. if the planes were displayed, change the view projection + TopoDS_Shape aShape = thePrs.shape(); std::shared_ptr aGShape; + std::shared_ptr aBaseShape; + + DataPtr aData = feature()->data(); + AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast + (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID())); + // selection happens in OCC viewer if (!aShape.IsNull()) { - aGShape = std::shared_ptr(new GeomAPI_Shape); + aGShape = std::shared_ptr(new GeomAPI_Shape()); aGShape->setImpl(new TopoDS_Shape(aShape)); + + if (aSelAttr && aSelAttr->context()) { + aBaseShape = aSelAttr->context()->shape(); + } } 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(); } @@ -133,19 +151,26 @@ void PartSet_WidgetSketchLabel::onSelectionChanged() // get plane parameters std::shared_ptr aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape); std::shared_ptr aDir = aPlane->direction(); + gp_XYZ aXYZ = aDir->impl().XYZ(); + double aTwist = 0.0; + + // orienting projection is not needed: it is done in GeomAlgoAPI_FaceBuilder::plane + /*if (aGShape->impl().Orientation() == TopAbs_REVERSED) { + aXYZ.Reverse(); + }*/ - myWorkshop->viewer()->setViewProjection(aDir->x(), aDir->y(), aDir->z()); + myWorkshop->viewer()->setViewProjection(aXYZ.X(), aXYZ.Y(), aXYZ.Z(), aTwist); } - // 5. Clear text in the label + // 3. Clear text in the label myLabel->setText(""); myLabel->setToolTip(""); - disconnect(myWorkshop->selector(), SIGNAL(selectionChanged()), + disconnect(workshop()->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); - // 6. deactivate face selection filter - activateFilters(myWorkshop->module()->workshop(), false); + // 4. deactivate face selection filter + activateFilters(false); - // 7. Clear selection mode and define sketching mode - //XGUI_Displayer* aDisp = myWorkshop->displayer(); + // 5. Clear selection mode and define sketching mode + //XGUI_Displayer* aDisp = workshop()->displayer(); //aDisp->closeLocalContexts(); emit planeSelected(plane()); // after the plane is selected in the sketch, the sketch selection should be activated @@ -153,8 +178,8 @@ void PartSet_WidgetSketchLabel::onSelectionChanged() // the selection by any label deactivation, but need to switch it off by stop the sketch activateSelection(true); - // 8. Update sketcher actions - XGUI_ActionsMgr* anActMgr = myWorkshop->actionsMgr(); + // 6. Update sketcher actions + XGUI_ActionsMgr* anActMgr = workshop()->actionsMgr(); anActMgr->update(); myWorkshop->viewer()->update(); } @@ -163,7 +188,6 @@ std::shared_ptr PartSet_WidgetSketchLabel::plane() const { CompositeFeaturePtr aSketch = std::dynamic_pointer_cast(myFeature); return PartSet_Tools::sketchPlane(aSketch); - } bool PartSet_WidgetSketchLabel::focusTo() @@ -179,10 +203,13 @@ void PartSet_WidgetSketchLabel::enableFocusProcessing() void PartSet_WidgetSketchLabel::storeAttributeValue() { + ModuleBase_WidgetValidated::storeAttributeValue(); } void PartSet_WidgetSketchLabel::restoreAttributeValue(const bool theValid) { + ModuleBase_WidgetValidated::restoreAttributeValue(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 @@ -239,7 +266,7 @@ void PartSet_WidgetSketchLabel::activateCustom() } bool aBodyIsVisualized = false; - XGUI_Displayer* aDisp = myWorkshop->displayer(); + XGUI_Displayer* aDisp = workshop()->displayer(); QObjectPtrList aDisplayed = aDisp->displayedObjects(); foreach (ObjectPtr anObj, aDisplayed) { ResultPtr aResult = std::dynamic_pointer_cast(anObj); @@ -259,8 +286,8 @@ void PartSet_WidgetSketchLabel::activateCustom() myLabel->setText(myText); myLabel->setToolTip(myTooltip); - connect(myWorkshop->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); - activateFilters(myWorkshop->module()->workshop(), true); + connect(workshop()->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); + activateFilters(true); aDisp->updateViewer(); } @@ -270,7 +297,7 @@ void PartSet_WidgetSketchLabel::deactivate() erasePreviewPlanes(); activateSelection(false); - activateFilters(myWorkshop->module()->workshop(), false); + activateFilters(false); } void PartSet_WidgetSketchLabel::activateSelection(bool toActivate) @@ -279,21 +306,21 @@ void PartSet_WidgetSketchLabel::activateSelection(bool toActivate) QIntList aModes; std::shared_ptr aPlane = plane(); if (aPlane.get()) { - myWorkshop->moduleConnector()->module()->activeSelectionModes(aModes); + myWorkshop->module()->activeSelectionModes(aModes); } else { aModes << TopAbs_FACE; } - myWorkshop->moduleConnector()->activateSubShapesSelection(aModes); + myWorkshop->activateSubShapesSelection(aModes); } else { - myWorkshop->moduleConnector()->deactivateSubShapesSelection(); + myWorkshop->deactivateSubShapesSelection(); } } void PartSet_WidgetSketchLabel::erasePreviewPlanes() { if (myPreviewDisplayed) { - XGUI_Displayer* aDisp = myWorkshop->displayer(); + XGUI_Displayer* aDisp = workshop()->displayer(); aDisp->eraseAIS(myYZPlane, false); aDisp->eraseAIS(myXZPlane, false); aDisp->eraseAIS(myXYPlane, false); @@ -310,7 +337,8 @@ void PartSet_WidgetSketchLabel::showPreviewPlanes() // Create Preview std::shared_ptr anOrigin(new GeomAPI_Pnt(0, 0, 0)); std::shared_ptr aYZDir(new GeomAPI_Dir(1, 0, 0)); - std::shared_ptr aXZDir(new GeomAPI_Dir(0, 1, 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; @@ -328,10 +356,10 @@ void PartSet_WidgetSketchLabel::showPreviewPlanes() myXZPlane = createPreviewPlane(anOrigin, aXZDir, aG); myXYPlane = createPreviewPlane(anOrigin, aXYDir, aB); } - XGUI_Displayer* aDisp = myWorkshop->displayer(); - aDisp->displayAIS(myYZPlane, false); - aDisp->displayAIS(myXZPlane, false); - aDisp->displayAIS(myXYPlane, false); + XGUI_Displayer* aDisp = workshop()->displayer(); + aDisp->displayAIS(myYZPlane, true, false); + aDisp->displayAIS(myXZPlane, true, false); + aDisp->displayAIS(myXYPlane, true, false); myPreviewDisplayed = true; } @@ -401,3 +429,9 @@ void PartSet_WidgetSketchLabel::showConstraints(bool theOn) myShowConstraints->setChecked(theOn); emit showConstraintToggled(theOn); } + +XGUI_Workshop* PartSet_WidgetSketchLabel::workshop() const +{ + XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); + return aConnector->workshop(); +}