Salome HOME
projects
/
modules
/
yacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V6_main 13/12/2012
[modules/yacs.git]
/
src
/
SALOMEDS
/
SALOMEDS_AttributeParameter.cxx
diff --git
a/src/SALOMEDS/SALOMEDS_AttributeParameter.cxx
b/src/SALOMEDS/SALOMEDS_AttributeParameter.cxx
index 6f4262aeda463296463a551f0ca3b7c21d064df0..e6791c23bd5b68b756f4ba01d833a8b9fb2e03b4 100644
(file)
--- a/
src/SALOMEDS/SALOMEDS_AttributeParameter.cxx
+++ b/
src/SALOMEDS/SALOMEDS_AttributeParameter.cxx
@@
-1,33
+1,34
@@
-// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2012 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
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// 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
+// License as published by the Free Software Foundation; either
// version 2.1 of the License.
// version 2.1 of the License.
-//
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//
+// This library is distributed in the hope that it will be useful
,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// Lesser General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// File : SALOMEDS_AttributeParameter.cxx
// Author : Sergey RUIN
// Module : SALOME
// File : SALOMEDS_AttributeParameter.cxx
// Author : Sergey RUIN
// Module : SALOME
-
+//
#include "SALOMEDS_AttributeParameter.hxx"
#include "SALOMEDS.hxx"
#include <string>
#include "SALOMEDS_AttributeParameter.hxx"
#include "SALOMEDS.hxx"
#include <string>
-using namespace std;
-
//=======================================================================
/*!
* Function : Constructor
//=======================================================================
/*!
* Function : Constructor
@@
-63,7
+64,7
@@
SALOMEDS_AttributeParameter::~SALOMEDS_AttributeParameter()
* Purpose : Associates a integer value with the ID
*/
//=======================================================================
* Purpose : Associates a integer value with the ID
*/
//=======================================================================
-void SALOMEDS_AttributeParameter::SetInt(const string& theID, const int theValue)
+void SALOMEDS_AttributeParameter::SetInt(const st
d::st
ring& theID, const int theValue)
{
CheckLocked();
{
CheckLocked();
@@
-81,7
+82,7
@@
void SALOMEDS_AttributeParameter::SetInt(const string& theID, const int theValue
* Purpose : Returns a int value associated with the given ID
*/
//=======================================================================
* Purpose : Returns a int value associated with the given ID
*/
//=======================================================================
-int SALOMEDS_AttributeParameter::GetInt(const string& theID)
+int SALOMEDS_AttributeParameter::GetInt(const st
d::st
ring& theID)
{
int aValue;
if(_isLocal) {
{
int aValue;
if(_isLocal) {
@@
-99,7
+100,7
@@
int SALOMEDS_AttributeParameter::GetInt(const string& theID)
* Purpose : Associates a double value with the ID
*/
//=======================================================================
* Purpose : Associates a double value with the ID
*/
//=======================================================================
-void SALOMEDS_AttributeParameter::SetReal(const string& theID, const double& theValue)
+void SALOMEDS_AttributeParameter::SetReal(const st
d::st
ring& theID, const double& theValue)
{
CheckLocked();
{
CheckLocked();
@@
-117,7
+118,7
@@
void SALOMEDS_AttributeParameter::SetReal(const string& theID, const double& the
* Purpose : Returns a double value associated with the given ID
*/
//=======================================================================
* Purpose : Returns a double value associated with the given ID
*/
//=======================================================================
-double SALOMEDS_AttributeParameter::GetReal(const string& theID)
+double SALOMEDS_AttributeParameter::GetReal(const st
d::st
ring& theID)
{
double aValue;
if(_isLocal) {
{
double aValue;
if(_isLocal) {
@@
-135,7
+136,7
@@
double SALOMEDS_AttributeParameter::GetReal(const string& theID)
* Purpose : Associates a string with the ID
*/
//=======================================================================
* Purpose : Associates a string with the ID
*/
//=======================================================================
-void SALOMEDS_AttributeParameter::SetString(const st
ring& theID, const
string& theValue)
+void SALOMEDS_AttributeParameter::SetString(const st
d::string& theID, const std::
string& theValue)
{
CheckLocked();
{
CheckLocked();
@@
-153,9
+154,9
@@
void SALOMEDS_AttributeParameter::SetString(const string& theID, const string& t
* Purpose : Returns a string associated with the given ID
*/
//=======================================================================
* Purpose : Returns a string associated with the given ID
*/
//=======================================================================
-st
ring SALOMEDS_AttributeParameter::GetString(const
string& theID)
+st
d::string SALOMEDS_AttributeParameter::GetString(const std::
string& theID)
{
{
- string aValue;
+ st
d::st
ring aValue;
if(_isLocal) {
SALOMEDS::Locker lock;
aValue = dynamic_cast<SALOMEDSImpl_AttributeParameter*>(_local_impl)->GetString(theID);
if(_isLocal) {
SALOMEDS::Locker lock;
aValue = dynamic_cast<SALOMEDSImpl_AttributeParameter*>(_local_impl)->GetString(theID);
@@
-171,7
+172,7
@@
string SALOMEDS_AttributeParameter::GetString(const string& theID)
* Purpose : Associates a bool value with the ID
*/
//=======================================================================
* Purpose : Associates a bool value with the ID
*/
//=======================================================================
-void SALOMEDS_AttributeParameter::SetBool(const string& theID, const bool& theValue)
+void SALOMEDS_AttributeParameter::SetBool(const st
d::st
ring& theID, const bool& theValue)
{
CheckLocked();
{
CheckLocked();
@@
-189,7
+190,7
@@
void SALOMEDS_AttributeParameter::SetBool(const string& theID, const bool& theVa
* Purpose : Returns a bool value associated with the ID
*/
//=======================================================================
* Purpose : Returns a bool value associated with the ID
*/
//=======================================================================
-bool SALOMEDS_AttributeParameter::GetBool(const string& theID)
+bool SALOMEDS_AttributeParameter::GetBool(const st
d::st
ring& theID)
{
if(_isLocal) {
SALOMEDS::Locker lock;
{
if(_isLocal) {
SALOMEDS::Locker lock;
@@
-205,7
+206,7
@@
bool SALOMEDS_AttributeParameter::GetBool(const string& theID)
* Purpose : Associates an array of double values with the given ID
*/
//=======================================================================
* Purpose : Associates an array of double values with the given ID
*/
//=======================================================================
-void SALOMEDS_AttributeParameter::SetRealArray(const st
ring& theID, const
vector<double>& theArray)
+void SALOMEDS_AttributeParameter::SetRealArray(const st
d::string& theID, const std::
vector<double>& theArray)
{
CheckLocked();
{
CheckLocked();
@@
-230,9
+231,9
@@
void SALOMEDS_AttributeParameter::SetRealArray(const string& theID, const vector
* Purpose : Returns an array of double values associated with the ID
*/
//=======================================================================
* Purpose : Returns an array of double values associated with the ID
*/
//=======================================================================
-
vector<double> SALOMEDS_AttributeParameter::GetRealArray(const
string& theID)
+
std::vector<double> SALOMEDS_AttributeParameter::GetRealArray(const std::
string& theID)
{
{
- vector<double> v;
+
std::
vector<double> v;
if(_isLocal) {
SALOMEDS::Locker lock;
return dynamic_cast<SALOMEDSImpl_AttributeParameter*>(_local_impl)->GetRealArray(theID);
if(_isLocal) {
SALOMEDS::Locker lock;
return dynamic_cast<SALOMEDSImpl_AttributeParameter*>(_local_impl)->GetRealArray(theID);
@@
-254,7
+255,7
@@
vector<double> SALOMEDS_AttributeParameter::GetRealArray(const string& theID)
* Purpose : Associates an array of int values with the given ID
*/
//=======================================================================
* Purpose : Associates an array of int values with the given ID
*/
//=======================================================================
-void SALOMEDS_AttributeParameter::SetIntArray(const st
ring& theID, const
vector<int>& theArray)
+void SALOMEDS_AttributeParameter::SetIntArray(const st
d::string& theID, const std::
vector<int>& theArray)
{
CheckLocked();
{
CheckLocked();
@@
-279,9
+280,9
@@
void SALOMEDS_AttributeParameter::SetIntArray(const string& theID, const vector<
* Purpose : Returns an array of int values associated with the ID
*/
//=======================================================================
* Purpose : Returns an array of int values associated with the ID
*/
//=======================================================================
-
vector<int> SALOMEDS_AttributeParameter::GetIntArray(const
string& theID)
+
std::vector<int> SALOMEDS_AttributeParameter::GetIntArray(const std::
string& theID)
{
{
- vector<int> v;
+
std::
vector<int> v;
if(_isLocal) {
SALOMEDS::Locker lock;
return dynamic_cast<SALOMEDSImpl_AttributeParameter*>(_local_impl)->GetIntArray(theID);
if(_isLocal) {
SALOMEDS::Locker lock;
return dynamic_cast<SALOMEDSImpl_AttributeParameter*>(_local_impl)->GetIntArray(theID);
@@
-303,7
+304,7
@@
vector<int> SALOMEDS_AttributeParameter::GetIntArray(const string& theID)
* Purpose : Associates an array of string values with the given ID
*/
//=======================================================================
* Purpose : Associates an array of string values with the given ID
*/
//=======================================================================
-void SALOMEDS_AttributeParameter::SetStrArray(const st
ring& theID, const vector<
string>& theArray)
+void SALOMEDS_AttributeParameter::SetStrArray(const st
d::string& theID, const std::vector<std::
string>& theArray)
{
CheckLocked();
{
CheckLocked();
@@
-328,9
+329,9
@@
void SALOMEDS_AttributeParameter::SetStrArray(const string& theID, const vector<
* Purpose : Returns an array of string values associated with the ID
*/
//=======================================================================
* Purpose : Returns an array of string values associated with the ID
*/
//=======================================================================
-
vector<string> SALOMEDS_AttributeParameter::GetStrArray(const
string& theID)
+
std::vector<std::string> SALOMEDS_AttributeParameter::GetStrArray(const std::
string& theID)
{
{
-
vector<
string> v;
+
std::vector<std::
string> v;
if(_isLocal) {
SALOMEDS::Locker lock;
return dynamic_cast<SALOMEDSImpl_AttributeParameter*>(_local_impl)->GetStrArray(theID);
if(_isLocal) {
SALOMEDS::Locker lock;
return dynamic_cast<SALOMEDSImpl_AttributeParameter*>(_local_impl)->GetStrArray(theID);
@@
-340,7
+341,7
@@
vector<string> SALOMEDS_AttributeParameter::GetStrArray(const string& theID)
int length = aSeq->length();
if(length) {
v.resize(length);
int length = aSeq->length();
if(length) {
v.resize(length);
- for(int i = 0; i < length; i++) v[i] = string(aSeq[i].in());
+ for(int i = 0; i < length; i++) v[i] = st
d::st
ring(aSeq[i].in());
}
}
return v;
}
}
return v;
@@
-354,7
+355,7
@@
vector<string> SALOMEDS_AttributeParameter::GetStrArray(const string& theID)
* a value in the attribute
*/
//=======================================================================
* a value in the attribute
*/
//=======================================================================
-bool SALOMEDS_AttributeParameter::IsSet(const string& theID, const int theType)
+bool SALOMEDS_AttributeParameter::IsSet(const st
d::st
ring& theID, const int theType)
{
if(_isLocal) {
SALOMEDS::Locker lock;
{
if(_isLocal) {
SALOMEDS::Locker lock;
@@
-370,7
+371,7
@@
bool SALOMEDS_AttributeParameter::IsSet(const string& theID, const int theType)
* Purpose : Removes a parameter with given ID
*/
//=======================================================================
* Purpose : Removes a parameter with given ID
*/
//=======================================================================
-bool SALOMEDS_AttributeParameter::RemoveID(const string& theID, const int theType)
+bool SALOMEDS_AttributeParameter::RemoveID(const st
d::st
ring& theID, const int theType)
{
CheckLocked();
{
CheckLocked();
@@
-460,9
+461,9
@@
void SALOMEDS_AttributeParameter::Clear()
* Purpose : Returns an array of all ID's of the given type
*/
//=======================================================================
* Purpose : Returns an array of all ID's of the given type
*/
//=======================================================================
-
vector<
string> SALOMEDS_AttributeParameter::GetIDs(const int theType)
+
std::vector<std::
string> SALOMEDS_AttributeParameter::GetIDs(const int theType)
{
{
-
vector<
string> v;
+
std::vector<std::
string> v;
if(_isLocal) {
SALOMEDS::Locker lock;
SALOMEDSImpl_AttributeParameter* AP_impl = dynamic_cast<SALOMEDSImpl_AttributeParameter*>(_local_impl);
if(_isLocal) {
SALOMEDS::Locker lock;
SALOMEDSImpl_AttributeParameter* AP_impl = dynamic_cast<SALOMEDSImpl_AttributeParameter*>(_local_impl);
@@
-474,7
+475,7
@@
vector<string> SALOMEDS_AttributeParameter::GetIDs(const int theType)
int length = CorbaSeq->length();
if(length) {
v.resize(length);
int length = CorbaSeq->length();
if(length) {
v.resize(length);
- for(int i = 0; i <length; i++) v[i] = string(CorbaSeq[i].in());
+ for(int i = 0; i <length; i++) v[i] = st
d::st
ring(CorbaSeq[i].in());
}
}
}
}