Add helper messages for enums to strings and strings to enums

Author: maxnz

src/AnimationData.hpp

@@ -126,6 +126,35 @@ class AnimationData {
         return *this;
     }
 
+    static std::string continuousToString(enum Continuous c) {
+        switch (c) {
+            case CONTINUOUS:
+                return "true";
+            case NONCONTINUOUS:
+                return "false";
+            case DEFAULT:
+                return "null";
+        }
+    }
+
+    static enum Direction directionFromString(const std::string & d) {
+        if (std::strcmp(d.c_str(), "BACKWARD") == 0) return BACKWARD;
+        else if (std::strcmp(d.c_str(), "FORWARD") == 0) return FORWARD;
+        else {
+            std::cerr << "Bad direction string " << d << std::endl;
+            return FORWARD;
+        }
+    }
+
+    static std::string directionToString(enum Direction d) {
+        switch (d) {
+            case FORWARD:
+                return "FORWARD";
+            case BACKWARD:
+                return "BACKWARD";
+        }
+    }
+
     AnimationData() = default;
 
     explicit AnimationData(nlohmann::json data) {
@@ -168,11 +197,8 @@ class AnimationData {
         else if (!data["delayMod"].is_null())
             std::cerr << "Bad type for delayMod" << data["delayMod"].type_name() << std::endl;
 
-        if (data["direction"].is_string() && std::strcmp(data["direction"].get<std::string>().c_str(), "FORWARD") == 0)
-            setDirection(FORWARD);
-        else if (data["direction"].is_string() &&
-                 std::strcmp(data["direction"].get<std::string>().c_str(), "BACKWARD") == 0)
-            setDirection(BACKWARD);
+        if (data["direction"].is_string())
+            setDirection(directionFromString(data["direction"].get<std::string>()));
         else if (!data["direction"].is_null())
             std::cerr << "Bad type for direction" << data["direction"].type_name() << std::endl;
 
@@ -220,17 +246,7 @@ class AnimationData {
         data.append(std::to_string(center));
 
         data.append(R"(,"continuous":)");
-        switch (continuous) {
-            case CONTINUOUS:
-                data.append("true");
-                break;
-            case NONCONTINUOUS:
-                data.append("false");
-                break;
-            case DEFAULT:
-                data.append("null");
-                break;
-        }
+        data.append(continuousToString(continuous));
 
         data.append(R"(,"delay":)");
         data.append(std::to_string(delay));
@@ -239,14 +255,7 @@ class AnimationData {
         data.append(std::to_string(delay_mod));
 
         data.append(R"(,"direction":")");
-        switch (direction) {
-            case FORWARD:
-                data.append("FORWARD");
-                break;
-            case BACKWARD:
-                data.append("BACKWARD");
-                break;
-        }
+        data.append(directionToString(direction));
 
         data.append(R"(","distance":)");
         data.append(std::to_string(distance));

src/AnimationInfo.hpp

@@ -150,12 +150,20 @@ class AnimationInfo {
         return *this;
     }
 
-    static ParamUsage paramUsageString(const std::string & p) {
+    static ParamUsage paramUsageFromString(const std::string & p) {
         if (std::strcmp(p.c_str(), "USED") == 0) return USED;
         else if (std::strcmp(p.c_str(), "NOTUSED") == 0) return NOTUSED;
         else return NOTUSED;
     }
 
+    static std::string paramUsageToString(ParamUsage p) {
+        switch (p) {
+            case USED:
+                return "USED";
+            case NOTUSED:
+                return "NOTUSED";
+        }
+    }
 
     AnimationInfo() = default;
 
@@ -196,27 +204,27 @@ class AnimationInfo {
             std::cerr << "Bad type for unlimitedColors" << data["unlimitedColors"].type_name() << std::endl;
 
         if (data["center"].is_string())
-            setCenter(paramUsageString(data["center"].get<std::string>()));
+            setCenter(paramUsageFromString(data["center"].get<std::string>()));
         else if (!data["center"].is_null())
             std::cerr << "Bad type for center" << data["center"].type_name() << std::endl;
 
         if (data["delay"].is_string())
-            setDelay(paramUsageString(data["delay"].get<std::string>()));
+            setDelay(paramUsageFromString(data["delay"].get<std::string>()));
         else if (!data["delay"].is_null())
             std::cerr << "Bad type for delay" << data["delay"].type_name() << std::endl;
 
         if (data["direction"].is_string())
-            setDirection(paramUsageString(data["direction"].get<std::string>()));
+            setDirection(paramUsageFromString(data["direction"].get<std::string>()));
         else if (!data["direction"].is_null())
             std::cerr << "Bad type for direction" << data["direction"].type_name() << std::endl;
 
         if (data["distance"].is_string())
-            setDistance(paramUsageString(data["distance"].get<std::string>()));
+            setDistance(paramUsageFromString(data["distance"].get<std::string>()));
         else if (!data["distance"].is_null())
             std::cerr << "Bad type for distance" << data["distance"].type_name() << std::endl;
 
         if (data["spacing"].is_string())
-            setSpacing(paramUsageString(data["spacing"].get<std::string>()));
+            setSpacing(paramUsageFromString(data["spacing"].get<std::string>()));
         else if (!data["spacing"].is_null())
             std::cerr << "Bad type for spacing" << data["spacing"].type_name() << std::endl;