Image data storing corrected (Bug #177).

[modules/hydro.git] / src / HYDROData / HYDROData_Image.cxx

diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx
index 05bb314ca0848d97fbe9a91311de37d7a3f5a2d1..e589ae9cbec11205a3d233c17013a183b29f6820 100644 (file)
--- a/src/HYDROData/HYDROData_Image.cxx
+++ b/src/HYDROData/HYDROData_Image.cxx
@@ -11,7 +11,6 @@
 #include <TDataStd_Integer.hxx>
 #include <TDataStd_IntegerArray.hxx>
 #include <TDataStd_ReferenceList.hxx>
-#include <TDataStd_Name.hxx>
 #include <TDataStd_UAttribute.hxx>
 #include <TDataStd_AsciiString.hxx>
 
@@ -285,9 +284,13 @@ QString HYDROData_Image::GetFilePath() const
 {
   QString aRes;
 
-  Handle(TDataStd_AsciiString) anAsciiStr;
-  if ( myLab.FindChild( DataTag_FilePath ).FindAttribute( TDataStd_AsciiString::GetID(), anAsciiStr ) )
-    aRes = QString( anAsciiStr->Get().ToCString() );
+  TDF_Label aLabel = myLab.FindChild( DataTag_FilePath, false );
+  if ( !aLabel.IsNull() )
+  {
+    Handle(TDataStd_AsciiString) anAsciiStr;
+    if ( aLabel.FindAttribute( TDataStd_AsciiString::GetID(), anAsciiStr ) )
+      aRes = QString( anAsciiStr->Get().ToCString() );
+  }
 
   return aRes;
 }
@@ -713,21 +716,25 @@ void HYDROData_Image::ClearReferences()
   ClearReferenceObjects( 0 );
 }
 
-void HYDROData_Image::SetOperatorName(const QString theOpName)
+void HYDROData_Image::SetOperatorName( const QString theOpName )
 {
-  TDataStd_Name::Set(myLab.FindChild(DataTag_Operator),
-    TCollection_ExtendedString(theOpName.toLatin1().constData()));
+  TCollection_AsciiString anAsciiStr( theOpName.toStdString().c_str() );
+  TDataStd_AsciiString::Set( myLab.FindChild( DataTag_Operator ), anAsciiStr );
 }
 
 QString HYDROData_Image::OperatorName() const
 {
-  Handle(TDataStd_Name) aName;
-  if (myLab.FindChild(DataTag_Operator).
-        FindAttribute(TDataStd_Name::GetID(), aName)) {
-    TCollection_AsciiString aStr(aName->Get());
-    return QString(aStr.ToCString());
+  QString aRes;
+
+  TDF_Label aLabel = myLab.FindChild( DataTag_Operator, false );
+  if ( !aLabel.IsNull() )
+  {
+    Handle(TDataStd_AsciiString) anAsciiStr;
+    if ( aLabel.FindAttribute( TDataStd_AsciiString::GetID(), anAsciiStr ) )
+      aRes = QString( anAsciiStr->Get().ToCString() );
   }
-  return QString();
+
+  return aRes;
 }
 
 void HYDROData_Image::SetArgs(const QByteArray& theArgs)