From 2a13d12cee28a6c60b2db50dc63529a65e1f3b1e Mon Sep 17 00:00:00 2001 From: vsv Date: Fri, 6 Nov 2015 16:02:44 +0300 Subject: [PATCH] Issues #647, #949, #799: Do not rotate view if a sketcher plane is selected on a shape. Make a button to rotate a view into the sketcher plane. --- src/PartSet/PartSet_WidgetSketchLabel.cpp | 92 +++++++++++++++++----- src/PartSet/PartSet_WidgetSketchLabel.h | 11 ++- src/PartSet/PartSet_icons.qrc | 1 + src/PartSet/icons/plane_view.png | Bin 0 -> 619 bytes 4 files changed, 79 insertions(+), 25 deletions(-) create mode 100644 src/PartSet/icons/plane_view.png diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp index 18324da4d..fb815f2d0 100644 --- a/src/PartSet/PartSet_WidgetSketchLabel.cpp +++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp @@ -48,6 +48,9 @@ #include #include #include +#include +#include +#include PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, @@ -58,23 +61,53 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, : 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("Inverted"), 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() @@ -101,7 +134,7 @@ bool PartSet_WidgetSketchLabel::setSelection(QList& theVal QList PartSet_WidgetSketchLabel::getControls() const { QList aResult; - aResult << myLabel; + aResult << myStackWidget; return aResult; } @@ -161,13 +194,13 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs // Rotate view if the sketcher plane is selected only from preview planes // Preview planes are created only if there is no any shape - if (myYZPlane.get()) { + if (myYZPlane.get()) myWorkshop->viewer()->setViewProjection(aXYZ.X(), aXYZ.Y(), aXYZ.Z(), aTwist); - } } // 3. Clear text in the label - myLabel->setText(""); - myLabel->setToolTip(""); + myStackWidget->setCurrentIndex(1); + //myLabel->setText(""); + //myLabel->setToolTip(""); disconnect(workshop()->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); // 4. deactivate face selection filter @@ -185,7 +218,7 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs // 6. Update sketcher actions XGUI_ActionsMgr* anActMgr = workshop()->actionsMgr(); anActMgr->update(); - //VSV myWorkshop->viewer()->update(); + myWorkshop->viewer()->update(); } std::shared_ptr PartSet_WidgetSketchLabel::plane() const @@ -196,13 +229,13 @@ std::shared_ptr PartSet_WidgetSketchLabel::plane() const bool PartSet_WidgetSketchLabel::focusTo() { - myLabel->setFocus(); + myStackWidget->setFocus(); return true; } void PartSet_WidgetSketchLabel::enableFocusProcessing() { - myLabel->installEventFilter(this); + myStackWidget->installEventFilter(this); } void PartSet_WidgetSketchLabel::storeAttributeValue() @@ -265,10 +298,12 @@ 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 = workshop()->displayer(); QObjectPtrList aDisplayed = aDisp->displayedObjects(); @@ -287,8 +322,8 @@ void PartSet_WidgetSketchLabel::activateCustom() } activateSelection(true); - myLabel->setText(myText); - myLabel->setToolTip(myTooltip); + //myLabel->setText(myText); + //myLabel->setToolTip(myTooltip); connect(workshop()->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); activateFilters(true); @@ -394,6 +429,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(); @@ -438,3 +475,16 @@ 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.); + } +} diff --git a/src/PartSet/PartSet_WidgetSketchLabel.h b/src/PartSet/PartSet_WidgetSketchLabel.h index 25807c81b..709c57efa 100644 --- a/src/PartSet/PartSet_WidgetSketchLabel.h +++ b/src/PartSet/PartSet_WidgetSketchLabel.h @@ -22,6 +22,7 @@ class QLabel; class XGUI_OperationMgr; class XGUI_Workshop; class QCheckBox; +class QStackedWidget; /// the plane edge width #define SKETCH_WIDTH "4" @@ -128,6 +129,9 @@ protected: /// Slot on change selection void onSelectionChanged(); + /// A slot called on set sketch plane view + void onSetPlaneView(); + private: /// Create preview of planes for sketch plane selection /// \param theOrigin an origin of the plane @@ -151,16 +155,15 @@ protected: void showPreviewPlanes(); - QLabel* myLabel; - QString myText; - QString myTooltip; - AISObjectPtr myYZPlane; AISObjectPtr myXZPlane; AISObjectPtr myXYPlane; bool myPreviewDisplayed; QCheckBox* myShowConstraints; + QCheckBox* myViewInverted; + + QStackedWidget* myStackWidget; }; #endif diff --git a/src/PartSet/PartSet_icons.qrc b/src/PartSet/PartSet_icons.qrc index 8b840862a..cf582520c 100644 --- a/src/PartSet/PartSet_icons.qrc +++ b/src/PartSet/PartSet_icons.qrc @@ -77,5 +77,6 @@ icons/bool_cut.png icons/bool_fuse.png icons/bool_common.png + icons/plane_view.png diff --git a/src/PartSet/icons/plane_view.png b/src/PartSet/icons/plane_view.png new file mode 100644 index 0000000000000000000000000000000000000000..431f71a3705b69f0d62580ba294efca1e1d3c430 GIT binary patch literal 619 zcmV-x0+juUP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGh)&Kwv)&Y=jd7JO3l2L7#Ey7|9RT=qAhAzK)X(^#=7#D&2Iw5{3m zf8E7L|4kBdzKgpAR%25L!a&#l2VxFnF$Qs<0j;Zd{oj7`)&Hcf8UKL>bRa80#vsi= zd>@DtU}9hcT2}6a7|=cQznE)4CrConC9p!&Ibf5BbD$bbF$e=S8vyZbAf6AzJRk%9 zG_BkLHXyls)_*a#z;3WY*T5M-1t2H?5_1md5%TopgBk!5gW)R>1D0?9?~q;bU)C!e zB={AGUjXr2s3I7CDdFtr2x3DGvH{|EU;`SKZ~Gt7*#BQMED7X=$H26404RAEq!@;Q zVyi^lgCvo}-UD$6*ns+FTftsP>6!gs+%32dWCKvcWT?VhKttU?Vn{ZFHG}vd1Af;p z-2yfswHILk(BA=~uKwjJo}TPTnnAJf7^WF+K<(m9a04XWg8E^S=oqLG