X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=b167f5a47d31f3afc287d0df3afee39e6442c80b;hb=0d9a107853208317a6352bb7f8c77eb54d5efbe1;hp=82b234fff5363f5fef6b90dbd1230a2407d6fab8;hpb=bc040d7778dfca67e24a0452ce41f88417799adb;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp index 82b234fff..b167f5a47 100644 --- a/src/PartSet/PartSet_WidgetSketchLabel.cpp +++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp @@ -6,6 +6,7 @@ #include "PartSet_WidgetSketchLabel.h" #include "PartSet_Tools.h" +#include "PartSet_Module.h" #include "SketchPlugin_SketchEntity.h" @@ -26,6 +27,7 @@ #include #include +#include #include #include #include @@ -47,41 +49,74 @@ #include #include #include +#include +#include +#include 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); - myLabel->setWordWrap(true); - myTooltip = QString::fromStdString(theData->getProperty("tooltip")); - myLabel->setToolTip(""); - myLabel->setIndent(5); - QVBoxLayout* aLayout = new QVBoxLayout(this); ModuleBase_Tools::zeroMargins(aLayout); - aLayout->addWidget(myLabel); - myShowConstraints = new QCheckBox(tr("Show constraints"), this); - aLayout->addWidget(myShowConstraints); + myStackWidget = new QStackedWidget(this); + myStackWidget->setContentsMargins(0,0,0,0); + aLayout->addWidget(myStackWidget); + + // Define label for plane selection + QWidget* aFirstWgt = new QWidget(this); + + QString aText = QString::fromStdString(theData->getProperty("title")); + QLabel* aLabel = new QLabel(aText, aFirstWgt); + aLabel->setWordWrap(true); + QString aTooltip = QString::fromStdString(theData->getProperty("tooltip")); + aLabel->setToolTip(aTooltip); + aLabel->setIndent(5); + + aLayout = new QVBoxLayout(aFirstWgt); + ModuleBase_Tools::zeroMargins(aLayout); + aLayout->addWidget(aLabel); + + myStackWidget->addWidget(aFirstWgt); + + // Define widget for sketch manmagement + QWidget* aSecondWgt = new QWidget(this); + aLayout = new QVBoxLayout(aSecondWgt); + ModuleBase_Tools::zeroMargins(aLayout); + + QGroupBox* aViewBox = new QGroupBox(tr("Sketcher plane"), this); + QVBoxLayout* aViewLayout = new QVBoxLayout(aViewBox); + + myViewInverted = new QCheckBox(tr("Reversed"), aViewBox); + aViewLayout->addWidget(myViewInverted); + + QPushButton* aSetViewBtn = new QPushButton(QIcon(":icons/plane_view.png"), tr("Set plane view"), aViewBox); + connect(aSetViewBtn, SIGNAL(clicked(bool)), this, SLOT(onSetPlaneView())); + aViewLayout->addWidget(aSetViewBtn); - setLayout(aLayout); + aLayout->addWidget(aViewBox); + + myShowConstraints = new QCheckBox(tr("Show constraints"), this); connect(myShowConstraints, SIGNAL(toggled(bool)), this, SIGNAL(showConstraintToggled(bool))); myShowConstraints->setChecked(toShowConstraints); + aLayout->addWidget(myShowConstraints); + + myStackWidget->addWidget(aSecondWgt); + //setLayout(aLayout); } 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,42 +124,59 @@ 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 { QList aResult; - aResult << myLabel; + aResult << myStackWidget; return aResult; } void PartSet_WidgetSketchLabel::onSelectionChanged() { - QList aSelectedPrs = getSelectedEntitiesOrObjects( - myWorkshop->selector()->selection()); - 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(); + + bool aDone = ModuleBase_WidgetValidated::setSelection(aSelected, false); + if (aDone) { + updateByPlaneSelected(aPrs); + updateObject(myFeature); + } +} - // 2. set the selection to sketch - setSelectionCustom(aPrs); - // 3. hide main planes if they have been displayed +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 +185,35 @@ void PartSet_WidgetSketchLabel::onSelectionChanged() // 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()); + 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(); + }*/ + + // Rotate view if the sketcher plane is selected only from preview planes + // Preview planes are created only if there is no any shape + bool aRotate = Config_PropManager::boolean("Sketch planes", "rotate_to_plane", "false"); + if (aRotate) { + myWorkshop->viewer()->setViewProjection(aXYZ.X(), aXYZ.Y(), aXYZ.Z(), aTwist); + PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); + if (aModule) + aModule->onViewTransformed(); + } } - // 5. Clear text in the label - myLabel->setText(""); - myLabel->setToolTip(""); - disconnect(myWorkshop->selector(), SIGNAL(selectionChanged()), + // 3. Clear text in the label + myStackWidget->setCurrentIndex(1); + //myLabel->setText(""); + //myLabel->setToolTip(""); + 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,9 +221,9 @@ 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(); - anActMgr->update(); + // 6. Update sketcher actions + XGUI_ActionsMgr* anActMgr = workshop()->actionsMgr(); + myWorkshop->updateCommandStatus(); myWorkshop->viewer()->update(); } @@ -163,26 +231,28 @@ std::shared_ptr PartSet_WidgetSketchLabel::plane() const { CompositeFeaturePtr aSketch = std::dynamic_pointer_cast(myFeature); return PartSet_Tools::sketchPlane(aSketch); - } bool PartSet_WidgetSketchLabel::focusTo() { - myLabel->setFocus(); + myStackWidget->setFocus(); return true; } void PartSet_WidgetSketchLabel::enableFocusProcessing() { - myLabel->installEventFilter(this); + myStackWidget->installEventFilter(this); } 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 @@ -234,12 +304,14 @@ void PartSet_WidgetSketchLabel::activateCustom() { std::shared_ptr aPlane = plane(); if (aPlane.get()) { + myStackWidget->setCurrentIndex(1); activateSelection(true); return; } + myStackWidget->setCurrentIndex(0); 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); @@ -256,21 +328,20 @@ void PartSet_WidgetSketchLabel::activateCustom() } activateSelection(true); - myLabel->setText(myText); - myLabel->setToolTip(myTooltip); - - connect(myWorkshop->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); - activateFilters(myWorkshop->module()->workshop(), true); + //myLabel->setText(myText); + //myLabel->setToolTip(myTooltip); - aDisp->updateViewer(); + connect(workshop()->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); + activateFilters(true); } void PartSet_WidgetSketchLabel::deactivate() { + ModuleBase_ModelWidget::deactivate(); erasePreviewPlanes(); activateSelection(false); - activateFilters(myWorkshop->module()->workshop(), false); + activateFilters(false); } void PartSet_WidgetSketchLabel::activateSelection(bool toActivate) @@ -279,21 +350,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 +381,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 +400,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; } @@ -354,7 +426,7 @@ std::shared_ptr PartSet_WidgetSketchLabel::setSketchPlane(const Top { if (theShape.IsNull()) return std::shared_ptr(); - int aType = theShape.ShapeType(); + // get selected shape std::shared_ptr aGShape(new GeomAPI_Shape); aGShape->setImpl(new TopoDS_Shape(theShape)); @@ -363,6 +435,8 @@ std::shared_ptr PartSet_WidgetSketchLabel::setSketchPlane(const Top // get plane parameters std::shared_ptr aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape); + if (!aPlane.get()) + return std::shared_ptr(); // set plane parameters to feature std::shared_ptr aData = feature()->data(); @@ -401,3 +475,25 @@ 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(); +} + + +void PartSet_WidgetSketchLabel::onSetPlaneView() +{ + std::shared_ptr aPlane = plane(); + if (aPlane.get()) { + std::shared_ptr aDirection = aPlane->direction(); + gp_Dir aDir = aDirection->impl(); + if (myViewInverted->isChecked()) + aDir.Reverse(); + myWorkshop->viewer()->setViewProjection(aDir.X(), aDir.Y(), aDir.Z(), 0.); + PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); + if (aModule) + aModule->onViewTransformed(); + } +}