Porting on OCCT 7.0 and Qt 5. Make compilable version.

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

diff --git a/src/HYDROData/HYDROData_Stream.cxx b/src/HYDROData/HYDROData_Stream.cxx
index 44833c6afe4f3e00fb309d29f6bc66019d2e34f4..518753aa63fd7f0919a95371faa15fdd6025ee30 100644 (file)
--- a/src/HYDROData/HYDROData_Stream.cxx
+++ b/src/HYDROData/HYDROData_Stream.cxx
@@ -37,7 +37,6 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <TColStd_ListOfReal.hxx>
 #include <TColStd_ListIteratorOfListOfReal.hxx>
-#include <TCollection_CompareOfReal.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_HArray1OfPnt.hxx>
 
@@ -75,10 +74,9 @@
 
 #include <TopTools_HArray1OfShape.hxx>
 
-#include <SortTools_QuickSortOfReal.hxx>
-
 #include <QColor>
 #include <QStringList>
+#include <QVector>
 
 //#define DEB_STREAM 1
 #ifdef DEB_STREAM
@@ -90,7 +88,6 @@
 
 typedef NCollection_DataMap<Standard_Real, Handle(HYDROData_Profile)> HYDROData_DataMapOfRealOfHDProfile;
 
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Stream,HYDROData_NaturalObject)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Stream,HYDROData_NaturalObject)
 
 
@@ -679,20 +676,21 @@ void HYDROData_Stream::updateProfilesOrder()
   if ( aList.IsEmpty() )
     return;
 
-  TColStd_Array1OfReal anArr( 1, aList.Extent() );
+  QVector<double> anArr( aList.Extent() );
 
   TColStd_ListIteratorOfListOfReal it( aList );
   for ( int j = 1; it.More(); it.Next(), j++ )
-    anArr( j ) = it.Value();
+    anArr[j-1] = it.Value();
 
   // sorting
   if ( aList.Extent() > 1 )
   {
-    TCollection_CompareOfReal Compar;
-    SortTools_QuickSortOfReal::Sort( anArr, Compar );
+    //TCollection_CompareOfReal Compar;
+    //SortTools_QuickSortOfReal::Sort( anArr, Compar );
+    std::sort( anArr.begin(), anArr.end() );
 
-    for (int j = 1; j <= anArr.Length(); j++) {
-      const Standard_Real aKey =  anArr(j);
+    for (int j = 1; j <= anArr.size(); j++) {
+      const Standard_Real aKey =  anArr[j-1];
       const Handle(HYDROData_Profile)& aProfile = aDM.Find(aKey);
       insertProfileInToOrder( aProfile );
     }
@@ -716,9 +714,9 @@ ObjectKind HYDROData_Stream::getAltitudeObjectType() const
   return KIND_STREAM_ALTITUDE;
 }
 
-void HYDROData_Stream::setParametersArray( const TColStd_Array1OfReal& theArray )
+void HYDROData_Stream::setParametersArray( const QVector<double>& theArray )
 {
-  if ( theArray.Length() == 0 )
+  if ( theArray.size() == 0 )
   {
     removeParametersArray();
     return;
@@ -726,13 +724,13 @@ void HYDROData_Stream::setParametersArray( const TColStd_Array1OfReal& theArray
 
   TDF_Label aLabel = myLab.FindChild( DataTag_ParamsArray );
   
+  int n = theArray.size();
   Handle(TDataStd_RealArray) aParamsArray = 
-    TDataStd_RealArray::Set( aLabel, theArray.Lower(), theArray.Upper() );
-
-  for ( int i = theArray.Lower(), n = theArray.Upper(); i <= n; ++i )
+    TDataStd_RealArray::Set( aLabel, 1, n );
+  for ( int i = 0; i < n; ++i )
   {
-    const Standard_Real& aParam = theArray( i );
-    aParamsArray->SetValue( i, aParam );
+    const Standard_Real& aParam = theArray[i];
+    aParamsArray->SetValue( i+1, aParam );
   }
 }
 
@@ -774,7 +772,7 @@ int HYDROData_Stream::insertParameter( const Standard_Real& theParam )
   {
     aResIndex = 0;
 
-    TColStd_Array1OfReal aNewArr( anArr->Lower(), anArr->Upper() + 1 );
+    QVector<double> aNewArr( anArr->Upper() );
 
     bool isInserted = false;
     for ( int i = anArr->Lower(), j = i, n = anArr->Upper(); i <= n; ++i, ++j )
@@ -788,19 +786,19 @@ int HYDROData_Stream::insertParameter( const Standard_Real& theParam )
         }
         else
         {
-          aNewArr( j ) = theParam;
+          aNewArr[j-1] = theParam;
           isInserted = true;
           ++j;
         }
       }
 
-      aNewArr( j ) = aStoredParam;
+      aNewArr[j-1] = aStoredParam;
     }
 
     if ( !isInserted )
     {
       aResIndex = -1;
-      aNewArr( aNewArr.Upper() ) = theParam;
+      aNewArr[aNewArr.size()-1] = theParam;
     }
     
     setParametersArray( aNewArr );
@@ -808,8 +806,8 @@ int HYDROData_Stream::insertParameter( const Standard_Real& theParam )
   }
   else
   {
-    TColStd_Array1OfReal aNewArr( 1, 1 );
-    aNewArr.SetValue( 1, theParam );
+    QVector<double> aNewArr( 1 );
+    aNewArr[0] = theParam;
     setParametersArray( aNewArr );
   }
 
@@ -832,7 +830,7 @@ void HYDROData_Stream::removeParameter( const int& theIndex )
     return;
   }
 
-  TColStd_Array1OfReal aNewArr( aParamsArray->Lower(), aParamsArray->Upper() - 1 );
+  QVector<double> aNewArr( aParamsArray->Upper() - 2 );
 
   for ( int i = aParamsArray->Lower(), j = i, k = 0, n = aParamsArray->Upper(); i <= n; ++i, ++k )
   {
@@ -840,7 +838,7 @@ void HYDROData_Stream::removeParameter( const int& theIndex )
     if ( k == theIndex )
       continue;
 
-    aNewArr.SetValue( j, aStoredParam );
+    aNewArr[j-1] = aStoredParam;
     ++j;
   }
 
@@ -1166,4 +1164,4 @@ bool HYDROData_Stream::CreatePresentations( const Handle(TColgp_HArray1OfPnt)
 #endif
 
   return true;
-}
\ No newline at end of file
+}