X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_PropertyPanel.cpp;h=bdc4792593ea8b0c9439af775711c4f4daa76d9b;hb=08a596f683652d0694b58dbb14eadfe11163c803;hp=5930c5e9f864373b331c38340b4e55ba5b07f1c7;hpb=c8f77e4026552d0bd9efa0a2ee3ab32747840df6;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_PropertyPanel.cpp b/src/XGUI/XGUI_PropertyPanel.cpp index 5930c5e9f..bdc479259 100755 --- a/src/XGUI/XGUI_PropertyPanel.cpp +++ b/src/XGUI/XGUI_PropertyPanel.cpp @@ -1,11 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -/* - * XGUI_PropertyPanel.cpp - * - * Created on: Apr 29, 2014 - * Author: sbh - */ +// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or +// email : webmaster.salome@opencascade.com +// #include #include @@ -15,6 +26,11 @@ #include #include #include +#include +#include +#include + +#include #include #include @@ -37,16 +53,18 @@ //#define DEBUG_TAB_WIDGETS +//#define DEBUG_ACTIVE_WIDGET + XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent, XGUI_OperationMgr* theMgr) - : ModuleBase_IPropertyPanel(theParent), + : ModuleBase_IPropertyPanel(theParent), myActiveWidget(NULL), myPreselectionWidget(NULL), myPanelPage(NULL), myOperationMgr(theMgr) { - this->setWindowTitle(tr("Property Panel")); - QAction* aViewAct = this->toggleViewAction(); - this->setObjectName(PROP_PANEL); + setWindowTitle(tr("Property Panel")); + QAction* aViewAct = toggleViewAction(); + setObjectName(PROP_PANEL); setStyleSheet("::title { position: relative; padding-left: 5px; text-align: left center }"); QWidget* aContent = new QWidget(this); @@ -54,7 +72,7 @@ XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent, XGUI_OperationMgr* th const int kPanelColumn = 0; int aPanelRow = 0; aMainLayout->setContentsMargins(3, 3, 3, 3); - this->setWidget(aContent); + setWidget(aContent); QFrame* aFrm = new QFrame(aContent); aFrm->setFrameStyle(QFrame::Raised); @@ -80,6 +98,20 @@ XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent, XGUI_OperationMgr* th myPanelPage = new ModuleBase_PageWidget(aContent); myPanelPage->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); aMainLayout->addWidget(myPanelPage, aPanelRow, kPanelColumn); + + // spit to make the preview button on the bottom of the panel + aMainLayout->setRowStretch(aPanelRow++, 1); + + // preview button on the bottom of panel + aFrm = new QFrame(aContent); + aBtnLay = new QHBoxLayout(aFrm); + aBtnLay->addStretch(1); + ModuleBase_Tools::zeroMargins(aBtnLay); + aMainLayout->addWidget(aFrm, aPanelRow++, kPanelColumn); + + QToolButton* aBtn = new QToolButton(aFrm); + aBtn->setObjectName(PROP_PANEL_PREVIEW); + aBtnLay->addWidget(aBtn); } XGUI_PropertyPanel::~XGUI_PropertyPanel() @@ -109,6 +141,11 @@ void XGUI_PropertyPanel::cleanContent() myWidgets.clear(); myPanelPage->clearPage(); myActiveWidget = NULL; +#ifdef DEBUG_ACTIVE_WIDGET + std::cout << "myActiveWidget = NULL" << std::endl; +#endif + + findButton(PROP_PANEL_PREVIEW)->setVisible(false); /// by default it is hidden setWindowTitle(tr("Property Panel")); } @@ -155,6 +192,25 @@ void XGUI_PropertyPanel::updateContentWidget(FeaturePtr theFeature) repaint(); } +void XGUI_PropertyPanel::createContentPanel(FeaturePtr theFeature) +{ + // Invalid feature case on abort of the operation + if (theFeature.get() == NULL) + return; + if (theFeature->isAction() || !theFeature->data()) + return; + + if (myWidgets.empty()) { + ModuleBase_Operation* anOperation = myOperationMgr->currentOperation(); + QString aXmlRepr = anOperation->getDescription()->xmlRepresentation(); + + ModuleBase_WidgetFactory aFactory(aXmlRepr.toStdString(), myOperationMgr->workshop()); + aFactory.createPanel(contentWidget(), theFeature); + /// Apply button should be update if the feature was modified by the panel + myOperationMgr->onValidateOperation(); + } +} + void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget) { // it is possible that the property panel widgets have not been visualized @@ -164,7 +220,10 @@ void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget) void XGUI_PropertyPanel::onFocusInWidget(ModuleBase_ModelWidget* theWidget) { - if (theWidget->canSetValue()) +#ifdef DEBUG_ACTIVE_WIDGET + std::cout << "onFocusInWidget" << std::endl; +#endif + if (theWidget->canAcceptFocus()) activateWidget(theWidget); } @@ -177,7 +236,8 @@ void XGUI_PropertyPanel::onActivateNextWidget(ModuleBase_ModelWidget* theWidget) // sketch multi rotation -> single/full point) // it is important to check the widget visibility to do not check of the next widget visible // state if the current is not shown. (example: sketch circle re-entrant operation after mouse - // release in the viewer, next, radius, widget should be activated but the first is not visualized) + // release in the viewer, next, radius, + // widget should be activated but the first is not visualized) bool isVisible = theWidget->isVisible(); activateNextWidget(theWidget, isVisible); } @@ -201,7 +261,7 @@ void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget, if (isFoundWidget || !theWidget) { if (!aValidators->isCase(aCurrentWidget->feature(), aCurrentWidget->attributeID())) - continue; // this attribute is not participated in the current case + continue; // this attribute does not participate in the current case if (isCheckVisibility && !aCurrentWidget->isInternal()) { if (!aCurrentWidget->isVisible()) continue; @@ -209,7 +269,11 @@ void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget, if (!aCurrentWidget->isObligatory()) continue; // not obligatory widgets are not activated automatically + if (!aCurrentWidget->canAcceptFocus()) + continue; // do not set focus if it can not be accepted, case: optional choice + if (aCurrentWidget->focusTo()) { + aCurrentWidget->emitFocusInWidget(); return; } } @@ -219,16 +283,16 @@ void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget, // it should be performed before activateWidget(NULL) because it emits some signals which // can be processed by moudule for example as to activate another widget with setting focus QWidget* aNewFocusWidget = 0; - QToolButton* anOkBtn = findChild(PROP_PANEL_OK); + QToolButton* anOkBtn = findButton(PROP_PANEL_OK); if (anOkBtn->isEnabled()) aNewFocusWidget = anOkBtn; else { - QToolButton* aCancelBtn = findChild(PROP_PANEL_CANCEL); + QToolButton* aCancelBtn = findButton(PROP_PANEL_CANCEL); if (aCancelBtn->isEnabled()) aNewFocusWidget = aCancelBtn; } if (aNewFocusWidget) - aNewFocusWidget->setFocus(Qt::TabFocusReason); + ModuleBase_Tools::setFocus(aNewFocusWidget, "XGUI_PropertyPanel::activateNextWidget"); activateWidget(NULL); } @@ -282,12 +346,18 @@ void findDirectChildren(QWidget* theParent, QList& theWidgets, const b if (aWidget) aWidgetTypes.append(aWidget->objectName()); } - QString anInfo = QString("theWidgets[%1]: %2").arg(theWidgets.count()).arg(aWidgetTypes.join(",")); + QString anInfo = QString("theWidgets[%1]: %2") + .arg(theWidgets.count()).arg(aWidgetTypes.join(",")); qDebug(anInfo.toStdString().c_str()); } #endif } +bool XGUI_PropertyPanel::setFocusNextPrevChild(bool theIsNext) +{ + return focusNextPrevChild(theIsNext); +} + bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext) { // it wraps the Tabs clicking to follow in the chain: @@ -301,6 +371,10 @@ bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext) qDebug(anInfo.toStdString().c_str()); } #endif + ModuleBase_ModelWidget* aFocusMWidget = ModuleBase_ModelWidget::findModelWidget(this, + aFocusWidget); + if (aFocusMWidget) + aFocusMWidget->setHighlighted(false); QWidget* aNewFocusWidget = 0; if (aFocusWidget) { @@ -312,11 +386,11 @@ bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext) if (theIsNext) { if (aFocusWidgetIndex == aChildrenCount-1) { // after the last widget focus should be set to "Apply" - QToolButton* anOkBtn = findChild(PROP_PANEL_OK); + QToolButton* anOkBtn = findButton(PROP_PANEL_OK); if (anOkBtn->isEnabled()) aNewFocusWidget = anOkBtn; else { - QToolButton* aCancelBtn = findChild(PROP_PANEL_CANCEL); + QToolButton* aCancelBtn = findButton(PROP_PANEL_CANCEL); if (aCancelBtn->isEnabled()) aNewFocusWidget = aCancelBtn; } @@ -332,7 +406,7 @@ bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext) } else { // before the "Apply" button, the last should accept focus for consistency with "Next" - QToolButton* anOkBtn = findChild(PROP_PANEL_OK); + QToolButton* anOkBtn = findButton(PROP_PANEL_OK); if (aFocusWidget == anOkBtn) { aNewFocusWidget = aChildren[aChildrenCount - 1]; } @@ -345,7 +419,6 @@ bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext) } if (aNewFocusWidget) { if (myActiveWidget) { - myActiveWidget->getControls(); bool isFirstControl = !theIsNext; QWidget* aLastFocusControl = myActiveWidget->getControlAcceptingFocus(isFirstControl); if (aFocusWidget == aLastFocusControl) { @@ -353,8 +426,13 @@ bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext) } } - //ModuleBase_Tools::setFocus(aNewFocusWidget, "XGUI_PropertyPanel::focusNextPrevChild()"); - aNewFocusWidget->setFocus(theIsNext ? Qt::TabFocusReason : Qt::BacktabFocusReason); + // we want to have property panel as an active window to enter values in double control + ModuleBase_Tools::setFocus(aNewFocusWidget, "XGUI_PropertyPanel::focusNextPrevChild()"); + + ModuleBase_ModelWidget* aNewFocusMWidget = ModuleBase_ModelWidget::findModelWidget(this, + aNewFocusWidget); + if (aNewFocusMWidget) + aNewFocusMWidget->emitFocusInWidget(); isChangedFocus = true; } return isChangedFocus; @@ -389,6 +467,7 @@ bool XGUI_PropertyPanel::setActiveWidget(ModuleBase_ModelWidget* theWidget) std::string aPreviosAttributeID; if(myActiveWidget) { aPreviosAttributeID = myActiveWidget->attributeID(); + myActiveWidget->processValueState(); myActiveWidget->deactivate(); myActiveWidget->setHighlighted(false); } @@ -398,24 +477,30 @@ bool XGUI_PropertyPanel::setActiveWidget(ModuleBase_ModelWidget* theWidget) theWidget->activate(); } myActiveWidget = theWidget; +#ifdef DEBUG_ACTIVE_WIDGET + std::cout << "myActiveWidget = " << (theWidget ? theWidget->context().c_str() : "") << std::endl; +#endif + static Events_ID anEvent = Events_Loop::eventByName(EVENT_UPDATE_BY_WIDGET_SELECTION); + Events_Loop::loop()->flush(anEvent); + return true; } void XGUI_PropertyPanel::setFocusOnOkButton() { - QToolButton* anOkBtn = findChild(PROP_PANEL_OK); + QToolButton* anOkBtn = findButton(PROP_PANEL_OK); ModuleBase_Tools::setFocus(anOkBtn, "XGUI_PropertyPanel::setFocusOnOkButton()"); } void XGUI_PropertyPanel::setCancelEnabled(bool theEnabled) { - QToolButton* anCancelBtn = findChild(PROP_PANEL_CANCEL); + QToolButton* anCancelBtn = findButton(PROP_PANEL_CANCEL); anCancelBtn->setEnabled(theEnabled); } bool XGUI_PropertyPanel::isCancelEnabled() const { - QToolButton* anCancelBtn = findChild(PROP_PANEL_CANCEL); + QToolButton* anCancelBtn = findButton(PROP_PANEL_CANCEL); return anCancelBtn->isEnabled(); } @@ -430,11 +515,12 @@ void XGUI_PropertyPanel::setEditingMode(bool isEditing) void XGUI_PropertyPanel::setupActions(XGUI_ActionsMgr* theMgr) { QStringList aButtonNames; - aButtonNames << PROP_PANEL_OK << PROP_PANEL_CANCEL << PROP_PANEL_HELP; + aButtonNames << PROP_PANEL_OK << PROP_PANEL_CANCEL << PROP_PANEL_HELP << PROP_PANEL_PREVIEW; QList aActionIds; - aActionIds << XGUI_ActionsMgr::Accept << XGUI_ActionsMgr::Abort << XGUI_ActionsMgr::Help; + aActionIds << XGUI_ActionsMgr::Accept << XGUI_ActionsMgr::Abort << XGUI_ActionsMgr::Help + << XGUI_ActionsMgr::Preview; for (int i = 0; i < aButtonNames.size(); ++i) { - QToolButton* aBtn = findChild(aButtonNames.at(i)); + QToolButton* aBtn = findButton(aButtonNames.at(i).toStdString().c_str()); QAction* anAct = theMgr->operationStateAction(aActionIds.at(i)); aBtn->setDefaultAction(anAct); } @@ -461,8 +547,13 @@ void XGUI_PropertyPanel::closeEvent(QCloseEvent* theEvent) theEvent->ignore(); else theEvent->accept(); - } else + } else theEvent->ignore(); } else ModuleBase_IPropertyPanel::closeEvent(theEvent); } + +QToolButton* XGUI_PropertyPanel::findButton(const char* theInternalName) const +{ + return findChild(theInternalName); +}