Debug

diff --git a/src/SalomeApp/SalomeApp_DataObject.cxx b/src/SalomeApp/SalomeApp_DataObject.cxx
index 7b31a375b0920530507ad659e19861e42dad8035..2a198fb17b6954eab0c172162efd742f4ac4a534 100644 (file)
--- a/src/SalomeApp/SalomeApp_DataObject.cxx
+++ b/src/SalomeApp/SalomeApp_DataObject.cxx
@@ -483,44 +483,21 @@ QString SalomeApp_DataObject::value( const _PTR(SObject)& obj ) const
   {
     _PTR(AttributeString) strAttr = attr;
     std::string str = strAttr->Value();
-    QString aStrings = QString( str.c_str() );
+    val = QString( str.c_str() );
 
     // Special case to show NoteBook variables in the "Value" column of the OB 
-    if( aStrings.contains( ":" ) ) // old format ('var1::var2|var1')
+    if( val.contains( ":" ) ) // old format ('var1::var2|var1')
     {
       if ( LightApp_RootObject* aRoot = dynamic_cast<LightApp_RootObject*>( root() ) )
       {
         if ( SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>( aRoot->study() ) )
         {
           SalomeApp_Notebook aNb( aStudy );
-
-          bool ok = false;
-          QStringList aSectionList = aStrings.split( "|" );
-          if ( !aSectionList.isEmpty() )
-          {
-            QString aLastSection = aSectionList.last();
-            QStringList aStringList = aLastSection.split( ":" );
-            if ( !aStringList.isEmpty() )
-            {
-              ok = true;
-              for ( int i = 0, n = aStringList.size(); i < n; i++ )
-              {
-                QString aStr = aStringList[i];
-                if ( aNb.isParameter( aStr ) )
-                  val.append( aStr + ", " );
-              }
-
-              if ( !val.isEmpty() )
-                val.remove( val.length() - 2, 2 );
-            }
-          }
-          if( !ok )
-            val = aStrings;
+          QStringList aList = aNb.getAttributeParameters( val );
+          val = aList.join( ", " );
         }
       }
     }
-    else // new format ('var1, var2') or single variable in old format
-      val = aStrings;
   }
   else if ( obj->FindAttribute( attr, "AttributeInteger" ) )
   {

diff --git a/src/SalomeApp/SalomeApp_NoteBookDlg.cxx b/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
index 7ef27d96c9393ca1273ea95c918d728f2b498749..f42aa8ac64b89bfcb94b94c075fab9b9b10ec810 100644 (file)
--- a/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
+++ b/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
@@ -713,8 +713,6 @@ void NoteBook_Table::processItemChanged( NoteBook_TableRow* theRow, int theColum
   QString anExpressionPrevious = aVariable.Expression;
   bool isCompletePrevious = !aVariable.Name.isEmpty() && !aVariable.Expression.isEmpty();
 
-  bool isCorrectPrevious = checkRow( theRow );
-
   QString aName = theRow->getVariable();
   QString anExpression = theRow->getExpression();
   bool isComplete = !aName.isEmpty() && !anExpression.isEmpty();
@@ -722,7 +720,7 @@ void NoteBook_Table::processItemChanged( NoteBook_TableRow* theRow, int theColum
   aVariable.Name = aName;
   aVariable.Expression = anExpression;
 
-  if( theColumn == VARIABLE_COLUMN && isCompletePrevious /*&& isCorrectPrevious*/ && aName != aNamePrevious )
+  if( theColumn == VARIABLE_COLUMN && isCompletePrevious && aName != aNamePrevious )
   {
     if( !renameVariable( aNamePrevious, aName ) )
     {

diff --git a/src/SalomeApp/SalomeApp_Notebook.cxx b/src/SalomeApp/SalomeApp_Notebook.cxx
index 89356ca8b01f640e12c2f5f988fd14f675d12614..1470e362a8db20b603e6b9376a4538d8da04e480 100644 (file)
--- a/src/SalomeApp/SalomeApp_Notebook.cxx
+++ b/src/SalomeApp/SalomeApp_Notebook.cxx
@@ -292,6 +292,11 @@ QStringList SalomeApp_Notebook::getParameters( const QString& theParamName ) con
   return convert( myNotebook->GetParameters( theParamName.toLatin1().constData() ) );
 }
 
+QStringList SalomeApp_Notebook::getAttributeParameters( const QString& theStringAttribute ) const
+{
+  return convert( myNotebook->GetAttributeParameters( theStringAttribute.toLatin1().constData() ) );
+}
+
 void SalomeApp_Notebook::setRecentValues( const QMap<QString, bool>& theRecentValues )
 {
   myRecentValues = theRecentValues;

diff --git a/src/SalomeApp/SalomeApp_Notebook.h b/src/SalomeApp/SalomeApp_Notebook.h
index 01301dc2c708b5a95a8a758fe2025404039251f3..0817f6b90745b8a9e70964dd59e25460305b1930 100644 (file)
--- a/src/SalomeApp/SalomeApp_Notebook.h
+++ b/src/SalomeApp/SalomeApp_Notebook.h
@@ -73,6 +73,7 @@ public:
 
   QStringList getObjectParameters( const QString& theComponent, const QString& theEntry ) const;
   QStringList getParameters( const QString& theParamName ) const;
+  QStringList getAttributeParameters( const QString& theStringAttribute ) const;
 
   void setRecentValues( const QMap<QString, bool>& theRecentValues );