X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_PropertyPanel.cpp;h=82c99cf8c64aaaaeb078ba64a5a2275343fae90b;hb=7428c5765bb1b6e8b21de1e971d7d355e07240c6;hp=ab7695723b537203d7a3f62b8c002fdf9398c5bd;hpb=83e85cedfb936e7755500322e1afa638d318a863;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_PropertyPanel.cpp b/src/XGUI/XGUI_PropertyPanel.cpp old mode 100644 new mode 100755 index ab7695723..82c99cf8c --- a/src/XGUI/XGUI_PropertyPanel.cpp +++ b/src/XGUI/XGUI_PropertyPanel.cpp @@ -9,11 +9,20 @@ #include #include +#include //#include #include #include #include #include +#include +#include +#include + +#include + +#include +#include #include #include @@ -31,15 +40,18 @@ #include #endif -XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent) +//#define DEBUG_TAB_WIDGETS + +XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent, XGUI_OperationMgr* theMgr) : ModuleBase_IPropertyPanel(theParent), myActiveWidget(NULL), myPreselectionWidget(NULL), - myPanelPage(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); @@ -47,7 +59,7 @@ XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent) 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); @@ -73,6 +85,20 @@ XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent) 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() @@ -102,6 +128,8 @@ void XGUI_PropertyPanel::cleanContent() myWidgets.clear(); myPanelPage->clearPage(); myActiveWidget = NULL; + + findButton(PROP_PANEL_PREVIEW)->setVisible(false); /// by default it is hidden setWindowTitle(tr("Property Panel")); } @@ -111,24 +139,14 @@ void XGUI_PropertyPanel::setModelWidgets(const QList& t if (theWidgets.empty()) return; foreach (ModuleBase_ModelWidget* aWidget, theWidgets) { connect(aWidget, SIGNAL(focusInWidget(ModuleBase_ModelWidget*)), - this, SLOT(activateWidget(ModuleBase_ModelWidget*))); + this, SLOT(onFocusInWidget(ModuleBase_ModelWidget*))); connect(aWidget, SIGNAL(focusOutWidget(ModuleBase_ModelWidget*)), - this, SLOT(activateNextWidget(ModuleBase_ModelWidget*))); - connect(aWidget, SIGNAL(keyReleased(QKeyEvent*)), - this, SIGNAL(keyReleased(QKeyEvent*))); - } - ModuleBase_ModelWidget* aLastWidget = theWidgets.last(); - if (aLastWidget) { - QList aControls = aLastWidget->getControls(); - if (!aControls.empty()) { - QWidget* aLastControl = aControls.last(); + this, SLOT(onActivateNextWidget(ModuleBase_ModelWidget*))); + connect(aWidget, SIGNAL(keyReleased(QObject*, QKeyEvent*)), + this, SIGNAL(keyReleased(QObject*, QKeyEvent*))); + connect(aWidget, SIGNAL(enterClicked(QObject*)), + this, SIGNAL(enterClicked(QObject*))); - QToolButton* anOkBtn = findChild(PROP_PANEL_OK); - QToolButton* aCancelBtn = findChild(PROP_PANEL_CANCEL); - - setTabOrder(aLastControl, anOkBtn); - setTabOrder(anOkBtn, aCancelBtn); - } } } @@ -139,7 +157,6 @@ const QList& XGUI_PropertyPanel::modelWidgets() const ModuleBase_PageBase* XGUI_PropertyPanel::contentWidget() { - return static_cast(myPanelPage); } @@ -159,39 +176,260 @@ 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 + // (e.g. on start operation), so it is strictly important to do not check visualized state + activateNextWidget(theWidget, false); +} + +void XGUI_PropertyPanel::onFocusInWidget(ModuleBase_ModelWidget* theWidget) +{ + if (theWidget->canAcceptFocus()) + activateWidget(theWidget); +} + +void XGUI_PropertyPanel::onActivateNextWidget(ModuleBase_ModelWidget* theWidget) +{ + // this slot happens when some widget lost focus, the next widget which accepts the focus + // should be shown, so the second parameter is true + // it is important for features where in cases the same attributes are used, isCase for this + // attribute returns true, however it can be placed in hidden stack widget(extrusion: elements, + // 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) + bool isVisible = theWidget->isVisible(); + activateNextWidget(theWidget, isVisible); +} + + +void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget, + const bool isCheckVisibility) { // TO CHECK: Editing operation does not have automatical activation of widgets if (isEditingMode()) { activateWidget(NULL); return; } + ModelAPI_ValidatorsFactory* aValidators = ModelAPI_Session::get()->validators(); + QList::const_iterator anIt = myWidgets.begin(), aLast = myWidgets.end(); bool isFoundWidget = false; - activateWindow(); + ModuleBase_Tools::activateWindow(this, "XGUI_PropertyPanel::activateNextWidget()"); for (; anIt != aLast; anIt++) { + ModuleBase_ModelWidget* aCurrentWidget = *anIt; if (isFoundWidget || !theWidget) { - if ((*anIt)->focusTo()) { + + if (!aValidators->isCase(aCurrentWidget->feature(), aCurrentWidget->attributeID())) + continue; // this attribute does not participate in the current case + if (isCheckVisibility && !aCurrentWidget->isInternal()) { + if (!aCurrentWidget->isVisible()) + continue; + } + if (!aCurrentWidget->isObligatory()) + continue; // not obligatory widgets are not activated automatically + + if (aCurrentWidget->focusTo()) { return; } } - isFoundWidget = (*anIt) == theWidget; + isFoundWidget = isFoundWidget || (*anIt) == theWidget; + } + // set focus to Ok/Cancel button in Property panel if there are no more active widgets + // 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 = findButton(PROP_PANEL_OK); + if (anOkBtn->isEnabled()) + aNewFocusWidget = anOkBtn; + else { + QToolButton* aCancelBtn = findButton(PROP_PANEL_CANCEL); + if (aCancelBtn->isEnabled()) + aNewFocusWidget = aCancelBtn; } + if (aNewFocusWidget) + aNewFocusWidget->setFocus(Qt::TabFocusReason); + activateWidget(NULL); } +void findDirectChildren(QWidget* theParent, QList& theWidgets, const bool theDebug) +{ + QList aWidgets; + + if (theParent) { + QLayout* aLayout = theParent->layout(); + if (aLayout) { + for (int i = 0, aCount = aLayout->count(); i < aCount; i++) { + QLayoutItem* anItem = aLayout->itemAt(i); + QWidget* aWidget = anItem ? anItem->widget() : 0; + if (aWidget) { + if (aWidget->isVisible()) { + if (aWidget->focusPolicy() != Qt::NoFocus) + theWidgets.append(aWidget); + findDirectChildren(aWidget, theWidgets, false); + } + } + else if (anItem->layout()) { + QLayout* aLayout = anItem->layout(); + for (int i = 0, aCount = aLayout->count(); i < aCount; i++) { + QLayoutItem* anItem = aLayout->itemAt(i); + QWidget* aWidget = anItem ? anItem->widget() : 0; + if (aWidget) { + if (aWidget->isVisible()) { + if (aWidget->focusPolicy() != Qt::NoFocus) + theWidgets.append(aWidget); + findDirectChildren(aWidget, theWidgets, false); + } + } + else { + // TODO: improve recursive search for the case when here QLayout is used + // currently, the switch widget uses only 1 level of qlayout in qlayout using for + // example for construction plane feature. If there are more levels, + // it should be implemented here + } + } + } + } + } + } +#ifdef DEBUG_TAB_WIDGETS + if (theDebug) { + QStringList aWidgetTypes; + QList::const_iterator anIt = theWidgets.begin(), aLast = theWidgets.end(); + for (; anIt != aLast; anIt++) { + QWidget* aWidget = *anIt; + if (aWidget) + aWidgetTypes.append(aWidget->objectName()); + } + QString anInfo = QString("theWidgets[%1]: %2").arg(theWidgets.count()).arg(aWidgetTypes.join(",")); + qDebug(anInfo.toStdString().c_str()); + } +#endif +} + +bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext) +{ + // it wraps the Tabs clicking to follow in the chain: + // controls, last control, Apply, Cancel, first control, controls + bool isChangedFocus = false; + + QWidget* aFocusWidget = focusWidget(); +#ifdef DEBUG_TAB_WIDGETS + if (aFocusWidget) { + QString anInfo = QString("focus Widget: %1").arg(aFocusWidget->objectName()); + qDebug(anInfo.toStdString().c_str()); + } +#endif + + QWidget* aNewFocusWidget = 0; + if (aFocusWidget) { + QList aChildren; + findDirectChildren(this, aChildren, true); + int aChildrenCount = aChildren.count(); + int aFocusWidgetIndex = aChildren.indexOf(aFocusWidget); + 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 { + QToolButton* aCancelBtn = findButton(PROP_PANEL_CANCEL); + if (aCancelBtn->isEnabled()) + aNewFocusWidget = aCancelBtn; + } + } + else { + aNewFocusWidget = aChildren[aFocusWidgetIndex+1]; + } + } + else { + if (aFocusWidgetIndex == 0) { + // before the first widget, the last should accept focus + aNewFocusWidget = aChildren[aChildrenCount - 1]; + } + 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]; + } + else { + aNewFocusWidget = aChildren[aFocusWidgetIndex-1]; + } + } + } + } + } + if (aNewFocusWidget) { + if (myActiveWidget) { + myActiveWidget->getControls(); + bool isFirstControl = !theIsNext; + QWidget* aLastFocusControl = myActiveWidget->getControlAcceptingFocus(isFirstControl); + if (aFocusWidget == aLastFocusControl) { + setActiveWidget(NULL); + } + } + + //ModuleBase_Tools::setFocus(aNewFocusWidget, "XGUI_PropertyPanel::focusNextPrevChild()"); + aNewFocusWidget->setFocus(theIsNext ? Qt::TabFocusReason : Qt::BacktabFocusReason); + isChangedFocus = true; + } + return isChangedFocus; +} + void XGUI_PropertyPanel::activateNextWidget() { activateNextWidget(myActiveWidget); } -void XGUI_PropertyPanel::activateWidget(ModuleBase_ModelWidget* theWidget) +void XGUI_PropertyPanel::activateWidget(ModuleBase_ModelWidget* theWidget, const bool theEmitSignal) +{ + std::string aPreviosAttributeID; + if(myActiveWidget) + 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); + } + } +} + +bool XGUI_PropertyPanel::setActiveWidget(ModuleBase_ModelWidget* theWidget) { // Avoid activation of already actve widget. It could happen on focusIn event many times if (theWidget == myActiveWidget) { - return; + return false; } + std::string aPreviosAttributeID; if(myActiveWidget) { + aPreviosAttributeID = myActiveWidget->attributeID(); + myActiveWidget->processValueState(); myActiveWidget->deactivate(); myActiveWidget->setHighlighted(false); } @@ -201,28 +439,27 @@ void XGUI_PropertyPanel::activateWidget(ModuleBase_ModelWidget* theWidget) theWidget->activate(); } myActiveWidget = theWidget; - if (myActiveWidget) { - emit widgetActivated(theWidget); - } else if (!isEditingMode()) { - emit noMoreWidgets(); - } + 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); - anOkBtn->setFocus(); + 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(); } @@ -237,11 +474,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); } @@ -256,3 +494,25 @@ void XGUI_PropertyPanel::setPreselectionWidget(ModuleBase_ModelWidget* theWidget { myPreselectionWidget = theWidget; } + + +void XGUI_PropertyPanel::closeEvent(QCloseEvent* theEvent) +{ + ModuleBase_Operation* aOp = myOperationMgr->currentOperation(); + if (aOp) { + if (myOperationMgr->canStopOperation(aOp)) { + myOperationMgr->abortOperation(aOp); + if (myOperationMgr->hasOperation()) + theEvent->ignore(); + else + theEvent->accept(); + } else + theEvent->ignore(); + } else + ModuleBase_IPropertyPanel::closeEvent(theEvent); +} + +QToolButton* XGUI_PropertyPanel::findButton(const char* theInternalName) const +{ + return findChild(theInternalName); +}