X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_PropertyPanel.cpp;h=0099869f50e86fd6cc92f88e407822eabf49d33e;hb=814a346c0ef4b2625779c5ef96be5ff87980acbb;hp=fa2ba0da84c4ae4de183f2171543c786ccfdb0cc;hpb=f1d8496b109dbb89fa0147e336599e9be9c1e8e2;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_PropertyPanel.cpp b/src/XGUI/XGUI_PropertyPanel.cpp old mode 100755 new mode 100644 index fa2ba0da8..0099869f5 --- a/src/XGUI/XGUI_PropertyPanel.cpp +++ b/src/XGUI/XGUI_PropertyPanel.cpp @@ -1,15 +1,32 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> +// Copyright (C) 2014-2019 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 +// -/* - * XGUI_PropertyPanel.cpp - * - * Created on: Apr 29, 2014 - * Author: sbh - */ - -#include #include +#include +#include +#include +#include +#include #include +#include +#include + //#include #include #include @@ -18,6 +35,8 @@ #include #include #include +#include +#include #include @@ -33,8 +52,8 @@ #include #include #include -#include #include +#include #ifdef _DEBUG #include @@ -42,10 +61,13 @@ //#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), + myInternalActiveWidget(NULL), myPanelPage(NULL), myOperationMgr(theMgr) { @@ -72,8 +94,9 @@ XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent, XGUI_OperationMgr* th QStringList aBtnNames; aBtnNames << QString(PROP_PANEL_HELP) - << QString(PROP_PANEL_OK) - << QString(PROP_PANEL_CANCEL); + << QString(PROP_PANEL_OK) + << QString(PROP_PANEL_OK_PLUS) + << QString(PROP_PANEL_CANCEL); foreach(QString eachBtnName, aBtnNames) { QToolButton* aBtn = new QToolButton(aFrm); aBtn->setObjectName(eachBtnName); @@ -110,6 +133,10 @@ void XGUI_PropertyPanel::cleanContent() if (myActiveWidget) myActiveWidget->deactivate(); + XGUI_ActiveControlSelector* aPPSelector = XGUI_Tools::workshop(myOperationMgr->workshop())-> + activeControlMgr()->getSelector(XGUI_PropertyPanelSelector::Type()); + aPPSelector->reset(); // it removes need to be updated widget link + /// as the widgets are deleted later, it is important that the signals /// of these widgets are not processed. An example of the error is issue 986. /// In the given case, the property panel is firstly filled by new widgets @@ -128,6 +155,14 @@ void XGUI_PropertyPanel::cleanContent() myWidgets.clear(); myPanelPage->clearPage(); myActiveWidget = NULL; + emit propertyPanelDeactivated(); + // VSV: It seems that this code is not necessary: + // it is called on propertyPanelDeactivated() event + //myOperationMgr->workshop()->selectionActivate()->updateSelectionModes(); + //myOperationMgr->workshop()->selectionActivate()->updateSelectionFilters(); +#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")); @@ -136,7 +171,8 @@ void XGUI_PropertyPanel::cleanContent() void XGUI_PropertyPanel::setModelWidgets(const QList& theWidgets) { myWidgets = theWidgets; - if (theWidgets.empty()) return; + if (theWidgets.empty()) + return; foreach (ModuleBase_ModelWidget* aWidget, theWidgets) { connect(aWidget, SIGNAL(focusInWidget(ModuleBase_ModelWidget*)), this, SLOT(onFocusInWidget(ModuleBase_ModelWidget*))); @@ -146,10 +182,10 @@ void XGUI_PropertyPanel::setModelWidgets(const QList& t this, SIGNAL(keyReleased(QObject*, QKeyEvent*))); connect(aWidget, SIGNAL(enterClicked(QObject*)), this, SIGNAL(enterClicked(QObject*))); - } } + const QList& XGUI_PropertyPanel::modelWidgets() const { return myWidgets; @@ -173,7 +209,7 @@ void XGUI_PropertyPanel::updateContentWidget(FeaturePtr theFeature) eachWidget->restoreValue(); } // the repaint is used here to immediately react in GUI to the values change. - repaint(); + update(); } void XGUI_PropertyPanel::createContentPanel(FeaturePtr theFeature) @@ -184,15 +220,45 @@ void XGUI_PropertyPanel::createContentPanel(FeaturePtr theFeature) if (theFeature->isAction() || !theFeature->data()) return; + ModuleBase_Operation* anOperation = myOperationMgr->currentOperation(); 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 + ModuleBase_PageBase* aPage = contentWidget(); + aFactory.createPanel(aPage, theFeature); + // update model widgets if exist + setModelWidgets(aPage->modelWidgets()); + // Apply button should be update if the feature was modified by the panel myOperationMgr->onValidateOperation(); } + ModuleBase_OperationFeature* aFeatureOp = + dynamic_cast(anOperation); + if (aFeatureOp && (!aFeatureOp->isEditOperation())) + updateApplyPlusButton(theFeature); + else + findButton(PROP_PANEL_OK_PLUS)->setVisible(false); +} + +void XGUI_PropertyPanel::updateApplyPlusButton(FeaturePtr theFeature) +{ + if (theFeature.get()) { + std::shared_ptr aFeatureInfo = + myOperationMgr->workshop()->featureInfo(theFeature->getKind().c_str()); + if (aFeatureInfo.get()) { + findButton(PROP_PANEL_OK_PLUS)->setVisible(aFeatureInfo->isApplyContinue()); + return; + } + } + findButton(PROP_PANEL_OK_PLUS)->setVisible(false); +} + +ModuleBase_ModelWidget* XGUI_PropertyPanel::activeWidget(const bool isUseCustomWidget) const +{ + if (isUseCustomWidget && myInternalActiveWidget) + return myInternalActiveWidget; + + return myActiveWidget; } void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget) @@ -204,6 +270,9 @@ void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget) void XGUI_PropertyPanel::onFocusInWidget(ModuleBase_ModelWidget* theWidget) { +#ifdef DEBUG_ACTIVE_WIDGET + std::cout << "onFocusInWidget" << std::endl; +#endif if (theWidget->canAcceptFocus()) activateWidget(theWidget); } @@ -217,7 +286,7 @@ 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, + // release in the viewer, next, radius, // widget should be activated but the first is not visualized) bool isVisible = theWidget->isVisible(); activateNextWidget(theWidget, isVisible); @@ -254,6 +323,7 @@ void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget, continue; // do not set focus if it can not be accepted, case: optional choice if (aCurrentWidget->focusTo()) { + aCurrentWidget->emitFocusInWidget(); return; } } @@ -272,7 +342,7 @@ void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget, aNewFocusWidget = aCancelBtn; } if (aNewFocusWidget) - aNewFocusWidget->setFocus(Qt::TabFocusReason); + ModuleBase_Tools::setFocus(aNewFocusWidget, "XGUI_PropertyPanel::activateNextWidget"); activateWidget(NULL); } @@ -333,6 +403,11 @@ void findDirectChildren(QWidget* theParent, QList& theWidgets, const b #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: @@ -346,6 +421,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) { @@ -353,11 +432,11 @@ bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext) findDirectChildren(this, aChildren, true); int aChildrenCount = aChildren.count(); int aFocusWidgetIndex = aChildren.indexOf(aFocusWidget); + QToolButton* anOkBtn = findButton(PROP_PANEL_OK); if (aFocusWidgetIndex >= 0) { if (theIsNext) { if (aFocusWidgetIndex == aChildrenCount-1) { // after the last widget focus should be set to "Apply" - QToolButton* anOkBtn = findButton(PROP_PANEL_OK); if (anOkBtn->isEnabled()) aNewFocusWidget = anOkBtn; else { @@ -377,7 +456,6 @@ bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext) } else { // before the "Apply" button, the last should accept focus for consistency with "Next" - QToolButton* anOkBtn = findButton(PROP_PANEL_OK); if (aFocusWidget == anOkBtn) { aNewFocusWidget = aChildren[aChildrenCount - 1]; } @@ -390,17 +468,25 @@ bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext) } if (aNewFocusWidget) { if (myActiveWidget) { - myActiveWidget->getControls(); bool isFirstControl = !theIsNext; QWidget* aLastFocusControl = myActiveWidget->getControlAcceptingFocus(isFirstControl); if (aFocusWidget == aLastFocusControl) { - setActiveWidget(NULL); + setActiveWidget(NULL, false); } } - //ModuleBase_Tools::setFocus(aNewFocusWidget, "XGUI_PropertyPanel::focusNextPrevChild()"); - aNewFocusWidget->setFocus(theIsNext ? Qt::TabFocusReason : Qt::BacktabFocusReason); - isChangedFocus = true; + // 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) { + if (aFocusMWidget && (aFocusMWidget != aNewFocusMWidget)) { + aFocusMWidget->setHighlighted(false); + } + aNewFocusMWidget->emitFocusInWidget(); + isChangedFocus = true; + } } return isChangedFocus; } @@ -417,36 +503,61 @@ void XGUI_PropertyPanel::activateWidget(ModuleBase_ModelWidget* theWidget, const aPreviosAttributeID = myActiveWidget->attributeID(); // Avoid activation of already actve widget. It could happen on focusIn event many times - if (setActiveWidget(theWidget) && theEmitSignal) { - emit widgetActivated(myActiveWidget); - if (!myActiveWidget && !isEditingMode()) { - emit noMoreWidgets(aPreviosAttributeID); - } - } + setActiveWidget(theWidget, theEmitSignal); } -bool XGUI_PropertyPanel::setActiveWidget(ModuleBase_ModelWidget* theWidget) +bool XGUI_PropertyPanel::setActiveWidget(ModuleBase_ModelWidget* theWidget, const bool isEmitSignal) { // Avoid activation of already actve widget. It could happen on focusIn event many times if (theWidget == myActiveWidget) { return false; } std::string aPreviosAttributeID; + ModuleBase_ModelWidget* aDeactivatedWidget = NULL, *anActivatedWidget = NULL; if(myActiveWidget) { aPreviosAttributeID = myActiveWidget->attributeID(); myActiveWidget->processValueState(); myActiveWidget->deactivate(); myActiveWidget->setHighlighted(false); + aDeactivatedWidget = myActiveWidget; } if(theWidget) { emit beforeWidgetActivated(theWidget); theWidget->setHighlighted(true); theWidget->activate(); + anActivatedWidget = theWidget; } myActiveWidget = theWidget; - static Events_ID anEvent = Events_Loop::eventByName(EVENT_UPDATE_BY_WIDGET_SELECTION); - Events_Loop::loop()->flush(anEvent); +#ifdef DEBUG_ACTIVE_WIDGET + std::cout << "myActiveWidget = " << (theWidget ? theWidget->context().c_str() : "") << std::endl; +#endif + bool aHasMoreWidgets = true; + if (isEmitSignal) { + //emit widgetActivated(myActiveWidget); + if (!myActiveWidget && !isEditingMode()) { + aHasMoreWidgets = false; + emit noMoreWidgets(aPreviosAttributeID); + } + } + if (myActiveWidget) + emit propertyPanelActivated(); + else + emit propertyPanelDeactivated(); + myOperationMgr->workshop()->selectionActivate()->updateSelectionModes(); + myOperationMgr->workshop()->selectionActivate()->updateSelectionFilters(); + + if (aHasMoreWidgets && aDeactivatedWidget) + aDeactivatedWidget->updateAfterDeactivation(); + if (aHasMoreWidgets && anActivatedWidget) + anActivatedWidget->updateAfterActivation(); + + if (aHasMoreWidgets && myActiveWidget) + { + // restore widget selection should be done after selection modes of widget activating + static Events_ID anEvent = Events_Loop::eventByName(EVENT_UPDATE_BY_WIDGET_SELECTION); + Events_Loop::loop()->flush(anEvent); + } return true; } @@ -479,10 +590,11 @@ 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 << PROP_PANEL_PREVIEW; + aButtonNames << PROP_PANEL_OK<< PROP_PANEL_OK_PLUS << PROP_PANEL_CANCEL + << PROP_PANEL_HELP << PROP_PANEL_PREVIEW; QList aActionIds; - aActionIds << XGUI_ActionsMgr::Accept << XGUI_ActionsMgr::Abort << XGUI_ActionsMgr::Help - << XGUI_ActionsMgr::Preview; + aActionIds << XGUI_ActionsMgr::Accept << XGUI_ActionsMgr::AcceptPlus << XGUI_ActionsMgr::Abort + << XGUI_ActionsMgr::Help << XGUI_ActionsMgr::Preview; for (int i = 0; i < aButtonNames.size(); ++i) { QToolButton* aBtn = findButton(aButtonNames.at(i).toStdString().c_str()); QAction* anAct = theMgr->operationStateAction(aActionIds.at(i)); @@ -490,6 +602,33 @@ void XGUI_PropertyPanel::setupActions(XGUI_ActionsMgr* theMgr) } } +void XGUI_PropertyPanel::onAcceptData() +{ + foreach (ModuleBase_ModelWidget* aWidget, myWidgets) { + aWidget->onFeatureAccepted(); + } +} + +void XGUI_PropertyPanel::setInternalActiveWidget(ModuleBase_ModelWidget* theWidget) +{ + if (theWidget) + { + myInternalActiveWidget = theWidget; + emit propertyPanelActivated(); + } + else + { + if (myInternalActiveWidget) + { + delete myInternalActiveWidget; + myInternalActiveWidget = 0; + } + emit propertyPanelDeactivated(); + } + myOperationMgr->workshop()->selectionActivate()->updateSelectionModes(); + myOperationMgr->workshop()->selectionActivate()->updateSelectionFilters(); +} + ModuleBase_ModelWidget* XGUI_PropertyPanel::preselectionWidget() const { return myPreselectionWidget; @@ -511,7 +650,7 @@ void XGUI_PropertyPanel::closeEvent(QCloseEvent* theEvent) theEvent->ignore(); else theEvent->accept(); - } else + } else theEvent->ignore(); } else ModuleBase_IPropertyPanel::closeEvent(theEvent);