[params] Add int constructor for PciSequenceId

Author: kostorr

include/ReadoutCard/ParameterTypes/PciSequenceNumber.h

@@ -34,6 +34,11 @@ class PciSequenceNumber
   /// \param string String of format "^#[0-9]+$"
   PciSequenceNumber(const std::string& string);
 
+  /// Constructs a PciSequenceNumber object using an int
+  /// For example: 1, 4, 0
+  /// \param number An int between 0-7
+  PciSequenceNumber(const int& number);
+
   /// Converts to a PciSequenceNumber object from a string that matches "^#[0-9]+$"
   /// For example: "#04"
   static boost::optional<PciSequenceNumber> fromString(std::string string);

src/ParameterTypes/PciSequenceNumber.cxx

@@ -27,7 +27,7 @@ namespace
 
 int parseSequenceNumberString(const std::string& string)
 {
-  std::regex expression("^[ \t]*#[0-9]+[ \t]*$");
+  std::regex expression("^[ \t]*#[0-7]+[ \t]*$");
   if (std::regex_search(string, expression)) {
     return stoi(string.substr(string.find('#') + 1));
   } else {
@@ -36,6 +36,16 @@ int parseSequenceNumberString(const std::string& string)
   }
 }
 
+std::string constructSequenceNumberString(const int& number)
+{
+  if (number < 0 || number > 7) {
+    BOOST_THROW_EXCEPTION(ParseException()
+                          << ErrorInfo::Message("Parsing PCI sequence number failed"));
+  }
+
+  return std::string("#" + std::to_string(number));
+}
+
 } // namespace
 
 PciSequenceNumber::PciSequenceNumber(const std::string& string)
@@ -44,6 +54,12 @@ PciSequenceNumber::PciSequenceNumber(const std::string& string)
   mSequenceNumber = parseSequenceNumberString(string);
 }
 
+PciSequenceNumber::PciSequenceNumber(const int& number)
+{
+  mSequenceNumberString = constructSequenceNumberString(number);
+  mSequenceNumber = number;
+}
+
 std::string PciSequenceNumber::toString() const
 {
   return mSequenceNumberString;

test/TestParameters.cxx

@@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE(ParametersCardIdFromString)
     BOOST_CHECK(Parameters::cardIdFromString("12345") != cardId);
   }
   {
-    Parameters::CardIdType cardId = 12345;
+    Parameters::CardIdType cardId = SerialId(12345);
     BOOST_CHECK(Parameters::cardIdFromString("42:0.0") != cardId);
     BOOST_CHECK(Parameters::cardIdFromString("12345") == cardId);
   }