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 'BR_v14_rc' of ssh://git.salome-platform.org/modules/hydro into BR_v14_rc
[modules/hydro.git]
/
src
/
HYDROPy
/
HYDROData_CalculationCase.sip
diff --git
a/src/HYDROPy/HYDROData_CalculationCase.sip
b/src/HYDROPy/HYDROData_CalculationCase.sip
index afa46a342641d87a95bc5826968a72202d54be49..d925944a17564b6667b7fc32c00ee4115145dd3f 100644
(file)
--- a/
src/HYDROPy/HYDROData_CalculationCase.sip
+++ b/
src/HYDROPy/HYDROData_CalculationCase.sip
@@
-512,9
+512,9
@@
public:
void AddRule( HYDROData_Entity theObject1,
HYDROData_PriorityType thePriority,
HYDROData_Entity theObject2,
void AddRule( HYDROData_Entity theObject1,
HYDROData_PriorityType thePriority,
HYDROData_Entity theObject2,
- HYDROData_Zone::Merge
AltitudesType
theMergeType,
+ HYDROData_Zone::Merge
Type
theMergeType,
HYDROData_CalculationCase::DataTag theDataTag )
HYDROData_CalculationCase::DataTag theDataTag )
- [void ( const Handle_HYDROData_Entity&, HYDROData_PriorityType, const Handle_HYDROData_Entity&, HYDROData_Zone::Merge
Altitudes
Type, HYDROData_CalculationCase::DataTag )];
+ [void ( const Handle_HYDROData_Entity&, HYDROData_PriorityType, const Handle_HYDROData_Entity&, HYDROData_Zone::MergeType, HYDROData_CalculationCase::DataTag )];
%MethodCode
Handle(HYDROData_Entity) anObject1 =
Handle(HYDROData_Entity)::DownCast( createHandle( a0 ) );
%MethodCode
Handle(HYDROData_Entity) anObject1 =
Handle(HYDROData_Entity)::DownCast( createHandle( a0 ) );
@@
-528,10
+528,14
@@
public:
%End
QString DumpRules();
%End
QString DumpRules();
+ QString DumpLandCoverRules();
void SetAssignmentMode( AssignmentMode theMode );
AssignmentMode GetAssignmentMode() const;
void SetAssignmentMode( AssignmentMode theMode );
AssignmentMode GetAssignmentMode() const;
+ void SetAssignmentLandCoverMode( AssignmentMode theMode );
+ AssignmentMode GetAssignmentLandCoverMode() const;
+
protected:
/**
protected:
/**