X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_PropertyPanel.cpp;h=94712d811a10ed6f52df4a2fb43c0a8586d70d40;hb=94ba553e7b92f11a936e027b49bbd1d501eeee44;hp=83de5b27d792671585cfa538f5340433a05686be;hpb=49542ab918c826db5c10abda5be3787937113d94;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_PropertyPanel.cpp b/src/XGUI/XGUI_PropertyPanel.cpp
index 83de5b27d..94712d811 100644
--- a/src/XGUI/XGUI_PropertyPanel.cpp
+++ b/src/XGUI/XGUI_PropertyPanel.cpp
@@ -5,8 +5,9 @@
  *      Author: sbh
  */
 
-#include <XGUI_Constants.h>
 #include <XGUI_PropertyPanel.h>
+#include <XGUI_Constants.h>
+#include <ModuleBase_WidgetPoint2D.h>
 
 #include <QWidget>
 #include <QVBoxLayout>
@@ -22,6 +23,8 @@
 #endif
 
 XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent)
+    : ModuleBase_IPropertyPanel(theParent), 
+    myActiveWidget(NULL)
 {
   this->setWindowTitle(tr("Property Panel"));
   QAction* aViewAct = this->toggleViewAction();
@@ -49,19 +52,17 @@ XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent)
   aBtn->setToolTip(tr("Ok"));
   aBtn->setFlat(true);
   aBtnLay->addWidget(aBtn);
-  aBtn->installEventFilter(this);
 
   aBtn = new QPushButton(QIcon(":pictures/button_cancel.png"), "", aFrm);
   aBtn->setToolTip(tr("Cancel"));
   aBtn->setObjectName(XGUI::PROP_PANEL_CANCEL);
   aBtn->setFlat(true);
+  aBtn->setShortcut(QKeySequence(Qt::Key_Escape));
   aBtnLay->addWidget(aBtn);
 
   myCustomWidget = new QWidget(aContent);
   myMainLayout->addWidget(myCustomWidget);
   myMainLayout->addStretch(1);
-
-  aBtn->installEventFilter(this);
 }
 
 XGUI_PropertyPanel::~XGUI_PropertyPanel()
@@ -71,66 +72,49 @@ XGUI_PropertyPanel::~XGUI_PropertyPanel()
 void XGUI_PropertyPanel::cleanContent()
 {
   myWidgets.clear();
-  
-  QLayoutItem* aItem = myMainLayout->takeAt(myMainLayout->count() - 1);
-  delete aItem;
-
-  myMainLayout->removeWidget(myCustomWidget);
-  delete myCustomWidget;
-
-  myCustomWidget = new QWidget(widget());
-  myMainLayout->addWidget(myCustomWidget);
-  myMainLayout->addStretch(1);
+  qDeleteAll(myCustomWidget->children());
+  myActiveWidget = NULL;
 }
 
 void XGUI_PropertyPanel::setModelWidgets(const QList<ModuleBase_ModelWidget*>& theWidgets)
 {
   myWidgets = theWidgets;
+  int aS = myWidgets.size();
+  if (theWidgets.empty()) return;
+
+  QList<ModuleBase_ModelWidget*>::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<ModuleBase_WidgetPoint2D*>(*anIt);
+    if (aPointWidget)
+      connect(aPointWidget, SIGNAL(storedPoint2D(ObjectPtr, const std::string&)), this,
+              SIGNAL(storedPoint2D(ObjectPtr, const std::string&)));
+  }
+  ModuleBase_ModelWidget* aLastWidget = theWidgets.last();
+  if (aLastWidget) {
+    QList<QWidget*> aControls = aLastWidget->getControls();
+    if (!aControls.empty()) {
+      QWidget* aLastControl = aControls.last();
 
-  if (!theWidgets.empty()) {
-    QList<ModuleBase_ModelWidget*>::const_iterator anIt = theWidgets.begin(), aLast = theWidgets.end();
-    for (; anIt != aLast; anIt++) {
-      connect(*anIt, SIGNAL(keyReleased(const std::string&, QKeyEvent*)),
-              this, SIGNAL(keyReleased(const std::string&, QKeyEvent*)));
-
-      connect(*anIt, SIGNAL(focusOutWidget(ModuleBase_ModelWidget*)),
-              this, SLOT(onActivateNextWidget(ModuleBase_ModelWidget*)));
-    }
-    ModuleBase_ModelWidget* aLastWidget = theWidgets.last();
-    if (aLastWidget) {
-      QList<QWidget*> aControls = aLastWidget->getControls();
-      if (!aControls.empty()) {
-        QWidget* aLastControl = aControls.last();
-
-        QPushButton* anOkBtn = findChild<QPushButton*>(XGUI::PROP_PANEL_OK);
-        QPushButton* aCancelBtn = findChild<QPushButton*>(XGUI::PROP_PANEL_CANCEL);
+      QPushButton* anOkBtn = findChild<QPushButton*>(XGUI::PROP_PANEL_OK);
+      QPushButton* aCancelBtn = findChild<QPushButton*>(XGUI::PROP_PANEL_CANCEL);
 
-        setTabOrder(aLastControl, anOkBtn);
-        setTabOrder(anOkBtn, aCancelBtn);
-      }
-    }
-    ModuleBase_ModelWidget* aWidget = theWidgets.first();
-    if (aWidget) {
-      activateWidget(aWidget);
+      setTabOrder(aLastControl, anOkBtn);
+      setTabOrder(anOkBtn, aCancelBtn);
     }
   }
 }
 
-bool XGUI_PropertyPanel::eventFilter(QObject *theObject, QEvent *theEvent)
+const QList<ModuleBase_ModelWidget*>& XGUI_PropertyPanel::modelWidgets() const
 {
-  QPushButton* anOkBtn = findChild<QPushButton*>(XGUI::PROP_PANEL_OK);
-  QPushButton* aCancelBtn = findChild<QPushButton*>(XGUI::PROP_PANEL_CANCEL);
-  if (theObject == anOkBtn || theObject == aCancelBtn) {
-    if (theEvent->type() == QEvent::KeyRelease) {
-      QKeyEvent* aKeyEvent = (QKeyEvent*)theEvent;
-      if (aKeyEvent && aKeyEvent->key() == Qt::Key_Return) {
-        // TODO: this is enter button processing when the focus is on "Apply" or "Cancel" buttons
-        emit keyReleased("", (QKeyEvent*) theEvent);
-        return true;
-      }
-    }
-  }
-  return QDockWidget::eventFilter(theObject, theEvent);
+  return myWidgets;
 }
 
 QWidget* XGUI_PropertyPanel::contentWidget()
@@ -140,54 +124,54 @@ QWidget* XGUI_PropertyPanel::contentWidget()
 
 void XGUI_PropertyPanel::updateContentWidget(FeaturePtr theFeature)
 {
-  foreach(ModuleBase_ModelWidget* eachWidget, myWidgets) {
-    eachWidget->restoreValue(theFeature);
+  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::onFocusActivated(const std::string& theAttributeName)
+void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget)
 {
-  if (theAttributeName == XGUI::PROP_PANEL_OK) {
-    QPushButton* aBtn = findChild<QPushButton*>(XGUI::PROP_PANEL_OK);
-    aBtn->setFocus();
-  }
-  if (theAttributeName == XGUI::PROP_PANEL_CANCEL) {
-    QPushButton* aBtn = findChild<QPushButton*>(XGUI::PROP_PANEL_CANCEL);
-    aBtn->setFocus();
-  }
-  else {
-    foreach(ModuleBase_ModelWidget* eachWidget, myWidgets) {
-      if (eachWidget->canFocusTo(theAttributeName)) {
-        eachWidget->focusTo();
-        break;
+  ModuleBase_ModelWidget* aNextWidget = 0;
+  QList<ModuleBase_ModelWidget*>::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(NULL);
   }
 }
 
-void XGUI_PropertyPanel::onActivateNextWidget(ModuleBase_ModelWidget* theWidget)
+void XGUI_PropertyPanel::activateNextWidget()
 {
-  ModuleBase_ModelWidget* aNextWidget = 0;
+  activateNextWidget(myActiveWidget);
+}
 
-  QList<ModuleBase_ModelWidget*>::const_iterator anIt = myWidgets.begin(),
-                                                 aLast = myWidgets.end();
-  for (;anIt != aLast; anIt++)
-  {
-    if ((*anIt) == theWidget) {
-      anIt++;
-      if (anIt != aLast)
-        aNextWidget = *anIt;
-      break;
-    }
-  }
-  activateWidget(aNextWidget);
+void XGUI_PropertyPanel::setAcceptEnabled(bool isEnabled)
+{
+  QPushButton* anOkBtn = findChild<QPushButton*>(XGUI::PROP_PANEL_OK);
+  anOkBtn->setEnabled(isEnabled);
 }
 
 void XGUI_PropertyPanel::activateWidget(ModuleBase_ModelWidget* theWidget)
 {
-  if (theWidget)
-    theWidget->focusTo();
+  if(myActiveWidget) {
+    myActiveWidget->setHighlighted(false);
+  }
+  if(theWidget) {
+    theWidget->setHighlighted(true);
+  }
+  myActiveWidget = theWidget;
   emit widgetActivated(theWidget);
 }