From 2daabfa0e981d8d2e33c068c9cc84ecb3cf2daa0 Mon Sep 17 00:00:00 2001
From: Julian Schuler <31921487+julianschuler@users.noreply.github.com>
Date: Sat, 17 Dec 2022 23:37:44 +0100
Subject: Add 'exact' option for 'splitratio' (#1245)

* Simplify getPlusMinusKeywordResult()

* Add an 'exact' option for 'splitratio'
---
 src/helpers/MiscFunctions.cpp | 105 +++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 67 deletions(-)

(limited to 'src/helpers/MiscFunctions.cpp')

diff --git a/src/helpers/MiscFunctions.cpp b/src/helpers/MiscFunctions.cpp
index 67b0efcb..710ff351 100644
--- a/src/helpers/MiscFunctions.cpp
+++ b/src/helpers/MiscFunctions.cpp
@@ -30,38 +30,38 @@
 #endif
 
 static const float transforms[][9] = {{
-		1.0f, 0.0f, 0.0f,
-		0.0f, 1.0f, 0.0f,
-		0.0f, 0.0f, 1.0f,
-	},{
-		0.0f, 1.0f, 0.0f,
-		-1.0f, 0.0f, 0.0f,
-		0.0f, 0.0f, 1.0f,
-	},{
-		-1.0f, 0.0f, 0.0f,
-		0.0f, -1.0f, 0.0f,
-		0.0f, 0.0f, 1.0f,
-	},{
-		0.0f, -1.0f, 0.0f,
-		1.0f, 0.0f, 0.0f,
-		0.0f, 0.0f, 1.0f,
-	},{
-		-1.0f, 0.0f, 0.0f,
-		0.0f, 1.0f, 0.0f,
-		0.0f, 0.0f, 1.0f,
-	},{
-		0.0f, 1.0f, 0.0f,
-		1.0f, 0.0f, 0.0f,
-		0.0f, 0.0f, 1.0f,
-	},{
-		1.0f, 0.0f, 0.0f,
-		0.0f, -1.0f, 0.0f,
-		0.0f, 0.0f, 1.0f,
-	},{
-		0.0f, -1.0f, 0.0f,
-		-1.0f, 0.0f, 0.0f,
-		0.0f, 0.0f, 1.0f,
-	},
+        1.0f, 0.0f, 0.0f,
+        0.0f, 1.0f, 0.0f,
+        0.0f, 0.0f, 1.0f,
+    },{
+        0.0f, 1.0f, 0.0f,
+        -1.0f, 0.0f, 0.0f,
+        0.0f, 0.0f, 1.0f,
+    },{
+        -1.0f, 0.0f, 0.0f,
+        0.0f, -1.0f, 0.0f,
+        0.0f, 0.0f, 1.0f,
+    },{
+        0.0f, -1.0f, 0.0f,
+        1.0f, 0.0f, 0.0f,
+        0.0f, 0.0f, 1.0f,
+    },{
+        -1.0f, 0.0f, 0.0f,
+        0.0f, 1.0f, 0.0f,
+        0.0f, 0.0f, 1.0f,
+    },{
+        0.0f, 1.0f, 0.0f,
+        1.0f, 0.0f, 0.0f,
+        0.0f, 0.0f, 1.0f,
+    },{
+        1.0f, 0.0f, 0.0f,
+        0.0f, -1.0f, 0.0f,
+        0.0f, 0.0f, 1.0f,
+    },{
+        0.0f, -1.0f, 0.0f,
+        -1.0f, 0.0f, 0.0f,
+        0.0f, 0.0f, 1.0f,
+    },
 };
 
 std::string absolutePath(const std::string& rawpath, const std::string& currentPath) {
@@ -162,41 +162,12 @@ std::string removeBeginEndSpacesTabs(std::string str) {
 }
 
 float getPlusMinusKeywordResult(std::string source, float relative) {
-    float result = INT_MAX;
-
-    if (source[0] == '+') {
-        try {
-            if (source.contains('.'))
-                result = relative + std::stof(source.substr(1));
-            else
-                result = relative + std::stoi(source.substr(1));
-        } catch (...) {
-            Debug::log(ERR, "Invalid arg \"%s\" in getPlusMinusKeywordResult!", source.c_str());
-            return INT_MAX;
-        }
-    } else if (source[0] == '-') {
-        try {
-            if (source.contains('.'))
-                result = relative - std::stof(source.substr(1));
-            else
-                result = relative - std::stoi(source.substr(1));
-        } catch (...) {
-            Debug::log(ERR, "Invalid arg \"%s\" in getPlusMinusKeywordResult!", source.c_str());
-            return INT_MAX;
-        }
-    } else {
-        try {
-            if (source.contains('.'))
-                result = stof(source);
-            else
-                result = stoi(source);
-        } catch (...) {
-            Debug::log(ERR, "Invalid arg \"%s\" in getPlusMinusKeywordResult!", source.c_str());
-            return INT_MAX;
-        }
+    try {
+        return relative + stof(source);
+    } catch (...) {
+        Debug::log(ERR, "Invalid arg \"%s\" in getPlusMinusKeywordResult!", source.c_str());
+        return INT_MAX;
     }
-
-    return result;
 }
 
 bool isNumber(const std::string& str, bool allowfloat) {
@@ -489,4 +460,4 @@ int64_t configStringToInt(const std::string& VALUE) {
         return 0;
     }
     return stol(VALUE);
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3