X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModuleBase%2FModuleBase_PageBase.cpp;h=daf1bd034e5dbf61f8b64047e6d61f51659e161b;hb=423f6b0a08a86d5e47115b87603cddeae4468b49;hp=5adaebf34b668d7f365c883dae5cdeaef8d90488;hpb=3baa523772616910e6fb91a52306e7cb2d9e9468;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_PageBase.cpp b/src/ModuleBase/ModuleBase_PageBase.cpp
index 5adaebf34..daf1bd034 100644
--- a/src/ModuleBase/ModuleBase_PageBase.cpp
+++ b/src/ModuleBase/ModuleBase_PageBase.cpp
@@ -1,3 +1,4 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 /*
  * ModuleBase_PageBase.cpp
  *
@@ -22,6 +23,11 @@ ModuleBase_PageBase::~ModuleBase_PageBase()
 
 }
 
+QWidget* ModuleBase_PageBase::pageWidget()
+{
+  return dynamic_cast<QWidget*>(this);
+}
+
 void ModuleBase_PageBase::addModelWidget(ModuleBase_ModelWidget* theWidget)
 {
   placeModelWidget(theWidget);
@@ -33,22 +39,75 @@ void ModuleBase_PageBase::addPageWidget(ModuleBase_PageBase* thePage)
   placePageWidget(thePage);
 }
 
+void ModuleBase_PageBase::addWidget(QWidget* theWidget)
+{
+  placeWidget(theWidget);
+}
+
 void ModuleBase_PageBase::clearPage()
 {
-  qDeleteAll(pageLayout()->children());
   myWidgetList.clear();
+
+  QLayoutItem *aChild;
+  while ((aChild = pageLayout()->takeAt(0)) != 0) {
+    if(aChild->widget()) {
+      delete aChild->widget();
+    } else {
+      delete aChild;
+    }
+  }
+
+  // Issue #460: this patch is necessary since the row stretch information
+  // is stored independently on the items: when the items are removed
+  // from the layout the stretch information is kept, so in the next
+  // filling of the layout some "additional" (old) rows may be stretched
+  // without necessity.
+  // In this patch we clear the stretch information specifying the default value: 0.
+  QGridLayout* aLayout = dynamic_cast<QGridLayout*>( pageLayout() );
+  if( aLayout )
+  {
+    int r = aLayout->rowCount();
+    for( int i=0; i<r; i++ )
+      aLayout->setRowStretch( i, 0 );
+  }
 }
 
 
-void ModuleBase_PageBase::takeFocus()
+bool ModuleBase_PageBase::takeFocus()
 {
   if(myWidgetList.isEmpty())
-    return;
+    return false;
 
-  myWidgetList.first()->focusTo();
+  return myWidgetList.first()->focusTo();
 }
 
-QList<ModuleBase_ModelWidget*> ModuleBase_PageBase::modelWidgets()
+QList<ModuleBase_ModelWidget*> ModuleBase_PageBase::modelWidgets() const
 {
   return myWidgetList;
 }
+
+void ModuleBase_PageBase::alignToTop()
+{
+  bool hasExpanding = false;
+  QList<QWidget *> aListToCheck;
+  ModuleBase_ModelWidget* aModelWidget;
+  foreach(aModelWidget, myWidgetList) {
+    aListToCheck << aModelWidget->getControls();
+  }
+  foreach(QWidget* eachWidget, aListToCheck) {
+    QSizePolicy::Policy aVPolicy = eachWidget->sizePolicy().verticalPolicy();
+    if(aVPolicy & QSizePolicy::ExpandFlag) {
+      hasExpanding = true;
+      break;
+    }
+  }
+  if(!hasExpanding) {
+    addPageStretch();
+  }
+}
+
+void ModuleBase_PageBase::placePageWidget(ModuleBase_PageBase* theWidget)
+{
+  QWidget* aWidget = dynamic_cast<QWidget*>(theWidget);
+  placeWidget(aWidget);
+}