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
Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7
[modules/hydro.git]
/
src
/
HYDROPy
/
HYDROData_Document.sip
diff --git
a/src/HYDROPy/HYDROData_Document.sip
b/src/HYDROPy/HYDROData_Document.sip
index c2a71f9404956ac20ae7544cc359bac126ef5869..882fe167ab7cd1444c472ad7bcc15896a8810877 100644
(file)
--- a/
src/HYDROPy/HYDROData_Document.sip
+++ b/
src/HYDROPy/HYDROData_Document.sip
@@
-1,12
+1,8
@@
-// Copyright (C) 2007-2013 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) 2014-2015 EDF-R&D
// 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
@@
-46,7
+42,8
@@
class HYDROData_Document
%End
%ConvertToSubClassCode
%End
%ConvertToSubClassCode
- if ( !Handle(HYDROData_Document)::DownCast( sipCpp ).IsNull() )
+ HYDROData_Document* aDoc = dynamic_cast< HYDROData_Document*>( sipCpp );
+ if ( aDoc )
sipClass = sipClass_HYDROData_Document;
else
sipClass = NULL;
sipClass = sipClass_HYDROData_Document;
else
sipClass = NULL;
@@
-152,9
+149,9
@@
class HYDROData_Document
aRes = new HYDROData_ShapesGroup( *dynamic_cast<HYDROData_ShapesGroup*>( theObject ) );
break;
}
aRes = new HYDROData_ShapesGroup( *dynamic_cast<HYDROData_ShapesGroup*>( theObject ) );
break;
}
- case KIND_SPLIT
TED
_GROUP:
+ case KIND_SPLIT_GROUP:
{
{
- aRes = new HYDROData_Split
tedShapesGroup( *dynamic_cast<HYDROData_Splitted
ShapesGroup*>( theObject ) );
+ aRes = new HYDROData_Split
ShapesGroup( *dynamic_cast<HYDROData_Split
ShapesGroup*>( theObject ) );
break;
}
case KIND_OBSTACLE_ALTITUDE:
break;
}
case KIND_OBSTACLE_ALTITUDE:
@@
-167,6
+164,16
@@
class HYDROData_Document
aRes = new HYDROData_StreamAltitude( *dynamic_cast<HYDROData_StreamAltitude*>( theObject ) );
break;
}
aRes = new HYDROData_StreamAltitude( *dynamic_cast<HYDROData_StreamAltitude*>( theObject ) );
break;
}
+ case KIND_STRICKLER_TABLE:
+ {
+ aRes = new HYDROData_StricklerTable( *dynamic_cast<HYDROData_StricklerTable*>( theObject ) );
+ break;
+ }
+ case KIND_LAND_COVER_MAP:
+ {
+ aRes = new HYDROData_LandCoverMap( *dynamic_cast<HYDROData_LandCoverMap*>( theObject ) );
+ break;
+ }
}
return aRes;
}
return aRes;
@@
-193,7
+200,7
@@
class HYDROData_Document
public:
//! Returns the existing document or creates new if it is not exist
public:
//! Returns the existing document or creates new if it is not exist
- static HYDROData_Document Document( const int theStudyID ) [
Handle_HYDROData_Document
(const int)] ;
+ static HYDROData_Document Document( const int theStudyID ) [
opencascade::handle<HYDROData_Document>
(const int)] ;
%MethodCode
Handle(HYDROData_Document) aDocument;
%MethodCode
Handle(HYDROData_Document) aDocument;
@@
-267,7
+274,7
@@
public:
//! Creates and locates in the document a new object
//! \param theKind kind of the created object, can not be UNKNOWN
//! \returns the created object
//! Creates and locates in the document a new object
//! \param theKind kind of the created object, can not be UNKNOWN
//! \returns the created object
- HYDROData_Entity CreateObject( const ObjectKind theKind ) [
Handle_HYDROData_Entity
(const ObjectKind)] ;
+ HYDROData_Entity CreateObject( const ObjectKind theKind ) [
opencascade::handle<HYDROData_Entity>
(const ObjectKind)] ;
%MethodCode
Handle(HYDROData_Entity) anObject;
%MethodCode
Handle(HYDROData_Entity) anObject;
@@
-282,7
+289,7
@@
public:
HYDROData_Entity FindObjectByName( const QString& theName,
const ObjectKind theKind = KIND_UNKNOWN )
HYDROData_Entity FindObjectByName( const QString& theName,
const ObjectKind theKind = KIND_UNKNOWN )
- [
Handle_HYDROData_Entity
(const QString&, const ObjectKind)] ;
+ [
opencascade::handle<HYDROData_Entity>
(const QString&, const ObjectKind)] ;
%MethodCode
Handle(HYDROData_Entity) anObject;
%MethodCode
Handle(HYDROData_Entity) anObject;
@@
-300,6
+307,12
@@
public:
void SetLocalCS( double, double );
void SetLocalCS( double, double );
+ //! Get the appropriate interpolator by the name.
+ HYDROData_IProfilesInterpolator* GetInterpolator( const TCollection_AsciiString& theName ) const;
+
+ //! Get list of registered interpolator names.
+ NCollection_Sequence<TCollection_AsciiString> GetInterpolatorNames() const;
+
protected:
//! Creates new document: private because "Document" method must be used instead of direct creation.
protected:
//! Creates new document: private because "Document" method must be used instead of direct creation.