-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
#include <HYDROData_Iterator.h>
#include <HYDROData_ImmersibleZone.h>
#include <HYDROData_Tool.h>
+#include <HYDROData_Profile.h>
#include <GEOMBase.h>
anObjectKind == KIND_STREAM ||
anObjectKind == KIND_CHANNEL ||
anObjectKind == KIND_DIGUE ||
- anObjectKind == KIND_DUMMY_3D
+ anObjectKind == KIND_DUMMY_3D ||
+ anObjectKind == KIND_BATHYMETRY
#ifdef DEB_GROUPS
|| anObjectKind == KIND_SHAPES_GROUP ||
anObjectKind == KIND_SPLITTED_GROUP
}
QStringList HYDROGUI_Tool::FindExistingObjectsNames( const Handle(HYDROData_Document)& theDoc,
- const ObjectKind theObjectKind )
+ const ObjectKind theObjectKind,
+ bool isCheckValidProfile )
{
QStringList aNames;
HYDROData_Iterator anIter( theDoc, theObjectKind );
for ( ; anIter.More(); anIter.Next() ) {
Handle(HYDROData_Entity) anObject = anIter.Current();
- if( !anObject.IsNull() ) {
- aNames.append( anObject->GetName() );
+
+ bool isOK = !anObject.IsNull();
+
+ if( isOK && isCheckValidProfile )
+ {
+ Handle_HYDROData_Profile aProfile = Handle_HYDROData_Profile::DownCast( anObject );
+ if( !aProfile.IsNull() && !aProfile->IsValid() )
+ isOK = false;
}
+
+ if( isOK )
+ aNames.append( anObject->GetName() );
}
return aNames;
}
-QString HYDROGUI_Tool::GetCoordinateString( const double theNumber )
+QString HYDROGUI_Tool::GetCoordinateString( const double theNumber, bool isInLocale )
{
- return QString::number( theNumber, 'f', 2 );
-}
\ No newline at end of file
+ if( isInLocale )
+ {
+ static QLocale aLocale( QLocale::English, QLocale::France );
+ return aLocale.toString( theNumber, 'f', 2 );
+ }
+ else
+ return QString::number( theNumber, 'f', 2 );
+}
+