rename setElements to setElement and setComponents to setComponent

diff --git a/src/XAO/XAO_BooleanStep.cxx b/src/XAO/XAO_BooleanStep.cxx
index 8d93c1d44c60908663e4578570fcc9652c476682..7a0d81adee4248bcc610cfe5c49cdfc069c05bdd 100644 (file)
--- a/src/XAO/XAO_BooleanStep.cxx
+++ b/src/XAO/XAO_BooleanStep.cxx
@@ -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);

diff --git a/src/XAO/XAO_BooleanStep.hxx b/src/XAO/XAO_BooleanStep.hxx
index c6ceb3e601b5e600c3f81921b523819edf2dd543..9986a069aa0108c4cab3b84d53046f05dfd44d1e 100644 (file)
--- a/src/XAO/XAO_BooleanStep.hxx
+++ b/src/XAO/XAO_BooleanStep.hxx
@@ -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.

diff --git a/src/XAO/XAO_DoubleStep.cxx b/src/XAO/XAO_DoubleStep.cxx
index f4e5bf9bad337e58fa4d93305d014fd3e2585e46..aa5aa3cd335248a9b08a4026ece8bda7e43721dd 100644 (file)
--- a/src/XAO/XAO_DoubleStep.cxx
+++ b/src/XAO/XAO_DoubleStep.cxx
@@ -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);

diff --git a/src/XAO/XAO_DoubleStep.hxx b/src/XAO/XAO_DoubleStep.hxx
index 72a92c5a5c3965026bca4a6c81f05d43c6129f8f..5f4f3e34ad3fcb11e1615ea7208db7f4a8849e0f 100644 (file)
--- a/src/XAO/XAO_DoubleStep.hxx
+++ b/src/XAO/XAO_DoubleStep.hxx
@@ -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.

diff --git a/src/XAO/XAO_IntegerStep.cxx b/src/XAO/XAO_IntegerStep.cxx
index ecd4fa077023ba724c87d473dcbd97aa06b26b0b..89d2b79830b9f90e017863d507be7090693fb819 100644 (file)
--- a/src/XAO/XAO_IntegerStep.cxx
+++ b/src/XAO/XAO_IntegerStep.cxx
@@ -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);

diff --git a/src/XAO/XAO_IntegerStep.hxx b/src/XAO/XAO_IntegerStep.hxx
index 10d50a5bf3ebd58d3ee99531fb264a4894b5c2ce..09673466a8847014937c41cb16c89c7cf6d39e88 100644 (file)
--- a/src/XAO/XAO_IntegerStep.hxx
+++ b/src/XAO/XAO_IntegerStep.hxx
@@ -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.

diff --git a/src/XAO/XAO_StringStep.cxx b/src/XAO/XAO_StringStep.cxx
index 8ab3cbb1fddfc1be7b6eafb0a7846eeacd23c2b1..b04da15684b9a480129f9a3d1493475ab2249f35 100644 (file)
--- a/src/XAO/XAO_StringStep.cxx
+++ b/src/XAO/XAO_StringStep.cxx
@@ -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);

diff --git a/src/XAO/XAO_StringStep.hxx b/src/XAO/XAO_StringStep.hxx
index a623bb5804d706c3dcc20da6a0df8dc649d4e43f..b0eb2f61511efe918f510f28066845d19448f3ed 100644 (file)
--- a/src/XAO/XAO_StringStep.hxx
+++ b/src/XAO/XAO_StringStep.hxx
@@ -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.

diff --git a/src/XAO/tests/FieldTest.cxx b/src/XAO/tests/FieldTest.cxx
index f5e9be0002cd12505e74160e561ee357d780fcf8..d4e3dd313d9c4d443dae4803b1397a3d41e354e9 100644 (file)
--- a/src/XAO/tests/FieldTest.cxx
+++ b/src/XAO/tests/FieldTest.cxx
@@ -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));
+}