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' into BR_quadtree
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_InterpolatorsFactory.h
diff --git
a/src/HYDROData/HYDROData_InterpolatorsFactory.h
b/src/HYDROData/HYDROData_InterpolatorsFactory.h
index 865faea658aa50217caa085171063214d2165fa1..134d35d46515a9d6a6da00cef7918105ae5b0b23 100644
(file)
--- a/
src/HYDROData/HYDROData_InterpolatorsFactory.h
+++ b/
src/HYDROData/HYDROData_InterpolatorsFactory.h
@@
-1,8
+1,4
@@
-// Copyright (C) 2007-2015 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
@@
-25,13
+21,16
@@
#include <HYDROData.h>
#include <HYDROData.h>
+#include <TCollection_AsciiString.hxx>
+#include <NCollection_Sequence.hxx>
+
#include <string>
#include <string>
-#include <vector>
#include <map>
class HYDROData_IProfilesInterpolator;
#include <map>
class HYDROData_IProfilesInterpolator;
-/**\class HYDROData_InterpolatorsFactory
+/**
+ * \class HYDROData_InterpolatorsFactory
*
* \brief Profile interpolators factory.
*
*
* \brief Profile interpolators factory.
*
@@
-43,16
+42,23
@@
class HYDROData_InterpolatorsFactory
{
public:
{
public:
+ /**
+ * Public constructor.
+ */
HYDROData_InterpolatorsFactory();
HYDROData_InterpolatorsFactory();
+
+ /**
+ * Public virtual destructor.
+ */
virtual ~HYDROData_InterpolatorsFactory();
/**
* Registers the interpolator of a certain type with the given name.
* \param theName the interpolator name used as identifier
*/
virtual ~HYDROData_InterpolatorsFactory();
/**
* Registers the interpolator of a certain type with the given name.
* \param theName the interpolator name used as identifier
*/
- template <class T>
HYDRODATA_EXPORT void Register( const std::s
tring& theName )
+ template <class T>
/*HYDRODATA_EXPORT */void Register( const TCollection_AsciiS
tring& theName )
{
{
- myInterpolators[theName] = new T();
+ myInterpolators[theName
.ToCString()
] = new T();
}
/**
}
/**
@@
-60,13
+66,13
@@
public:
* \param theName name of the interpolator
* \returns the appropriate interpolator or NULL if interpolator with such name is not registered
*/
* \param theName name of the interpolator
* \returns the appropriate interpolator or NULL if interpolator with such name is not registered
*/
- HYDRODATA_EXPORT HYDROData_IProfilesInterpolator* GetInterpolator( const
std::s
tring& theName ) const;
+ HYDRODATA_EXPORT HYDROData_IProfilesInterpolator* GetInterpolator( const
TCollection_AsciiS
tring& theName ) const;
/**
* Get list of registered interpolator names.
* \return the list of unique names
*/
/**
* Get list of registered interpolator names.
* \return the list of unique names
*/
-
std::vector<std::s
tring> GetInterpolatorNames() const;
+
HYDRODATA_EXPORT NCollection_Sequence<TCollection_AsciiS
tring> GetInterpolatorNames() const;
private:
//! Map that stores all interpolators, identified by interpolator name (string)
private:
//! Map that stores all interpolators, identified by interpolator name (string)