X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_PropertyPanel.cpp;h=b94bb1903f708438fc9b5d236f214a084930b816;hb=50c050906e6b5926727fcbadcbf4247326ef60be;hp=ccf0469cfc2944b3d30b38fce8fbc867bbfcca27;hpb=fdfc221732acbce4be6b2c9c444f7c3643812811;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_PropertyPanel.cpp b/src/XGUI/XGUI_PropertyPanel.cpp index ccf0469cf..b94bb1903 100644 --- a/src/XGUI/XGUI_PropertyPanel.cpp +++ b/src/XGUI/XGUI_PropertyPanel.cpp @@ -5,8 +5,9 @@ * Author: sbh */ -#include #include +//#include +#include #include #include @@ -14,21 +15,26 @@ #include #include #include +#include +#include +#include #ifdef _DEBUG #include #endif XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent) + : ModuleBase_IPropertyPanel(theParent), + myActiveWidget(NULL) { this->setWindowTitle(tr("Property Panel")); QAction* aViewAct = this->toggleViewAction(); - this->setObjectName(XGUI::PROP_PANEL); + this->setObjectName(PROP_PANEL); setStyleSheet("::title { position: relative; padding-left: 5px; text-align: left center }"); QWidget* aContent = new QWidget(this); - QVBoxLayout* aMainLay = new QVBoxLayout(aContent); - aMainLay->setContentsMargins(3, 3, 3, 3); + myMainLayout = new QVBoxLayout(aContent); + myMainLayout->setContentsMargins(3, 3, 3, 3); this->setWidget(aContent); QFrame* aFrm = new QFrame(aContent); @@ -36,33 +42,91 @@ XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent) aFrm->setFrameShape(QFrame::Panel); QHBoxLayout* aBtnLay = new QHBoxLayout(aFrm); aBtnLay->setContentsMargins(0, 0, 0, 0); - aMainLay->addWidget(aFrm); + myMainLayout->addWidget(aFrm); QPushButton* aBtn = new QPushButton(QIcon(":pictures/button_help.png"), "", aFrm); aBtn->setFlat(true); aBtnLay->addWidget(aBtn); aBtnLay->addStretch(1); aBtn = new QPushButton(QIcon(":pictures/button_ok.png"), "", aFrm); - aBtn->setObjectName(XGUI::PROP_PANEL_OK); + aBtn->setObjectName(PROP_PANEL_OK); + aBtn->setToolTip(tr("Ok")); aBtn->setFlat(true); aBtnLay->addWidget(aBtn); + aBtn = new QPushButton(QIcon(":pictures/button_cancel.png"), "", aFrm); - aBtn->setObjectName(XGUI::PROP_PANEL_CANCEL); + aBtn->setToolTip(tr("Cancel")); + aBtn->setObjectName(PROP_PANEL_CANCEL); aBtn->setFlat(true); + aBtn->setShortcut(QKeySequence(Qt::Key_Escape)); aBtnLay->addWidget(aBtn); myCustomWidget = new QWidget(aContent); - aMainLay->addWidget(myCustomWidget); - aMainLay->addStretch(1); + myMainLayout->addWidget(myCustomWidget); + setStretchEnabled(true); } XGUI_PropertyPanel::~XGUI_PropertyPanel() { } +void XGUI_PropertyPanel::cleanContent() +{ + if (myActiveWidget) + myActiveWidget->deactivate(); + myWidgets.clear(); + qDeleteAll(myCustomWidget->children()); + myActiveWidget = NULL; +} + void XGUI_PropertyPanel::setModelWidgets(const QList& theWidgets) { myWidgets = theWidgets; + if (theWidgets.empty()) return; + bool isEnableStretch = true; + QList::const_iterator anIt = theWidgets.begin(), aLast = + theWidgets.end(); + for (; anIt != aLast; anIt++) { + connect(*anIt, SIGNAL(keyReleased(QKeyEvent*)), this, SIGNAL(keyReleased(QKeyEvent*))); + connect(*anIt, SIGNAL(focusOutWidget(ModuleBase_ModelWidget*)), + this, SLOT(activateNextWidget(ModuleBase_ModelWidget*))); + connect(*anIt, SIGNAL(focusInWidget(ModuleBase_ModelWidget*)), + this, SLOT(activateWidget(ModuleBase_ModelWidget*))); + + //ModuleBase_WidgetPoint2D* aPointWidget = dynamic_cast(*anIt); + //if (aPointWidget) + // connect(aPointWidget, SIGNAL(storedPoint2D(ObjectPtr, const std::string&)), this, + // SIGNAL(storedPoint2D(ObjectPtr, const std::string&))) + //} + + if (!isEnableStretch) continue; + foreach(QWidget* eachWidget, (*anIt)->getControls()) { + QSizePolicy::Policy aVPolicy = eachWidget->sizePolicy().verticalPolicy(); + if(aVPolicy == QSizePolicy::Expanding || + aVPolicy == QSizePolicy::MinimumExpanding) { + isEnableStretch = false; + } + } + } + setStretchEnabled(isEnableStretch); + ModuleBase_ModelWidget* aLastWidget = theWidgets.last(); + if (aLastWidget) { + QList aControls = aLastWidget->getControls(); + if (!aControls.empty()) { + QWidget* aLastControl = aControls.last(); + + QPushButton* anOkBtn = findChild(PROP_PANEL_OK); + QPushButton* aCancelBtn = findChild(PROP_PANEL_CANCEL); + + setTabOrder(aLastControl, anOkBtn); + setTabOrder(anOkBtn, aCancelBtn); + } + } +} + +const QList& XGUI_PropertyPanel::modelWidgets() const +{ + return myWidgets; } QWidget* XGUI_PropertyPanel::contentWidget() @@ -70,11 +134,87 @@ QWidget* XGUI_PropertyPanel::contentWidget() return myCustomWidget; } -void XGUI_PropertyPanel::updateContentWidget(boost::shared_ptr theFeature) +void XGUI_PropertyPanel::updateContentWidget(FeaturePtr theFeature) { - foreach(ModuleBase_ModelWidget* eachWidget, myWidgets) { - eachWidget->restoreValue(theFeature); + // Invalid feature case on abort of the operation + if(!theFeature->data()) + return; + foreach(ModuleBase_ModelWidget* eachWidget, myWidgets) + { + eachWidget->setFeature(theFeature); + eachWidget->restoreValue(); } - // the repaint is used here to immediatelly react in GUI to the values change. + // the repaint is used here to immediately react in GUI to the values change. repaint(); } + +void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget) +{ + // TO CHECK: Editing operation does not have automatical activation of widgets + if (isEditingMode()) { + activateWidget(NULL); + return; + } + ModuleBase_ModelWidget* aNextWidget = 0; + QList::const_iterator anIt = myWidgets.begin(), aLast = myWidgets.end(); + bool isFoundWidget = false; + for (; anIt != aLast && !aNextWidget; anIt++) { + if (isFoundWidget || !theWidget) { + if ((*anIt)->focusTo()) { + aNextWidget = *anIt; + } + } + isFoundWidget = (*anIt) == theWidget; + } + // Normaly focusTo is enough to activate widget + // here is a special case on mouse click in the viewer + //if(aNextWidget == NULL) { + activateWidget(aNextWidget); + //} +} + +void XGUI_PropertyPanel::setStretchEnabled(bool isEnabled) +{ + if (myMainLayout->count() == 0) + return; + int aStretchIdx = myMainLayout->count() - 1; + bool hasStretch = myMainLayout->itemAt(aStretchIdx)->spacerItem() != NULL; + QLayoutItem* aChild; + if (isEnabled) { + if (!hasStretch) myMainLayout->addStretch(1); + } else if (hasStretch) { + aChild = myMainLayout->takeAt(aStretchIdx); + delete aChild; + } +} + +void XGUI_PropertyPanel::activateNextWidget() +{ + activateNextWidget(myActiveWidget); +} + +void XGUI_PropertyPanel::setAcceptEnabled(bool isEnabled) +{ + QPushButton* anOkBtn = findChild(PROP_PANEL_OK); + anOkBtn->setEnabled(isEnabled); +} + +void XGUI_PropertyPanel::activateWidget(ModuleBase_ModelWidget* theWidget) +{ + // Avoid activation of already actve widget. It could happen on focusIn event many times + if (theWidget == myActiveWidget) + return; + if(myActiveWidget) { + myActiveWidget->deactivate(); + myActiveWidget->setHighlighted(false); + } + if(theWidget) { + theWidget->activate(); + theWidget->setHighlighted(true); + } + myActiveWidget = theWidget; + if (myActiveWidget) + emit widgetActivated(theWidget); + else if (!isEditingMode()) + emit noMoreWidgets(); +}