X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=fa2f50750acce400899cc456d12f211e19119333;hb=6c271afeda4e8cd5286607ca85c500b65e0d54ad;hp=d0de6fb9453c12268cd49596c302830d4481ecce;hpb=ed0fc127d631676e17e23fb93a1a71d3e5f39052;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp index d0de6fb94..fa2f50750 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,7 +27,7 @@ #include #include -#include +#include #include #include #include @@ -34,7 +35,6 @@ #include #include -#include #include #include #include @@ -49,41 +49,87 @@ #include #include #include +#include +#include +#include PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, - const Config_WidgetAPI* theData, - const std::string& theParentId, - bool toShowConstraints) - : ModuleBase_WidgetValidated(theParent, theData, theParentId), - myPreviewDisplayed(false), - myWorkshop(NULL) + ModuleBase_IWorkshop* theWorkshop, + const Config_WidgetAPI* theData, + const std::string& theParentId, + const QMap& toShowConstraints) +: 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); + + aLayout->addWidget(aViewBox); + + QMap aStates; + aStates[PartSet_Tools::Geometrical] = tr("Show geometrical constraints"); + aStates[PartSet_Tools::Dimensional] = tr("Show dimensional constraints"); - setLayout(aLayout); - connect(myShowConstraints, SIGNAL(toggled(bool)), this, SIGNAL(showConstraintToggled(bool))); - myShowConstraints->setChecked(toShowConstraints); + QMap::const_iterator anIt = aStates.begin(), + aLast = aStates.end(); + for (; anIt != aLast; anIt++) { + QCheckBox* aShowConstraints = new QCheckBox(anIt.value(), this); + connect(aShowConstraints, SIGNAL(toggled(bool)), this, SLOT(onShowConstraint(bool))); + aLayout->addWidget(aShowConstraints); + + PartSet_Tools::ConstraintVisibleState aState = anIt.key(); + myShowConstraints[aState] = aShowConstraints; + + if (toShowConstraints.contains(aState)) + aShowConstraints->setChecked(toShowConstraints[aState]); + } + + myStackWidget->addWidget(aSecondWgt); + //setLayout(aLayout); } PartSet_WidgetSketchLabel::~PartSet_WidgetSketchLabel() { - erasePreviewPlanes(); } -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. // If this check is absent, a selected plane in the viewer can be set in the sketch @@ -91,32 +137,81 @@ bool PartSet_WidgetSketchLabel::setSelection(QList& theVal if (plane().get()) return true; - return ModuleBase_WidgetValidated::setSelection(theValues); + 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 aSelected = myWorkshop->selector()->selection()->getSelected( - ModuleBase_ISelection::AllControls); + QList aSelected = getFilteredSelected(); + if (aSelected.empty()) return; ModuleBase_ViewerPrs aPrs = aSelected.first(); - bool isDone = ModuleBase_WidgetValidated::setSelection(aSelected); - if (!isDone) - return; + bool aDone = ModuleBase_WidgetValidated::setSelection(aSelected, false); + if (aDone) { + updateByPlaneSelected(aPrs); + updateObject(myFeature); + } +} + +void PartSet_WidgetSketchLabel::onShowConstraint(bool theOn) +{ + QCheckBox* aSenderCheckBox = qobject_cast(sender()); - // 3. hide main planes if they have been displayed + QMap::const_iterator + anIt = myShowConstraints.begin(), aLast = myShowConstraints.end(); + + PartSet_Tools::ConstraintVisibleState aState = PartSet_Tools::Geometrical; + bool aFound = false; + for (; anIt != aLast && !aFound; anIt++) { + aFound = anIt.value() == aSenderCheckBox; + if (aFound) + aState = anIt.key(); + } + if (aFound) + emit showConstraintToggled(aState, theOn); +} + +void PartSet_WidgetSketchLabel::blockAttribute(const bool& theToBlock, bool& isFlushesActived, + bool& isAttributeSetInitializedBlocked) +{ + ModuleBase_WidgetValidated::blockAttribute(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 + // or stored in the widget + + std::list anAttributes = myFeature->data()->attributes(""); + std::list::const_iterator anIt = anAttributes.begin(), aLast = anAttributes.end(); + QStringList aValues; + for(; anIt != aLast; anIt++) { + AttributePtr anAttribute = *anIt; + if (theToBlock) + anAttribute->blockSetInitialized(true); + else + anAttribute->blockSetInitialized(isAttributeSetInitializedBlocked); + } +} + +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; @@ -126,7 +221,7 @@ void PartSet_WidgetSketchLabel::onSelectionChanged() // selection happens in OCC viewer if (!aShape.IsNull()) { - aGShape = std::make_shared(); + aGShape = std::shared_ptr(new GeomAPI_Shape()); aGShape->setImpl(new TopoDS_Shape(aShape)); if (aSelAttr && aSelAttr->context()) { @@ -143,34 +238,34 @@ void PartSet_WidgetSketchLabel::onSelectionChanged() std::shared_ptr aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape); std::shared_ptr aDir = aPlane->direction(); gp_XYZ aXYZ = aDir->impl().XYZ(); - - // orienting projection - if(aBaseShape.get() != NULL) { - std::shared_ptr aCenterPnt = GeomAlgoAPI_ShapeProps::centreOfMass(aGShape); - gp_Pnt aPnt = aCenterPnt->impl(); - aPnt.Translate(aDir->impl().XYZ() * (10 * Precision::Confusion())); - - BRepClass3d_SolidClassifier aClassifier; - aClassifier.Load(aBaseShape->impl()); - aClassifier.Perform(aPnt, Precision::Confusion()); - - if(aClassifier.State() == TopAbs_IN) { - aXYZ.Reverse(); - } + 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(); } - - myWorkshop->viewer()->setViewProjection(aXYZ.X(), aXYZ.Y(), aXYZ.Z()); } - // 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 @@ -178,9 +273,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(); } @@ -188,26 +283,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(); + ModuleBase_Tools::setFocus(myStackWidget, "PartSet_WidgetSketchLabel::focusTo()"); 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 @@ -259,12 +356,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); @@ -281,21 +380,23 @@ void PartSet_WidgetSketchLabel::activateCustom() } activateSelection(true); - myLabel->setText(myText); - myLabel->setToolTip(myTooltip); + //myLabel->setText(myText); + //myLabel->setToolTip(myTooltip); - connect(myWorkshop->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); - activateFilters(myWorkshop->module()->workshop(), true); - - aDisp->updateViewer(); + connect(workshop()->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); + activateFilters(true); } void PartSet_WidgetSketchLabel::deactivate() { + ModuleBase_ModelWidget::deactivate(); + bool aHidePreview = myPreviewDisplayed; erasePreviewPlanes(); activateSelection(false); - activateFilters(myWorkshop->module()->workshop(), false); + activateFilters(false); + if (aHidePreview) + myWorkshop->viewer()->update(); } void PartSet_WidgetSketchLabel::activateSelection(bool toActivate) @@ -304,21 +405,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); @@ -335,7 +436,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; @@ -353,10 +455,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; } @@ -388,6 +490,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(); @@ -421,8 +525,24 @@ std::shared_ptr PartSet_WidgetSketchLabel::setSketchPlane(const Top return aDir; } -void PartSet_WidgetSketchLabel::showConstraints(bool theOn) +XGUI_Workshop* PartSet_WidgetSketchLabel::workshop() const +{ + XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); + return aConnector->workshop(); +} + + +void PartSet_WidgetSketchLabel::onSetPlaneView() { - myShowConstraints->setChecked(theOn); - emit showConstraintToggled(theOn); + 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(); + } }