Merge branch 'Dev_1.2.0' of newgeom:newgeom.git into Dev_1.2.0

[modules/shaper.git] / src / ModuleBase / ModuleBase_WidgetToolbox.cpp

diff --git a/src/ModuleBase/ModuleBase_WidgetToolbox.cpp b/src/ModuleBase/ModuleBase_WidgetToolbox.cpp
index 616a5c357972c3468911cdf69d6017799ec64d66..6a16aa3d2647d6d4057e6352971f686ad02e1a06 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetToolbox.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetToolbox.cpp
@@ -7,16 +7,18 @@
 
 #include <ModuleBase_WidgetToolbox.h>
 #include <ModuleBase_PageBase.h>
+#include <ModuleBase_ModelWidget.h>
 #include <ModuleBase_Tools.h>
 
 #include <ModelAPI_AttributeString.h>
 
 #include <QWidget>
+#include <QList>
 #include <QVBoxLayout>
 
 ModuleBase_WidgetToolbox::ModuleBase_WidgetToolbox(QWidget* theParent, const Config_WidgetAPI* theData,
                                                    const std::string& theParentId)
-: ModuleBase_ModelWidget(theParent, theData, theParentId)
+: ModuleBase_PagedContainer(theParent, theData, theParentId)
 {
   QVBoxLayout* aMainLayout = new QVBoxLayout(this);
   ModuleBase_Tools::zeroMargins(aMainLayout);
@@ -41,67 +43,24 @@ ModuleBase_WidgetToolbox::~ModuleBase_WidgetToolbox()
 int ModuleBase_WidgetToolbox::addPage(ModuleBase_PageBase* thePage,
                                       const QString& theName, const QString& theCaseId)
 {
-  myCaseIds << theCaseId;
-  myPages << thePage;
+  ModuleBase_PagedContainer::addPage(thePage, theName, theCaseId);
   QFrame* aFrame = dynamic_cast<QFrame*>(thePage);
   aFrame->setFrameShape(QFrame::Box);
   aFrame->setFrameStyle(QFrame::Sunken);
-  return myToolBox->addItem(aFrame, theName);
+  myToolBox->addItem(aFrame, theName);
+  return myToolBox->count();
 }
 
-bool ModuleBase_WidgetToolbox::restoreValue()
+int ModuleBase_WidgetToolbox::currentPageIndex() const
 {
-  // A rare case when plugin was not loaded.
-  if(!myFeature)
-    return false;
-  DataPtr aData = myFeature->data();
-  AttributeStringPtr aStringAttr = aData->string(attributeID());
-  QString aCaseId = QString::fromStdString(aStringAttr->value());
-  int idx = myCaseIds.indexOf(aCaseId);
-  if (idx == -1)
-    return false;
-  bool isSignalsBlocked = myToolBox->blockSignals(true);
-  myToolBox->setCurrentIndex(idx);
-  myToolBox->blockSignals(isSignalsBlocked);
-  focusTo();
-  return true;
-}
-
-QList<QWidget*> ModuleBase_WidgetToolbox::getControls() const
-{
-  QList<QWidget*> aList;
-  aList << myToolBox;
-  return aList;
-}
-
-bool ModuleBase_WidgetToolbox::focusTo()
-{
-  int idx = myToolBox->currentIndex();
-  if (idx > myPages.count())
-    return false;
-  myPages[idx]->takeFocus();
-  repaint();
-  return true;
+  return myToolBox->currentIndex();
 }
 
-void ModuleBase_WidgetToolbox::activateCustom()
+void ModuleBase_WidgetToolbox::setCurrentPageIndex(int theIndex)
 {
+  bool isSignalsBlocked = myToolBox->blockSignals(true);
+  myToolBox->setCurrentIndex(theIndex);
+  myToolBox->blockSignals(isSignalsBlocked);
 }
 
-bool ModuleBase_WidgetToolbox::storeValueCustom() const
-{
-  // A rare case when plugin was not loaded.
-  if(!myFeature)
-    return false;
-  DataPtr aData = myFeature->data();
-  AttributeStringPtr aStringAttr = aData->string(attributeID());
-  QString aWidgetValue = myCaseIds.at(myToolBox->currentIndex());
-  aStringAttr->setValue(aWidgetValue.toStdString());
-  return true;
-}
 
-void ModuleBase_WidgetToolbox::onPageChanged()
-{
-  storeValue();
-  focusTo();
-}