ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-05 16:44:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

rename setElements to setElement and setComponents to setComponent

Browse Source
This commit is contained in:
fps 2013-09-18 09:37:11 +00:00
parent 7bead41d97
commit f552e9aa9d
9 changed files with 63 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/XAO/XAO_BooleanStep.cxx
View File

@ -112,7 +112,7 @@ throw (XAO_Exception)
}
}
void BooleanStep::setElements(const int& element, const std::vector<bool>& elements)
void BooleanStep::setElement(const int& element, const std::vector<bool>& elements)
throw (XAO_Exception)
{
checkElementIndex(element);
@ -122,7 +122,7 @@ throw (XAO_Exception)
m_values[element][i] = elements[i];
}
void BooleanStep::setComponents(const int& component, const std::vector<bool>& components)
void BooleanStep::setComponent(const int& component, const std::vector<bool>& components)
throw (XAO_Exception)
{
checkComponentIndex(component);

4
src/XAO/XAO_BooleanStep.hxx
View File

@ -85,14 +85,14 @@ namespace XAO
* @param element the index of the element to set.
* @param elements the values to set.
*/
void setElements(const int& element, const std::vector<bool>& elements) throw (XAO_Exception);
void setElement(const int& element, const std::vector<bool>& elements) throw (XAO_Exception);
/**
* Sets the values for a component.
* @param component the index of the component to set.
* @param components the values to set.
*/
void setComponents(const int& component, const std::vector<bool>& components) throw (XAO_Exception);
void setComponent(const int& component, const std::vector<bool>& components) throw (XAO_Exception);
/**
* Sets the value for an element and a component.

4
src/XAO/XAO_DoubleStep.cxx
View File

@ -112,7 +112,7 @@ throw (XAO_Exception)
}
}
void DoubleStep::setElements(const int& element, const std::vector<double>& elements)
void DoubleStep::setElement(const int& element, const std::vector<double>& elements)
throw (XAO_Exception)
{
checkElementIndex(element);
@ -122,7 +122,7 @@ throw (XAO_Exception)
m_values[element][i] = elements[i];
}
void DoubleStep::setComponents(const int& component, const std::vector<double>& components)
void DoubleStep::setComponent(const int& component, const std::vector<double>& components)
throw (XAO_Exception)
{
checkElementIndex(component);

4
src/XAO/XAO_DoubleStep.hxx
View File

@ -85,14 +85,14 @@ namespace XAO
* @param element the index of the element to set.
* @param elements the values to set.
*/
void setElements(const int& element, const std::vector<double>& elements) throw (XAO_Exception);
void setElement(const int& element, const std::vector<double>& elements) throw (XAO_Exception);
/**
* Sets the values for a component.
* @param component the index of the component to set.
* @param components the values to set.
*/
void setComponents(const int& component, const std::vector<double>& components) throw (XAO_Exception);
void setComponent(const int& component, const std::vector<double>& components) throw (XAO_Exception);
/**
* Sets the value for an element and a component.

4
src/XAO/XAO_IntegerStep.cxx
View File

@ -112,7 +112,7 @@ throw (XAO_Exception)
}
}
void IntegerStep::setElements(const int& element, const std::vector<int>& elements)
void IntegerStep::setElement(const int& element, const std::vector<int>& elements)
throw (XAO_Exception)
{
checkElementIndex(element);
@ -122,7 +122,7 @@ throw (XAO_Exception)
m_values[element][i] = elements[i];
}
void IntegerStep::setComponents(const int& component, const std::vector<int>& components)
void IntegerStep::setComponent(const int& component, const std::vector<int>& components)
throw (XAO_Exception)
{
checkElementIndex(component);

4
src/XAO/XAO_IntegerStep.hxx
View File

@ -85,14 +85,14 @@ namespace XAO
* @param element the index of the element to set.
* @param elements the values to set.
*/
void setElements(const int& element, const std::vector<int>& elements) throw (XAO_Exception);
void setElement(const int& element, const std::vector<int>& elements) throw (XAO_Exception);
/**
* Sets the values for a component.
* @param component the index of the component to set.
* @param components the values to set.
*/
void setComponents(const int& component, const std::vector<int>& components) throw (XAO_Exception);
void setComponent(const int& component, const std::vector<int>& components) throw (XAO_Exception);
/**
* Sets the value for an element and a component.

4
src/XAO/XAO_StringStep.cxx
View File

@ -111,7 +111,7 @@ throw (XAO_Exception)
}
}
void StringStep::setElements(const int& element, const std::vector<std::string>& elements)
void StringStep::setElement(const int& element, const std::vector<std::string>& elements)
throw (XAO_Exception)
{
checkElementIndex(element);
@ -121,7 +121,7 @@ throw (XAO_Exception)
m_values[element][i] = elements[i];
}
void StringStep::setComponents(const int& component, const std::vector<std::string>& components)
void StringStep::setComponent(const int& component, const std::vector<std::string>& components)
throw (XAO_Exception)
{
checkElementIndex(component);

4
src/XAO/XAO_StringStep.hxx
View File

@ -86,14 +86,14 @@ namespace XAO
* @param element the index of the element to set.
* @param elements the values to set.
*/
void setElements(const int& element, const std::vector<std::string>& elements) throw (XAO_Exception);
void setElement(const int& element, const std::vector<std::string>& elements) throw (XAO_Exception);
/**
* Sets the values for a component.
* @param component the index of the component to set.
* @param components the values to set.
*/
void setComponents(const int& component, const std::vector<std::string>& components) throw (XAO_Exception);
void setComponent(const int& component, const std::vector<std::string>& components) throw (XAO_Exception);
/**
* Sets the value for an element and a component.

65
src/XAO/tests/FieldTest.cxx
View File

@ -210,21 +210,21 @@ void FieldTest::testBooleanStepValues()
std::vector<bool> newEltValues;
// only one value
newEltValues.push_back(true);
CPPUNIT_ASSERT_THROW(step->setElements(2, newEltValues), XAO_Exception);
CPPUNIT_ASSERT_THROW(step->setElement(2, newEltValues), XAO_Exception);
// all values
for (int i = 1; i < nbComponents; ++i)
newEltValues.push_back(true);
step->setElements(2, newEltValues);
step->setElement(2, newEltValues);
// set one component
std::vector<bool> newCompValues;
// only one value
newCompValues.push_back(true);
CPPUNIT_ASSERT_THROW(step->setComponents(1, newCompValues), XAO_Exception);
CPPUNIT_ASSERT_THROW(step->setComponent(1, newCompValues), XAO_Exception);
// all values
for (int i = 1; i < nbElements; ++i)
newCompValues.push_back(true);
step->setComponents(1, newCompValues);
step->setComponent(1, newCompValues);
// set string value
step->setStringValue(0, 0, "true");
@ -284,18 +284,18 @@ void FieldTest::testIntegerStepValues()
// set one element
std::vector<int> newEltValues;
newEltValues.push_back(1);
CPPUNIT_ASSERT_THROW(step->setElements(2, newEltValues), XAO_Exception);
CPPUNIT_ASSERT_THROW(step->setElement(2, newEltValues), XAO_Exception);
for (int i = 1; i < nbComponents; ++i)
newEltValues.push_back(1);
step->setElements(2, newEltValues);
step->setElement(2, newEltValues);
// set one component
std::vector<int> newCompValues;
newCompValues.push_back(100);
CPPUNIT_ASSERT_THROW(step->setComponents(1, newCompValues), XAO_Exception);
CPPUNIT_ASSERT_THROW(step->setComponent(1, newCompValues), XAO_Exception);
for (int i = 1; i < nbElements; ++i)
newCompValues.push_back(100);
step->setComponents(1, newCompValues);
step->setComponent(1, newCompValues);
// set string value
step->setStringValue(0, 0, "0");
@ -355,18 +355,18 @@ void FieldTest::testDoubleStepValues()
// set one element
std::vector<double> newEltValues;
newEltValues.push_back(1.);
CPPUNIT_ASSERT_THROW(step->setElements(2, newEltValues), XAO_Exception);
CPPUNIT_ASSERT_THROW(step->setElement(2, newEltValues), XAO_Exception);
for (int i = 1; i < nbComponents; ++i)
newEltValues.push_back(1.);
step->setElements(2, newEltValues);
step->setElement(2, newEltValues);
// set one component
std::vector<double> newCompValues;
newCompValues.push_back(100.0);
CPPUNIT_ASSERT_THROW(step->setComponents(1, newCompValues), XAO_Exception);
CPPUNIT_ASSERT_THROW(step->setComponent(1, newCompValues), XAO_Exception);
for (int i = 1; i < nbElements; ++i)
newCompValues.push_back(100.0);
step->setComponents(1, newCompValues);
step->setComponent(1, newCompValues);
// set string value
step->setStringValue(0, 0, "0.2");
@ -424,21 +424,20 @@ void FieldTest::testStringStepValues()
// set one element
std::vector<std::string> newEltValues;
newEltValues.push_back("1");
CPPUNIT_ASSERT_THROW(step->setElements(2, newEltValues), XAO_Exception);
CPPUNIT_ASSERT_THROW(step->setElement(2, newEltValues), XAO_Exception);
for (int i = 1; i < nbComponents; ++i)
newEltValues.push_back("1");
step->setElements(2, newEltValues);
step->setElement(2, newEltValues);
// set one component
std::vector<std::string> newCompValues;
newCompValues.push_back("100");
CPPUNIT_ASSERT_THROW(step->setComponents(1, newCompValues), XAO_Exception);
CPPUNIT_ASSERT_THROW(step->setComponent(1, newCompValues), XAO_Exception);
for (int i = 1; i < nbElements; ++i)
newCompValues.push_back("100");
step->setComponents(1, newCompValues);
step->setComponent(1, newCompValues);
// set string value
std::cout << "set string value" << std::endl;
step->setStringValue(0, 0, "0");
std::vector<std::string> allValues;
@ -448,4 +447,34 @@ void FieldTest::testStringStepValues()
// all values
for (int i = 1; i < nbElements*nbComponents; ++i)
allValues.push_back("abc");
step->setValues(allValues);}
step->setValues(allValues);
}
void FieldTest::testSetComponents()
{
// field with 3 components
Field* f = Field::createField(XAO::INTEGER, XAO::FACE, 6, 3);
CPPUNIT_ASSERT_EQUAL(std::string(""), f->getComponentName(0));
CPPUNIT_ASSERT_EQUAL(std::string(""), f->getComponentName(1));
CPPUNIT_ASSERT_EQUAL(std::string(""), f->getComponentName(2));
std::vector<std::string> names;
names.push_back("vx");
f->setComponentsNames(names);
CPPUNIT_ASSERT_EQUAL(std::string("vx"), f->getComponentName(0));
CPPUNIT_ASSERT_EQUAL(std::string(""), f->getComponentName(1));
CPPUNIT_ASSERT_EQUAL(std::string(""), f->getComponentName(2));
names.push_back("vy");
f->setComponentsNames(names);
CPPUNIT_ASSERT_EQUAL(std::string("vx"), f->getComponentName(0));
CPPUNIT_ASSERT_EQUAL(std::string("vy"), f->getComponentName(1));
CPPUNIT_ASSERT_EQUAL(std::string(""), f->getComponentName(2));
names.push_back("vz");
names.push_back("t");
f->setComponentsNames(names);
CPPUNIT_ASSERT_EQUAL(std::string("vx"), f->getComponentName(0));
CPPUNIT_ASSERT_EQUAL(std::string("vy"), f->getComponentName(1));
CPPUNIT_ASSERT_EQUAL(std::string("vz"), f->getComponentName(2));
}