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
Bug #478: unresolved conflicts appear again when Edit calculation case in Manual...
[modules/hydro.git]
/
src
/
HYDROPy
/
HYDROData_Document.sip
diff --git
a/src/HYDROPy/HYDROData_Document.sip
b/src/HYDROPy/HYDROData_Document.sip
index 6aeddf8904d4232e2341258c9fa69ac951452742..c2a71f9404956ac20ae7544cc359bac126ef5869 100644
(file)
--- a/
src/HYDROPy/HYDROData_Document.sip
+++ b/
src/HYDROPy/HYDROData_Document.sip
@@
-162,6
+162,11
@@
class HYDROData_Document
aRes = new HYDROData_ObstacleAltitude( *dynamic_cast<HYDROData_ObstacleAltitude*>( theObject ) );
break;
}
aRes = new HYDROData_ObstacleAltitude( *dynamic_cast<HYDROData_ObstacleAltitude*>( theObject ) );
break;
}
+ case KIND_STREAM_ALTITUDE:
+ {
+ aRes = new HYDROData_StreamAltitude( *dynamic_cast<HYDROData_StreamAltitude*>( theObject ) );
+ break;
+ }
}
return aRes;
}
return aRes;
@@
-293,6
+298,8
@@
public:
HYDROData_SequenceOfObjects FindObjectsByNames( const QStringList& theNames,
const ObjectKind theKind = KIND_UNKNOWN );
HYDROData_SequenceOfObjects FindObjectsByNames( const QStringList& theNames,
const ObjectKind theKind = KIND_UNKNOWN );
+ void SetLocalCS( double, double );
+
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.