NPAL15647: EDF403: TUI: restoreVisualState is not working.

diff --git a/src/SUIT/SUIT_Study.cxx b/src/SUIT/SUIT_Study.cxx
index a3baef3ce8bc7dfa153cea62db34b2e91c3cd4a4..19dabb03be905e1f7af958e840b0e305adfad8e0 100755 (executable)
--- a/src/SUIT/SUIT_Study.cxx
+++ b/src/SUIT/SUIT_Study.cxx
@@ -511,18 +511,12 @@ bool SUIT_Study::hasTransaction() const
 {
   return false;
 }
-
-/*!
- * \brief Stores the study state
-*/
-int SUIT_Study::storeState()
-{
-  return -1;
-}
  
 /*!
- * \brief Restores the study state
-*/
+ * \brief Restores the study state.
+ */
 void SUIT_Study::restoreState(int savePoint)
 {
+  // Redefined in SalomeApp_Study.
+  // Called from SALOME_Session_i::restoreVisualState(CORBA::Long theSavePoint)
 }

diff --git a/src/SUIT/SUIT_Study.h b/src/SUIT/SUIT_Study.h
index 156c6bc74df61f24a70f95fe04b46b75bd69e98a..fc6c35f0c26a746643baf4dd6e457021a1ec31b1 100755 (executable)
--- a/src/SUIT/SUIT_Study.h
+++ b/src/SUIT/SUIT_Study.h
@@ -75,7 +75,6 @@ public:
   bool              suspend( SUIT_Operation* );
   bool              resume( SUIT_Operation* );
 
-  virtual int       storeState();
   virtual void      restoreState(int savePoint);
 
 signals:

diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx
index 6852b26db84706816c3595318eb796c39c43c738..0ca7fa26a7686f0494d8df321202b8423d5705fa 100644 (file)
--- a/src/SalomeApp/SalomeApp_Study.cxx
+++ b/src/SalomeApp/SalomeApp_Study.cxx
@@ -727,6 +727,15 @@ std::string SalomeApp_Study::getVisualComponentName()
   return "Interface Applicative";
 }
 
+/*!
+ * \brief Restores the study state
+ */
+void SalomeApp_Study::restoreState(int savePoint)
+{
+  SalomeApp_VisualState((SalomeApp_Application*)application()).restoreState(savePoint);
+}
+
+
 /*!
   Slot: called on change of a root of a data model. Redefined from CAM_Study
 */

diff --git a/src/SalomeApp/SalomeApp_Study.h b/src/SalomeApp/SalomeApp_Study.h
index ef5c127fd11caa68c3007ae77ed3723351d8ab8f..707518a378180e41bf2860cf96b935ae33012591 100644 (file)
--- a/src/SalomeApp/SalomeApp_Study.h
+++ b/src/SalomeApp/SalomeApp_Study.h
@@ -73,6 +73,8 @@ public:
   void                setNameOfSavePoint(int savePoint, const QString& nameOfSavePoint);
   virtual std::string getVisualComponentName();
 
+  virtual void        restoreState(int savePoint);
+
 protected:
   virtual void        saveModuleData ( QString theModuleName, QStringList theListOfFiles );
   virtual void        openModuleData ( QString theModuleName, QStringList& theListOfFiles );