Fix for #127

Adds boolean 'reverse' to the Axis object.  Axis is already an l1v4 addition, so we don't need special level/version-checking code.

Author: luciansmith

src/sedml/SedAxis.cpp

@@ -59,6 +59,8 @@ SedAxis::SedAxis(unsigned int level, unsigned int version)
   , mIsSetMax (false)
   , mGrid (false)
   , mIsSetGrid (false)
+  , mReverse (false)
+  , mIsSetReverse (false)
   , mStyle ("")
   , mElementName("axis")
 {
@@ -78,6 +80,8 @@ SedAxis::SedAxis(SedNamespaces *sedmlns)
   , mIsSetMax (false)
   , mGrid (false)
   , mIsSetGrid (false)
+  , mReverse (false)
+  , mIsSetReverse (false)
   , mStyle ("")
   , mElementName("axis")
 {
@@ -97,6 +101,8 @@ SedAxis::SedAxis(const SedAxis& orig)
   , mIsSetMax ( orig.mIsSetMax )
   , mGrid ( orig.mGrid )
   , mIsSetGrid ( orig.mIsSetGrid )
+  , mReverse ( orig.mReverse )
+  , mIsSetReverse ( orig.mIsSetReverse )
   , mStyle ( orig.mStyle )
   , mElementName ( orig.mElementName )
 {
@@ -119,6 +125,8 @@ SedAxis::operator=(const SedAxis& rhs)
     mIsSetMax = rhs.mIsSetMax;
     mGrid = rhs.mGrid;
     mIsSetGrid = rhs.mIsSetGrid;
+    mReverse = rhs.mReverse;
+    mIsSetReverse = rhs.mIsSetReverse;
     mStyle = rhs.mStyle;
     mElementName = rhs.mElementName;
   }
@@ -196,6 +204,16 @@ SedAxis::getGrid() const
 }
 
 
+/*
+ * Returns the value of the "reverse" attribute of this SedAxis.
+ */
+bool
+SedAxis::getReverse() const
+{
+    return mReverse;
+}
+
+
 /*
  * Returns the value of the "style" attribute of this SedAxis.
  */
@@ -246,6 +264,16 @@ SedAxis::isSetGrid() const
 }
 
 
+/*
+ * Predicate returning @c true if this SedAxis's "reverse" attribute is set.
+ */
+bool
+SedAxis::isSetReverse() const
+{
+    return mIsSetReverse;
+}
+
+
 /*
  * Predicate returning @c true if this SedAxis's "style" attribute is set.
  */
@@ -328,6 +356,18 @@ SedAxis::setGrid(bool grid)
 }
 
 
+/*
+ * Sets the value of the "reverse" attribute of this SedAxis.
+ */
+int
+SedAxis::setReverse(bool reverse)
+{
+    mReverse = reverse;
+    mIsSetReverse = true;
+    return LIBSEDML_OPERATION_SUCCESS;
+}
+
+
 /*
  * Sets the value of the "style" attribute of this SedAxis.
  */
@@ -417,6 +457,26 @@ SedAxis::unsetGrid()
 }
 
 
+/*
+ * Unsets the value of the "reverse" attribute of this SedAxis.
+ */
+int
+SedAxis::unsetReverse()
+{
+    mReverse = false;
+    mIsSetReverse = false;
+
+    if (isSetReverse() == false)
+    {
+        return LIBSEDML_OPERATION_SUCCESS;
+    }
+    else
+    {
+        return LIBSEDML_OPERATION_FAILED;
+    }
+}
+
+
 /*
  * Unsets the value of the "style" attribute of this SedAxis.
  */
@@ -570,6 +630,12 @@ SedAxis::getAttribute(const std::string& attributeName, bool& value) const
     return_value = LIBSEDML_OPERATION_SUCCESS;
   }
 
+  if (attributeName == "reverse")
+  {
+      value = getReverse();
+      return_value = LIBSEDML_OPERATION_SUCCESS;
+  }
+
   return return_value;
 }
 
@@ -706,6 +772,10 @@ SedAxis::isSetAttribute(const std::string& attributeName) const
   {
     value = isSetGrid();
   }
+  else if (attributeName == "reverse")
+  {
+      value = isSetReverse();
+  }
   else if (attributeName == "style")
   {
     value = isSetStyle();
@@ -732,6 +802,10 @@ SedAxis::setAttribute(const std::string& attributeName, bool value)
   {
     return_value = setGrid(value);
   }
+  else if (attributeName == "reverse")
+  {
+      return_value = setReverse(value);
+  }
 
   return return_value;
 }
@@ -853,6 +927,10 @@ SedAxis::unsetAttribute(const std::string& attributeName)
   {
     value = unsetGrid();
   }
+  else if (attributeName == "reverse")
+  {
+      value = unsetReverse();
+  }
   else if (attributeName == "style")
   {
     value = unsetStyle();
@@ -884,6 +962,8 @@ SedAxis::addExpectedAttributes(LIBSBML_CPP_NAMESPACE_QUALIFIER
 
   attributes.add("grid");
 
+  attributes.add("reverse");
+
   attributes.add("style");
 }
 
@@ -1027,6 +1107,23 @@ SedAxis::readAttributes(
     }
   }
 
+  // 
+  // reverse bool (use = "optional" )
+  // 
+
+  numErrs = log ? log->getNumErrors() : 0;
+  mIsSetReverse = attributes.readInto("reverse", mReverse);
+
+  if (mIsSetReverse == false)
+  {
+      if (log && log->getNumErrors() == numErrs + 1 &&
+          log->contains(XMLAttributeTypeMismatch))
+      {
+          log->remove(XMLAttributeTypeMismatch);
+          log->logError(SedmlAxisReverseMustBeBoolean, level, version);
+      }
+  }
+
   // 
   // style SIdRef (use = "optional" )
   // 
@@ -1090,6 +1187,11 @@ SedAxis::writeAttributes(LIBSBML_CPP_NAMESPACE_QUALIFIER XMLOutputStream&
     stream.writeAttribute("grid", getPrefix(), mGrid);
   }
 
+  if (isSetReverse() == true)
+  {
+      stream.writeAttribute("reverse", getPrefix(), mReverse);
+  }
+
   if (isSetStyle() == true)
   {
     stream.writeAttribute("style", getPrefix(), mStyle);
@@ -1207,6 +1309,17 @@ SedAxis_getGrid(const SedAxis_t * sa)
 }
 
 
+/*
+ * Returns the value of the "reverse" attribute of this SedAxis_t.
+ */
+LIBSEDML_EXTERN
+int
+SedAxis_getReverse(const SedAxis_t* sa)
+{
+    return (sa != NULL) ? static_cast<int>(sa->getReverse()) : 0;
+}
+
+
 /*
  * Returns the value of the "style" attribute of this SedAxis_t.
  */
@@ -1267,6 +1380,17 @@ SedAxis_isSetGrid(const SedAxis_t * sa)
 }
 
 
+/*
+ * Predicate returning @c 1 (true) if this SedAxis_t's "reverse" attribute is set.
+ */
+LIBSEDML_EXTERN
+int
+SedAxis_isSetReverse(const SedAxis_t* sa)
+{
+    return (sa != NULL) ? static_cast<int>(sa->isSetReverse()) : 0;
+}
+
+
 /*
  * Predicate returning @c 1 (true) if this SedAxis_t's "style" attribute is
  * set.
@@ -1334,6 +1458,17 @@ SedAxis_setGrid(SedAxis_t * sa, int grid)
 }
 
 
+/*
+ * Sets the value of the "reverse" attribute of this SedAxis_t.
+ */
+LIBSEDML_EXTERN
+int
+SedAxis_setReverse(SedAxis_t* sa, int reverse)
+{
+    return (sa != NULL) ? sa->setReverse(reverse) : LIBSEDML_INVALID_OBJECT;
+}
+
+
 /*
  * Sets the value of the "style" attribute of this SedAxis_t.
  */
@@ -1389,6 +1524,17 @@ SedAxis_unsetGrid(SedAxis_t * sa)
 }
 
 
+/*
+ * Unsets the value of the "reverse" attribute of this SedAxis_t.
+ */
+LIBSEDML_EXTERN
+int
+SedAxis_unsetReverse(SedAxis_t* sa)
+{
+    return (sa != NULL) ? sa->unsetReverse() : LIBSEDML_INVALID_OBJECT;
+}
+
+
 /*
  * Unsets the value of the "style" attribute of this SedAxis_t.
  */