Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'V9_11_BR'
[modules/geom.git]
/
src
/
GEOM
/
GEOM_Field.cxx
diff --git
a/src/GEOM/GEOM_Field.cxx
b/src/GEOM/GEOM_Field.cxx
index 1c577599aed60e67310627558c5dc1ef14616c0b..164fc8aab4e92085451e7d58b9645e3f4e4e0af1 100644
(file)
--- a/
src/GEOM/GEOM_Field.cxx
+++ b/
src/GEOM/GEOM_Field.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
23 CEA, EDF
, 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
@@
-46,7
+46,7
@@
namespace
{
//================================================================================
/*!
{
//================================================================================
/*!
- * \brief Returns a funtion with a given type OR the 1st function
+ * \brief Returns a fun
c
tion with a given type OR the 1st function
*/
//================================================================================
*/
//================================================================================
@@
-101,7
+101,7
@@
void GEOM_Field::Init(const Handle(GEOM_Object)& theShape,
{
Handle(GEOM_Function) fun = GetFunction(1);
if ( !fun.IsNull() )
{
Handle(GEOM_Function) fun = GetFunction(1);
if ( !fun.IsNull() )
- Standard_MultiplyDefined::Raise( "Reinitialization of GEOM_Field is forbiden" );
+ Standard_MultiplyDefined::Raise( "Reinitialization of GEOM_Field is forbid
d
en" );
fun = AddFunction( GetFieldID(), FUN_ADD_FIELD );
GEOM_IField data( fun );
fun = AddFunction( GetFieldID(), FUN_ADD_FIELD );
GEOM_IField data( fun );
@@
-364,7
+364,7
@@
Handle(GEOM_FieldStep) GEOM_Field::AddStep(const int stepID, const int stamp)
if(anEngine == NULL) return NULL;
step = Handle(GEOM_FieldStep)::DownCast
if(anEngine == NULL) return NULL;
step = Handle(GEOM_FieldStep)::DownCast
- ( anEngine->AddBaseObject( G
etDocID(),G
EOM_FIELD_STEP_OBJTYPE ));
+ ( anEngine->AddBaseObject( GEOM_FIELD_STEP_OBJTYPE ));
if ( step.IsNull())
return step;
if ( step.IsNull())
return step;
@@
-498,7
+498,7
@@
void GEOM_FieldStep::Init(const Handle(GEOM_Field)& theField,
{
Handle(GEOM_Function) fun = GetFunction(1);
if ( !fun.IsNull() )
{
Handle(GEOM_Function) fun = GetFunction(1);
if ( !fun.IsNull() )
- Standard_MultiplyDefined::Raise( "Reinitialization of GEOM_FieldStep is forbiden" );
+ Standard_MultiplyDefined::Raise( "Reinitialization of GEOM_FieldStep is forbid
d
en" );
fun = AddFunction( GEOM_Field::GetFieldID(), GEOM_Field::FUN_ADD_STEP );
GEOM_IField data( fun );
fun = AddFunction( GEOM_Field::GetFieldID(), GEOM_Field::FUN_ADD_STEP );
GEOM_IField data( fun );
@@
-756,5
+756,5
@@
const Standard_GUID& GEOM_FieldStep::GetDataID()
return TDataStd_ExtStringArray::GetID();
}
return TDataStd_ExtStringArray::GetID();
}
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_Field, GEOM_BaseObject )
;
-IMPLEMENT_STANDARD_RTTIEXT(GEOM_FieldStep, GEOM_BaseObject )
;
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_Field, GEOM_BaseObject )
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_FieldStep, GEOM_BaseObject )