X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FXGUI%2FXGUI_PropertyPanel.cpp;h=737027b35aafce7b6bdc1a9fab0d220722499f34;hb=0950719fabb1015dc7e77761eb0889bad9d38f80;hp=a26f7eab07d03d4934d8ee5a8f1c6e6c4263912e;hpb=423c10234142d14d0d5de89383f2f96a4ec5930f;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_PropertyPanel.cpp b/src/XGUI/XGUI_PropertyPanel.cpp index a26f7eab0..737027b35 100755 --- a/src/XGUI/XGUI_PropertyPanel.cpp +++ b/src/XGUI/XGUI_PropertyPanel.cpp @@ -1,15 +1,33 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> +// 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 +// -/* - * XGUI_PropertyPanel.cpp - * - * Created on: Apr 29, 2014 - * Author: sbh - */ - -#include #include +#include +#include +#include +#include +#include #include +#include +#include + //#include #include #include @@ -42,6 +60,8 @@ //#define DEBUG_TAB_WIDGETS +//#define DEBUG_ACTIVE_WIDGET + XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent, XGUI_OperationMgr* theMgr) : ModuleBase_IPropertyPanel(theParent), myActiveWidget(NULL), @@ -110,6 +130,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 +152,12 @@ void XGUI_PropertyPanel::cleanContent() myWidgets.clear(); myPanelPage->clearPage(); myActiveWidget = NULL; + emit propertyPanelDeactivated(); + 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")); @@ -204,6 +234,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); } @@ -254,6 +287,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 +306,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 +367,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 +385,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) { @@ -390,16 +433,20 @@ 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); + // 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; @@ -417,15 +464,10 @@ 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) { @@ -444,9 +486,31 @@ bool XGUI_PropertyPanel::setActiveWidget(ModuleBase_ModelWidget* theWidget) theWidget->activate(); } 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 anIsNoMoreWidgets = false; + if (isEmitSignal) { + //emit widgetActivated(myActiveWidget); + if (!myActiveWidget && !isEditingMode()) { + anIsNoMoreWidgets = true; + emit noMoreWidgets(aPreviosAttributeID); + } + } + if (myActiveWidget) + emit propertyPanelActivated(); + else + emit propertyPanelDeactivated(); + myOperationMgr->workshop()->selectionActivate()->updateSelectionModes(); + myOperationMgr->workshop()->selectionActivate()->updateSelectionFilters(); + + if (!anIsNoMoreWidgets && 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; }