Merge branch 'master' into BR_quadtree

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

diff --git a/src/HYDROData/HYDROData_Entity.cxx b/src/HYDROData/HYDROData_Entity.cxx
index 7857cbc7f10141e5be65fb8a30e687ea69d0444d..db2a8cdc4be7e353ace80a76cfcf436e59488a8a 100644 (file)
--- a/src/HYDROData/HYDROData_Entity.cxx
+++ b/src/HYDROData/HYDROData_Entity.cxx
@@ -27,6 +27,7 @@
 #include <TDataStd_Integer.hxx>
 #include <TDataStd_IntegerArray.hxx>
 #include <TDataStd_ReferenceList.hxx>
+#include <TDataStd_Real.hxx>
 #include <TDF_CopyLabel.hxx>
 #include <TDF_ListIteratorOfLabelList.hxx>
 #include <TNaming_Builder.hxx>
@@ -37,6 +38,9 @@
 #include <QStringList>
 #include <QVariant>
 
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
 HYDROData_SequenceOfObjects::HYDROData_SequenceOfObjects()
   : NCollection_Sequence<Handle_HYDROData_Entity>()
 {
@@ -52,7 +56,6 @@ HYDROData_SequenceOfObjects::HYDROData_SequenceOfObjects( const NCollection_Sequ
 {
 }
 
-
 IMPLEMENT_STANDARD_HANDLE(HYDROData_Entity,MMgt_TShared)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Entity,MMgt_TShared)
 
@@ -598,9 +601,9 @@ QStringList HYDROData_Entity::dumpObjectCreation( MapOfTreatedObjects& theTreate
   QString aDocName = aDocument->GetDocPyName();
   QString aName = GetObjPyName();
 
-  aResList << QString( "%1 = %2.CreateObject( %3 );" )
+  aResList << QString( "%1 = %2.CreateObject( %3 )" )
               .arg( aName ).arg( aDocName ).arg( getPyTypeID() );
-  aResList << QString( "%1.SetName( \"%2\" );" )
+  aResList << QString( "%1.SetName( \"%2\" )" )
               .arg( aName ).arg( GetName() );
   aResList << QString( "" );
 
@@ -610,7 +613,7 @@ QStringList HYDROData_Entity::dumpObjectCreation( MapOfTreatedObjects& theTreate
     Standard_Integer anObjZLevel = -1;
     if ( GetZLevel( anObjZLevel ) )
     {
-      aResList << QString( "%1.SetZLevel( %2 );" )
+      aResList << QString( "%1.SetZLevel( %2 )" )
                   .arg( aName ).arg( anObjZLevel );
       aResList << QString( "" );
     }
@@ -621,6 +624,7 @@ QStringList HYDROData_Entity::dumpObjectCreation( MapOfTreatedObjects& theTreate
 
 QString HYDROData_Entity::getPyTypeID() const
 {
+  DEBTRACE("HYDROData_Entity::getPyTypeID " << GetKind());
   switch( GetKind() )
   {
     case KIND_IMAGE:             return "KIND_IMAGE";
@@ -645,11 +649,12 @@ QString HYDROData_Entity::getPyTypeID() const
     case KIND_NATURAL_OBJECT:    return "KIND_NATURAL_OBJECT";
     case KIND_DUMMY_3D:          return "KIND_DUMMY_3D";
     case KIND_SHAPES_GROUP:      return "KIND_SHAPES_GROUP";
-    case KIND_SPLITTED_GROUP:    return "KIND_SPLITTED_GROUP";
+    case KIND_SPLIT_GROUP:       return "KIND_SPLIT_GROUP";
     case KIND_STREAM_ALTITUDE:   return "KIND_STREAM_ALTITUDE";
     case KIND_OBSTACLE_ALTITUDE: return "KIND_OBSTACLE_ALTITUDE";
     case KIND_STRICKLER_TABLE:   return "KIND_STRICKLER_TABLE";
     case KIND_LAND_COVER_OBSOLETE: return "";
+    case KIND_CHANNEL_ALTITUDE:  return "KIND_CHANNEL_ALTITUDE";
     case KIND_LAND_COVER_MAP:    return "KIND_LAND_COVER_MAP";
     default:                     return "KIND_UNKNOWN"; ///! Unrecognized object
   }
@@ -667,7 +672,7 @@ void HYDROData_Entity::setPythonReferenceObject( const QString&
   QString aRefObjName = theRefObject->GetObjPyName();
 
   QString anObjName = GetObjPyName();
-  theScript << QString( "%1.%2( %3 );" )
+  theScript << QString( "%1.%2( %3 )" )
                .arg( anObjName ).arg( theMethod ).arg( aRefObjName );
 }
 
@@ -711,7 +716,7 @@ void HYDROData_Entity::setPythonObjectColor( QStringList&         theScript,
     return; //Do not set the color for object if it like default
 
   QString anObjName = GetObjPyName();
-  theScript << QString( "%1.%2( QColor( %3, %4, %5, %6 ) );" )
+  theScript << QString( "%1.%2( QColor( %3, %4, %5, %6 ) )" )
               .arg( anObjName ).arg( theMethod )
               .arg( theColor.red()  ).arg( theColor.green() )
               .arg( theColor.blue() ).arg( theColor.alpha() );
@@ -724,7 +729,7 @@ void HYDROData_Entity::findPythonReferenceObject( MapOfTreatedObjects& theTreate
   if ( aDocument.IsNull() )
     return;
     
-  theScript << QString( "%1 = %2.FindObjectByName( \"%3\" );" ).arg( GetObjPyName() )
+  theScript << QString( "%1 = %2.FindObjectByName( \"%3\" )" ).arg( GetObjPyName() )
                                                                .arg( aDocument->GetDocPyName() )
                                                                .arg( GetName() );
 }
@@ -746,3 +751,22 @@ TopoDS_Shape HYDROData_Entity::GetShape( int theTag ) const
   }
   return TopoDS_Shape();
 }
+
+void HYDROData_Entity::SetDouble( int theTag, double theValue )
+{
+  Handle(TDataStd_Real) anAttr;
+  TDF_Label aLabel = myLab.FindChild( theTag );
+  if( !aLabel.FindAttribute( TDataStd_Real::GetID(), anAttr ) )
+    aLabel.AddAttribute( anAttr = new TDataStd_Real() );
+  anAttr->Set( theValue );
+}
+
+double HYDROData_Entity::GetDouble( int theTag, double theDefValue ) const
+{
+  Handle(TDataStd_Real) anAttr;
+  TDF_Label aLabel = myLab.FindChild( theTag );
+  if( !aLabel.FindAttribute( TDataStd_Real::GetID(), anAttr ) )
+    return theDefValue;
+
+  return anAttr->Get();
+}