Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.salome-platform.org/modules/hydro
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_Tool.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_Tool.cxx
b/src/HYDROGUI/HYDROGUI_Tool.cxx
index ccea02da1c095767d823957baa15b069e0dd71d3..f2e3f6fe3e75f8598f610333c0c16313ec175b94 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_Tool.cxx
+++ b/
src/HYDROGUI/HYDROGUI_Tool.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-31,6
+31,7
@@
#include <HYDROData_Iterator.h>
#include <HYDROData_ImmersibleZone.h>
#include <HYDROData_Tool.h>
#include <HYDROData_Iterator.h>
#include <HYDROData_ImmersibleZone.h>
#include <HYDROData_Tool.h>
+#include <HYDROData_Profile.h>
#include <GEOMBase.h>
#include <GEOMBase.h>
@@
-68,6
+69,8
@@
// encoding instead of default 'System'
#define USE_LATIN1_ENCODING
// encoding instead of default 'System'
#define USE_LATIN1_ENCODING
+// #define DEB_GROUPS 1
+
QString HYDROGUI_Tool::ToQString( const TCollection_AsciiString& src )
{
#ifdef USE_LATIN1_ENCODING
QString HYDROGUI_Tool::ToQString( const TCollection_AsciiString& src )
{
#ifdef USE_LATIN1_ENCODING
@@
-227,7
+230,13
@@
bool HYDROGUI_Tool::IsObjectHasPresentation( const Handle(HYDROData_Entity)& the
anObjectKind == KIND_STREAM ||
anObjectKind == KIND_CHANNEL ||
anObjectKind == KIND_DIGUE ||
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
+#endif
+ )
{
return true;
}
{
return true;
}
@@
-383,7
+392,8
@@
ObjectKind HYDROGUI_Tool::GetSelectedPartition( HYDROGUI_Module* theModule )
return KIND_UNKNOWN;
}
return KIND_UNKNOWN;
}
-QStringList HYDROGUI_Tool::GetSelectedGeomObjects( HYDROGUI_Module* theModule )
+QStringList HYDROGUI_Tool::GetSelectedGeomObjects( HYDROGUI_Module* theModule,
+ QList<GEOM::shape_type> theTypes )
{
QStringList anEntryList;
{
QStringList anEntryList;
@@
-414,7
+424,8
@@
QStringList HYDROGUI_Tool::GetSelectedGeomObjects( HYDROGUI_Module* theModule )
GEOM::GEOM_Object_var aGeomObj =
GEOMBase::GetObjectFromIOR( aSObject->GetIOR().c_str() );
GEOM::GEOM_Object_var aGeomObj =
GEOMBase::GetObjectFromIOR( aSObject->GetIOR().c_str() );
- if ( !aGeomObj->_is_nil() && aGeomObj->IsShape() ) {
+ if ( !aGeomObj->_is_nil() && aGeomObj->IsShape() &&
+ theTypes.contains( aGeomObj->GetShapeType() ) ) {
anEntryList << anEntry;
}
}
anEntryList << anEntry;
}
}
@@
-429,16
+440,26
@@
Handle(HYDROData_Entity) HYDROGUI_Tool::FindObjectByName( HYDROGUI_Module* theMo
const QString& theName,
const ObjectKind theObjectKind )
{
const QString& theName,
const ObjectKind theObjectKind )
{
+ Handle(HYDROData_Entity) aResObj;
+
Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( theModule->getStudyId() );
Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( theModule->getStudyId() );
- return HYDROData_Tool::FindObjectByName( aDocument, theName, theObjectKind );
+ if ( !aDocument.IsNull() )
+ aResObj = aDocument->FindObjectByName( theName, theObjectKind );
+
+ return aResObj;
}
HYDROData_SequenceOfObjects HYDROGUI_Tool::FindObjectsByNames( HYDROGUI_Module* theModule,
const QStringList& theNames,
const ObjectKind theObjectKind )
{
}
HYDROData_SequenceOfObjects HYDROGUI_Tool::FindObjectsByNames( HYDROGUI_Module* theModule,
const QStringList& theNames,
const ObjectKind theObjectKind )
{
+ HYDROData_SequenceOfObjects aResSeq;
+
Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( theModule->getStudyId() );
Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( theModule->getStudyId() );
- return HYDROData_Tool::FindObjectsByNames( aDocument, theNames, theObjectKind );
+ if ( !aDocument.IsNull() )
+ aResSeq = aDocument->FindObjectsByNames( theNames, theObjectKind );
+
+ return aResSeq;
}
QString HYDROGUI_Tool::GenerateObjectName( HYDROGUI_Module* theModule,
}
QString HYDROGUI_Tool::GenerateObjectName( HYDROGUI_Module* theModule,
@@
-653,8
+674,7
@@
QColor HYDROGUI_Tool::GenerateFillingColor( const Handle(HYDROData_Document)& th
{
const QString& aZoneName = aZoneNameIter.next();
Handle(HYDROData_ImmersibleZone) aRefZone =
{
const QString& aZoneName = aZoneNameIter.next();
Handle(HYDROData_ImmersibleZone) aRefZone =
- Handle(HYDROData_ImmersibleZone)::DownCast(
- HYDROData_Tool::FindObjectByName( theDoc, aZoneName, KIND_IMMERSIBLE_ZONE ) );
+ Handle(HYDROData_ImmersibleZone)::DownCast( theDoc->FindObjectByName( aZoneName, KIND_IMMERSIBLE_ZONE ) );
if( !aRefZone.IsNull() )
{
QColor aRefColor = aRefZone->GetFillingColor();
if( !aRefZone.IsNull() )
{
QColor aRefColor = aRefZone->GetFillingColor();
@@
-674,22
+694,39
@@
QColor HYDROGUI_Tool::GenerateFillingColor( const Handle(HYDROData_Document)& th
}
QStringList HYDROGUI_Tool::FindExistingObjectsNames( const Handle(HYDROData_Document)& theDoc,
}
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();
{
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;
}
}
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 );
+}
+