X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_PagedContainer.cpp;h=b659b82c285a66bed2455987ca2ebe63ec396b82;hb=77ce6d35ac8d2f0fdaecb4f23e0870bf74e36103;hp=27c685f8b3bfe7e3d0923ac681f292e3452816a0;hpb=fd3d6a691feb0305f22c8c56debe7f66035452d1;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_PagedContainer.cpp b/src/ModuleBase/ModuleBase_PagedContainer.cpp
index 27c685f8b..b659b82c2 100644
--- a/src/ModuleBase/ModuleBase_PagedContainer.cpp
+++ b/src/ModuleBase/ModuleBase_PagedContainer.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2024  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,9 @@
 //
 // 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
+// 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>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include <ModuleBase_PagedContainer.h>
@@ -35,13 +34,13 @@ static QMap<std::string, std::string> defaultValues;
 ModuleBase_PagedContainer::ModuleBase_PagedContainer(QWidget* theParent,
                                                      const Config_WidgetAPI* theData)
 : ModuleBase_ModelWidget(theParent, theData),
-  myIsFocusOnCurrentPage(false), myIsFirst(true)
+  myRemeberChoice(true), myIsFocusOnCurrentPage(false)
 {
   // it is not obligatory to be ignored when property panel tries to activate next active widget
   // but if focus is moved to this control, it can accept it.
   myIsObligatory = false;
-  if (defaultValues.contains(myFeatureId))
-    myDefValue = defaultValues[myFeatureId];
+  if (defaultValues.contains(myFeatureId + attributeID()))
+    myDefValue = defaultValues[myFeatureId + attributeID()];
 }
 
 ModuleBase_PagedContainer::~ModuleBase_PagedContainer()
@@ -49,8 +48,10 @@ ModuleBase_PagedContainer::~ModuleBase_PagedContainer()
 }
 
 int ModuleBase_PagedContainer::addPage(ModuleBase_PageBase* thePage,
-                                      const QString& theName, const QString& theCaseId,
-                                      const QPixmap& theIcon )
+                                       const QString& /*theName*/,
+                                       const QString& theCaseId,
+                                       const QPixmap& /*theIcon*/,
+                                       const QString& /*theTooltip*/)
 {
   if (!myPages.count()) {
     setDefaultValue(theCaseId.toStdString());
@@ -95,15 +96,29 @@ bool ModuleBase_PagedContainer::restoreValueCustom()
   // A rare case when plugin was not loaded.
   if(!myFeature)
     return false;
+
+  std::string aDefVal = myRemeberChoice? myDefValue : "";
+
   DataPtr aData = myFeature->data();
   AttributeStringPtr aStringAttr = aData->string(attributeID());
-  QString aCaseId = QString::fromStdString(myDefValue.empty()?
-                                           aStringAttr->value() : myDefValue);
-  myIsFirst = false;
-  int idx = myCaseIds.indexOf(aCaseId);
-  if (idx == -1)
-    idx = currentPageIndex();
-  setCurrentPageIndex(idx);
+  QString aCaseId;
+  if (aStringAttr->isInitialized()) {
+    aCaseId = QString::fromStdString(aStringAttr->value());
+    int idx = myCaseIds.indexOf(aCaseId);
+    if (idx == -1)
+      idx = currentPageIndex();
+    setCurrentPageIndex(idx);
+    if (aStringAttr->value() != aCaseId.toStdString())
+      storeValueCustom();
+  }
+  else {
+    // It is added because if user edits the feature created from Python
+    // and switches his choice
+    // it will not be stored in the attribute while apply not pressed.
+    // But this button will be disabled because of not initialized attribute
+    aStringAttr->setValue(myCaseIds.at(0).toStdString());
+    setCurrentPageIndex(0);
+  }
   return true;
 }
 
@@ -122,7 +137,7 @@ bool ModuleBase_PagedContainer::storeValueCustom()
 
   AttributeStringPtr aStringAttr = aData->string(attributeID());
   std::string aWidgetValue;
-  if (myIsFirst)
+  if (!aStringAttr->isInitialized())
     aWidgetValue = myDefValue.empty()?
         myCaseIds.at(currentPageIndex()).toStdString() : myDefValue;
   else
@@ -130,8 +145,6 @@ bool ModuleBase_PagedContainer::storeValueCustom()
   myDefValue = aWidgetValue;
   aStringAttr->setValue(aWidgetValue);
 
-  myIsFirst = false;
-
   updateObject(myFeature); // for preview
   return true;
 }
@@ -150,6 +163,7 @@ void ModuleBase_PagedContainer::onPageChanged()
 
 void ModuleBase_PagedContainer::onFeatureAccepted()
 {
-  defaultValues[myFeatureId] = myDefValue;
+  if (myRemeberChoice)
+    defaultValues[myFeatureId + attributeID()] = myDefValue;
 }