Parameters dependencies

diff --git a/src/Notebook/SALOME_Notebook.cxx b/src/Notebook/SALOME_Notebook.cxx
index fb4e59aae6f81a43fd5ef1d85cc8237f5f1eec4e..52f978845fa9d7924b871880b6fb201f0e38f071 100644 (file)
--- a/src/Notebook/SALOME_Notebook.cxx
+++ b/src/Notebook/SALOME_Notebook.cxx
@@ -1072,9 +1072,10 @@ void SALOME_Notebook::ThrowError( const std::string& theErrorMsg ) const
   throw anError;
 }
 
-char* SALOME_Notebook::GetParameters( const char* theComponent, const char* theEntry )
+SALOME::StringArray* SALOME_Notebook::GetObjectParameters( const char* theComponent, const char* theEntry )
 {
-  std::string aRes, aKey = GetKey( theComponent, theEntry ), aComponent, aName;
+  std::list<std::string> aDeps;
+  std::string aKey = GetKey( theComponent, theEntry ), aComponent, aName;
   std::map< std::string, std::list<std::string> >::const_iterator it = myDependencies.find( aKey );
   if( it!=myDependencies.end() )
   {
@@ -1083,15 +1084,16 @@ char* SALOME_Notebook::GetParameters( const char* theComponent, const char* theE
     {
       aComponent = GetComponent( *dit, aName );
       if( aComponent==PARAM_COMPONENT )
-      {
-        if( aRes.length() > 0 )
-          aRes += ", ";
-        aRes += aName;
-      }
+        aDeps.push_back( aName );
     }
   }
 
-  return CORBA::string_dup( aRes.c_str() );
+  return GenerateList( aDeps );
+}
+
+SALOME::StringArray* SALOME_Notebook::GetParameters( const char* theParamName )
+{
+  return GetObjectParameters( PARAM_COMPONENT.c_str(), theParamName );
 }
 
 int SALOME_Notebook::GetNewId()
@@ -1190,17 +1192,18 @@ void SALOME_Notebook::ParseOldStyleObject( const std::string& theComponent, cons
 void SALOME_Notebook::RebuildLinks()
 {
   printf( "Rebuild links\n" );
-}
 
-SALOME::StringArray* SALOME_Notebook::GetParametersDependingOn( const char* theParamName )
-{
-  std::list<std::string> aParamsDeps;
-  std::list<std::string> aDeps = GetAllDependingOn( GetKey( theParamName ) );
-  std::list<std::string>::const_iterator it = aDeps.begin(), last = aDeps.end();
-  std::string aName;
+  std::list<std::string> aNewEntriesToRebuild;
+  std::list<std::string>::const_iterator it = myEntriesToRebuild.begin(), last = myEntriesToRebuild.end();
   for( ; it!=last; it++ )
-    if( GetComponent( *it, aName ) == PARAM_COMPONENT )
-      aParamsDeps.push_back( aName );
+  {
+    /*SALOMEDS::SObject_var anObj = myStudy->FindObjectID( *it );
+    if( !CORBA::is_nil( anObj ) )
+    {
+      SALOMEDS::GenericAttribute anAttr;
+    }
+    aNewEntriesToRebuild.push_back( *it );*/
+  }
 
-  return GenerateList( aParamsDeps );
+  myEntriesToRebuild = aNewEntriesToRebuild;
 }

diff --git a/src/Notebook/SALOME_Notebook.hxx b/src/Notebook/SALOME_Notebook.hxx
index 203117b62f5ec66250e0e2107c9510bb2c56c23e..7d7f1f46fec1ccf23011aad0d26231479552f6ad 100644 (file)
--- a/src/Notebook/SALOME_Notebook.hxx
+++ b/src/Notebook/SALOME_Notebook.hxx
@@ -76,8 +76,8 @@ public:
   virtual CORBA::Boolean       Load( const char* theFileName );
   virtual char*                DumpPython();
   virtual char*                Dump();
-  virtual char*                GetParameters( const char* theComponent, const char* theEntry );
-  virtual SALOME::StringArray* GetParametersDependingOn( const char* theParamName );
+  virtual SALOME::StringArray* GetObjectParameters( const char* theComponent, const char* theEntry );
+  virtual SALOME::StringArray* GetParameters( const char* theParamName );
 
   SALOME_Parameter* GetParameterPtr( const char* theParamName ) const;
   void              UpdateAnonymous( const std::string& theOldName, const std::string& theNewName );