-// 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 <XGUI_PropertyPanel.h>
#include <XGUI_ActionsMgr.h>
+#include <XGUI_ActiveControlMgr.h>
+#include <XGUI_SelectionActivate.h>
+#include <XGUI_ActiveControlSelector.h>
+#include <XGUI_PropertyPanel.h>
+#include <XGUI_PropertyPanelSelector.h>
#include <XGUI_OperationMgr.h>
+#include <XGUI_Tools.h>
+#include <XGUI_Workshop.h>
+
//#include <AppElements_Constants.h>
#include <ModuleBase_WidgetMultiSelector.h>
#include <ModuleBase_Tools.h>
#include <ModuleBase_PageBase.h>
#include <ModuleBase_PageWidget.h>
+#include <ModuleBase_WidgetFactory.h>
+#include <ModuleBase_OperationDescription.h>
+#include <ModuleBase_Events.h>
+#include <ModuleBase_IModule.h>
+#include <ModuleBase_IWorkshop.h>
+
+#include <Events_Loop.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_Validator.h>
#include <QVBoxLayout>
#include <QGridLayout>
#include <QWidget>
-#include <QToolButton>
#include <QAction>
#ifdef _DEBUG
//#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)
{
- 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);
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);
QStringList aBtnNames;
aBtnNames << QString(PROP_PANEL_HELP)
<< QString(PROP_PANEL_OK)
+ << QString(PROP_PANEL_OK_PLUS)
<< QString(PROP_PANEL_CANCEL);
foreach(QString eachBtnName, aBtnNames) {
QToolButton* aBtn = new QToolButton(aFrm);
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()
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
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"));
}
void XGUI_PropertyPanel::setModelWidgets(const QList<ModuleBase_ModelWidget*>& 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*)));
this, SIGNAL(keyReleased(QObject*, QKeyEvent*)));
connect(aWidget, SIGNAL(enterClicked(QObject*)),
this, SIGNAL(enterClicked(QObject*)));
-
}
}
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();
+ }
+ std::shared_ptr<Config_FeatureMessage> aFeatureInfo =
+ myOperationMgr->workshop()->featureInfo(theFeature->getKind().c_str());
+ if (aFeatureInfo.get())
+ findButton(PROP_PANEL_OK_PLUS)->setVisible(aFeatureInfo->isApplyContinue());
+}
+
+ModuleBase_ModelWidget* XGUI_PropertyPanel::activeWidget(const bool isUseCustomWidget) const
+{
+ if (isUseCustomWidget && myInternalActiveWidget)
+ return myInternalActiveWidget;
+
+ return myActiveWidget;
+}
+
void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget)
{
// it is possible that the property panel widgets have not been visualized
void XGUI_PropertyPanel::onFocusInWidget(ModuleBase_ModelWidget* theWidget)
{
+#ifdef DEBUG_ACTIVE_WIDGET
+ std::cout << "onFocusInWidget" << std::endl;
+#endif
if (theWidget->canAcceptFocus())
activateWidget(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);
}
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;
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;
}
}
// 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<QToolButton*>(PROP_PANEL_OK);
+ QToolButton* anOkBtn = findButton(PROP_PANEL_OK);
if (anOkBtn->isEnabled())
aNewFocusWidget = anOkBtn;
else {
- QToolButton* aCancelBtn = findChild<QToolButton*>(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);
}
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:
qDebug(anInfo.toStdString().c_str());
}
#endif
+ ModuleBase_ModelWidget* aFocusMWidget = ModuleBase_ModelWidget::findModelWidget(this,
+ aFocusWidget);
+ //if (aFocusMWidget)
+ // aFocusMWidget->setHighlighted(false);
QWidget* aNewFocusWidget = 0;
if (aFocusWidget) {
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 = findChild<QToolButton*>(PROP_PANEL_OK);
if (anOkBtn->isEnabled())
aNewFocusWidget = anOkBtn;
else {
- QToolButton* aCancelBtn = findChild<QToolButton*>(PROP_PANEL_CANCEL);
+ QToolButton* aCancelBtn = findButton(PROP_PANEL_CANCEL);
if (aCancelBtn->isEnabled())
aNewFocusWidget = aCancelBtn;
}
}
else {
// before the "Apply" button, the last should accept focus for consistency with "Next"
- QToolButton* anOkBtn = findChild<QToolButton*>(PROP_PANEL_OK);
if (aFocusWidget == anOkBtn) {
aNewFocusWidget = aChildren[aChildrenCount - 1];
}
}
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->setHighlighted(false);
+ }
+ aNewFocusMWidget->emitFocusInWidget();
+ isChangedFocus = true;
+ }
}
return isChangedFocus;
}
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;
+
+#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;
}
void XGUI_PropertyPanel::setFocusOnOkButton()
{
- QToolButton* anOkBtn = findChild<QToolButton*>(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<QToolButton*>(PROP_PANEL_CANCEL);
+ QToolButton* anCancelBtn = findButton(PROP_PANEL_CANCEL);
anCancelBtn->setEnabled(theEnabled);
}
bool XGUI_PropertyPanel::isCancelEnabled() const
{
- QToolButton* anCancelBtn = findChild<QToolButton*>(PROP_PANEL_CANCEL);
+ QToolButton* anCancelBtn = findButton(PROP_PANEL_CANCEL);
return anCancelBtn->isEnabled();
}
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_OK_PLUS << PROP_PANEL_CANCEL
+ << PROP_PANEL_HELP << PROP_PANEL_PREVIEW;
QList<XGUI_ActionsMgr::OperationStateActionId> aActionIds;
- aActionIds << XGUI_ActionsMgr::Accept << XGUI_ActionsMgr::Abort << XGUI_ActionsMgr::Help;
+ 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 = findChild<QToolButton*>(aButtonNames.at(i));
+ QToolButton* aBtn = findButton(aButtonNames.at(i).toStdString().c_str());
QAction* anAct = theMgr->operationStateAction(aActionIds.at(i));
aBtn->setDefaultAction(anAct);
}
}
+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;
theEvent->ignore();
else
theEvent->accept();
- } else
+ } else
theEvent->ignore();
} else
ModuleBase_IPropertyPanel::closeEvent(theEvent);
}
+
+QToolButton* XGUI_PropertyPanel::findButton(const char* theInternalName) const
+{
+ return findChild<QToolButton*>(theInternalName);
+}
