Small correction for writing of data to file.

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

diff --git a/src/HYDROData/HYDROData_Polyline.cxx b/src/HYDROData/HYDROData_Polyline.cxx
index 294f0e988e0e20b673786b8eea732d591b53825a..34ebfe25c64a5a22658195e83d5c3b5f85e6092d 100755 (executable)
--- a/src/HYDROData/HYDROData_Polyline.cxx
+++ b/src/HYDROData/HYDROData_Polyline.cxx
@@ -16,12 +16,6 @@
 // tage of the child of my label that contains information about the operator
 static const Standard_GUID GUID_MUST_BE_UPDATED("6647e1f7-1971-4c5a-86c7-11ff0291452d");
 
-#define TAG_POINTS          1
-#define TAG_SECTIONS_NAME   2
-#define TAG_SECTIONS_CLOSED 3
-#define TAG_SECTIONS_SIZE   4
-#define TAG_SECTIONS_TYPE   5
-
 IMPLEMENT_STANDARD_HANDLE(HYDROData_Polyline, HYDROData_Object)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Polyline, HYDROData_Object)
 
@@ -78,19 +72,19 @@ void HYDROData_Polyline::setPolylineData( const QList<PolylineSection>& theSecti
 
   int aPointsCnt = 0;
 
-  TDF_Label aNameLab = myLab.FindChild(TAG_SECTIONS_NAME);
+  TDF_Label aNameLab = myLab.FindChild(DataTag_SectionsName);
   Handle(TDataStd_ExtStringArray) aSectsNameArray;
   aSectsNameArray = TDataStd_ExtStringArray::Set(aNameLab, 0, aSectionsSize-1, false );
 
-  TDF_Label aSizeLab = myLab.FindChild(TAG_SECTIONS_SIZE);
+  TDF_Label aSizeLab = myLab.FindChild(DataTag_SectionsSize);
   Handle(TDataStd_IntegerArray) aSizeArray;
   aSizeArray = TDataStd_IntegerArray::Set(aSizeLab, 0, aSectionsSize-1, false );
 
-  TDF_Label aClosedLab = myLab.FindChild(TAG_SECTIONS_CLOSED);
+  TDF_Label aClosedLab = myLab.FindChild(DataTag_SectionsClosed);
   Handle(TDataStd_BooleanArray) aClosedArray;
   aClosedArray = TDataStd_BooleanArray::Set(aClosedLab, 0, aSectionsSize-1 );
 
-  TDF_Label aTypeLab = myLab.FindChild(TAG_SECTIONS_TYPE);
+  TDF_Label aTypeLab = myLab.FindChild(DataTag_SectionsType);
   Handle(TDataStd_ByteArray) aTypeArray;
   aTypeArray = TDataStd_ByteArray::Set(aTypeLab, 0, aSectionsSize-1, false );
 
@@ -128,7 +122,7 @@ QList<PolylineSection> HYDROData_Polyline::getPolylineData()
   int aSectCnt;
   QList<PolylineSection> aRes;
 //Get sections size array handle
-  TDF_Label aLab = myLab.FindChild( TAG_SECTIONS_SIZE );
+  TDF_Label aLab = myLab.FindChild( DataTag_SectionsSize );
   Handle(TDataStd_IntegerArray) aSizeArray;
   if (!aLab.FindAttribute(TDataStd_IntegerArray::GetID(), aSizeArray))
     return aRes; // return empty if no array
@@ -136,7 +130,7 @@ QList<PolylineSection> HYDROData_Polyline::getPolylineData()
   if( aSectCnt == 0 )
     return aRes;
 //Get section type array handle
-  aLab = myLab.FindChild( TAG_SECTIONS_TYPE );
+  aLab = myLab.FindChild( DataTag_SectionsType );
   Handle(TDataStd_ByteArray) aTypeArray;
   if (!aLab.FindAttribute(TDataStd_ByteArray::GetID(), aTypeArray))
     return aRes;
@@ -144,7 +138,7 @@ QList<PolylineSection> HYDROData_Polyline::getPolylineData()
   if( aLen != aSectCnt )
     return aRes;
 //Get section closed array handle
-  aLab = myLab.FindChild( TAG_SECTIONS_CLOSED );
+  aLab = myLab.FindChild( DataTag_SectionsClosed );
   Handle(TDataStd_BooleanArray) aClosedArray;
   if (!aLab.FindAttribute(TDataStd_BooleanArray::GetID(), aClosedArray))
     return aRes;
@@ -152,7 +146,7 @@ QList<PolylineSection> HYDROData_Polyline::getPolylineData()
   if( aLen != aSectCnt )
     return aRes;
 //Get sections names
-  TDF_Label aNameLab = myLab.FindChild(TAG_SECTIONS_NAME);
+  TDF_Label aNameLab = myLab.FindChild(DataTag_SectionsName);
   Handle(TDataStd_ExtStringArray) aSectNamesArray;
   if(!aNameLab.FindAttribute(TDataStd_ExtStringArray::GetID(), aSectNamesArray))
     return aRes;
@@ -186,13 +180,13 @@ QList<PolylineSection> HYDROData_Polyline::getPolylineData()
 void HYDROData_Polyline::removeAll()
 {
 //Remove only section data
-  TDF_Label aLab = myLab.FindChild( TAG_SECTIONS_SIZE );
+  TDF_Label aLab = myLab.FindChild( DataTag_SectionsSize );
   aLab.ForgetAllAttributes();
 
-  aLab = myLab.FindChild( TAG_SECTIONS_TYPE );
+  aLab = myLab.FindChild( DataTag_SectionsType );
   aLab.ForgetAllAttributes();
 
-  aLab = myLab.FindChild( TAG_SECTIONS_CLOSED );
+  aLab = myLab.FindChild( DataTag_SectionsClosed );
   aLab.ForgetAllAttributes();
 
   myLab.ForgetAttribute(TDataStd_RealArray::GetID());