-// 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<mailto: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_PageWidget.h>
#include <ModuleBase_WidgetFactory.h>
#include <ModuleBase_OperationDescription.h>
+#include <ModuleBase_Events.h>
+
+#include <Events_Loop.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_Validator.h>
//#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),
myPanelPage = new ModuleBase_PageWidget(aContent);
myPanelPage->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
- aMainLayout->addWidget(myPanelPage, aPanelRow++, kPanelColumn);
+ aMainLayout->addWidget(myPanelPage, aPanelRow, kPanelColumn);
// spit to make the preview button on the bottom of the panel
aMainLayout->setRowStretch(aPanelRow++, 1);
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::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;
}
}
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) {
}
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;
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) {
std::string aPreviosAttributeID;
if(myActiveWidget) {
aPreviosAttributeID = myActiveWidget->attributeID();
+ myActiveWidget->processValueState();
myActiveWidget->deactivate();
myActiveWidget->setHighlighted(false);
}
theWidget->activate();
}
myActiveWidget = theWidget;
+
+#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;
}
theEvent->ignore();
else
theEvent->accept();
- } else
+ } else
theEvent->ignore();
} else
ModuleBase_IPropertyPanel::closeEvent(theEvent);
