- TCollection_ExtendedString aType = it.Key();
- TCollection_ExtendedString aLine = TCollection_ExtendedString( '\"' ) + aType + TCollection_ExtendedString( '\"' ) +
- TCollection_ExtendedString( ' ' ) + TCollection_ExtendedString( it.Value() );
- Standard_PCharacter aBuf = (Standard_PCharacter)malloc( aLine.LengthOfCString() + 1 );
- aStream.write( aBuf, aLine.ToUTF8CString( aBuf ) );
-
- QString aColor = QString::number( aMap->GetInteger( aType ), 16 );
- QString anAttrValue = toQString( aMap->GetString( aType ) );
-
- aStream << " " << aColor.toStdString() << " " << anAttrValue.toStdString();
- aStream.write( "\r\n", 2 );
- free( aBuf );
+ TCollection_ExtendedString aTypeExt = HYDROData_Tool::toExtString( aType );
+
+ aStream << "\"" << aType << "\" " << Get( aType, 0.0 );
+
+ QString aColor = QString::number( aMap->GetInteger( aTypeExt ), 16 ).toUpper();
+ aColor = QString( 6-aColor.length(), '0' ) + aColor;
+ QString anAttrValue = HYDROData_Tool::toQString( aMap->GetString( aTypeExt ) );
+
+ aStream << " " << aColor;
+ if( !anAttrValue.isEmpty() )
+ aStream << " " << anAttrValue;
+ aStream << "\n";