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_BaseDriver.hxx
diff --git
a/src/GEOM/GEOM_BaseDriver.hxx
b/src/GEOM/GEOM_BaseDriver.hxx
index 0508c3d8fdf2a8ae1dd56690aa3b3682e4275f2b..d541f13449f838b9d4c595a4f4e4b61d123b7616 100644
(file)
--- a/
src/GEOM/GEOM_BaseDriver.hxx
+++ b/
src/GEOM/GEOM_BaseDriver.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
13 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
@@
-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
@@
-27,18
+27,19
@@
#ifndef __GEOM_BaseDriver_HXX__
#define __GEOM_BaseDriver_HXX__
#ifndef __GEOM_BaseDriver_HXX__
#define __GEOM_BaseDriver_HXX__
+#include "GEOM_Function.hxx"
+
#include <TFunction_Driver.hxx>
#include <TFunction_Driver.hxx>
+#include <TFunction_Logbook.hxx>
#include <TopAbs_ShapeEnum.hxx>
#include <TopAbs_State.hxx>
#include <TopAbs_ShapeEnum.hxx>
#include <TopAbs_State.hxx>
+#include <TColStd_HSequenceOfTransient.hxx>
+#include <TColStd_HArray1OfInteger.hxx>
#include <string>
#include <vector>
#include <sstream>
#include <string>
#include <vector>
#include <sstream>
-class Handle(GEOM_Function);
-class Handle(TColStd_HSequenceOfTransient);
-class Handle(TColStd_HArray1OfInteger);
-
struct GEOM_Param
{
std::string name;
struct GEOM_Param
{
std::string name;
@@
-67,7
+68,7
@@
struct GEOM_Param
class GEOM_BaseDriver : public TFunction_Driver
{
public:
class GEOM_BaseDriver : public TFunction_Driver
{
public:
-
+
// Returns a name of creation operation and names and values of creation parameters
// (Use AddParam() methods declared below to fill params vector while implementing
// this method in derived drivers)
// Returns a name of creation operation and names and values of creation parameters
// (Use AddParam() methods declared below to fill params vector while implementing
// this method in derived drivers)
@@
-78,14
+79,15
@@
public:
// Adds GEOM_Param to params and sets its name
// This method is safer than resizing the params vector and accessing to its items
Standard_EXPORT GEOM_Param& AddParam(std::vector<GEOM_Param>& params,
// Adds GEOM_Param to params and sets its name
// This method is safer than resizing the params vector and accessing to its items
Standard_EXPORT GEOM_Param& AddParam(std::vector<GEOM_Param>& params,
- const char* name);
+
const char* name);
// Adds GEOM_Param to params vector and sets its name and value
// This method is safer than resizing the params vector and accessing to its items
// Adds GEOM_Param to params vector and sets its name and value
// This method is safer than resizing the params vector and accessing to its items
- template <class T> Standard_EXPORT GEOM_Param& AddParam(std::vector<GEOM_Param>& params,
- const char* name,
- const T& value,
- const char* dfltValue = 0)
+ template <class T>
+ Standard_EXPORT GEOM_Param& AddParam(std::vector<GEOM_Param>& params,
+ const char* name,
+ const T& value,
+ const char* dfltValue = 0)
{
GEOM_Param p;
p.Set( name, value );
{
GEOM_Param p;
p.Set( name, value );
@@
-95,9
+97,9
@@
public:
return params.back();
}
return params.back();
}
- DEFINE_STANDARD_RTTI
(GEOM_Base
Driver)
+ DEFINE_STANDARD_RTTI
EXT(GEOM_BaseDriver,TFunction_
Driver)
};
};
-DEFINE_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver)
;
+DEFINE_STANDARD_HANDLE (GEOM_BaseDriver,TFunction_Driver)
#endif
#endif