Fixed Toolpath Layer Data check

Author: alexanderoster

ACT/LibMC.xml

@@ -705,6 +705,12 @@
 		<error name="INVALIDROWRANGE" code="680" description="Invalid row range." />
 		<error name="CONFIGURATIONLISTNAMEMISSING" code="681" description="Configuration list name missing" />
 		<error name="CONFIGURATIONLISTBUTTONNAMEMISSING" code="682" description="Configuration list button name missing" />
+		<error name="NONLINEAROVERRIDEPARAMETERNOTINCREASING" code="683" description="Nonlinear override parameter not increasing" />
+		<error name="NONLINEAROVERRIDEPARAMETEROUTOFRANGE" code="684" description="Nonlinear override parameter out of range" />
+		<error name="NONLINEAROVERRIDEFACTOROUTOFRANGE" code="685" description="Nonlinear override factor out of range" />
+		
+		
+		
 
 	</errors>
 

Framework/HeadersCore/CppDynamic/libmc_dynamic.hpp

@@ -774,6 +774,9 @@ class ELibMCException : public std::exception {
 			case LIBMC_ERROR_INVALIDROWRANGE: return "INVALIDROWRANGE";
 			case LIBMC_ERROR_CONFIGURATIONLISTNAMEMISSING: return "CONFIGURATIONLISTNAMEMISSING";
 			case LIBMC_ERROR_CONFIGURATIONLISTBUTTONNAMEMISSING: return "CONFIGURATIONLISTBUTTONNAMEMISSING";
+			case LIBMC_ERROR_NONLINEAROVERRIDEPARAMETERNOTINCREASING: return "NONLINEAROVERRIDEPARAMETERNOTINCREASING";
+			case LIBMC_ERROR_NONLINEAROVERRIDEPARAMETEROUTOFRANGE: return "NONLINEAROVERRIDEPARAMETEROUTOFRANGE";
+			case LIBMC_ERROR_NONLINEAROVERRIDEFACTOROUTOFRANGE: return "NONLINEAROVERRIDEFACTOROUTOFRANGE";
 		}
 		return "UNKNOWN";
 	}
@@ -1382,6 +1385,9 @@ class ELibMCException : public std::exception {
 			case LIBMC_ERROR_INVALIDROWRANGE: return "Invalid row range.";
 			case LIBMC_ERROR_CONFIGURATIONLISTNAMEMISSING: return "Configuration list name missing";
 			case LIBMC_ERROR_CONFIGURATIONLISTBUTTONNAMEMISSING: return "Configuration list button name missing";
+			case LIBMC_ERROR_NONLINEAROVERRIDEPARAMETERNOTINCREASING: return "Nonlinear override parameter not increasing";
+			case LIBMC_ERROR_NONLINEAROVERRIDEPARAMETEROUTOFRANGE: return "Nonlinear override parameter out of range";
+			case LIBMC_ERROR_NONLINEAROVERRIDEFACTOROUTOFRANGE: return "Nonlinear override factor out of range";
 		}
 		return "unknown error";
 	}

Framework/HeadersCore/CppDynamic/libmc_types.hpp

@@ -696,6 +696,9 @@ typedef void * LibMC_pvoid;
 #define LIBMC_ERROR_INVALIDROWRANGE 680 /** Invalid row range. */
 #define LIBMC_ERROR_CONFIGURATIONLISTNAMEMISSING 681 /** Configuration list name missing */
 #define LIBMC_ERROR_CONFIGURATIONLISTBUTTONNAMEMISSING 682 /** Configuration list button name missing */
+#define LIBMC_ERROR_NONLINEAROVERRIDEPARAMETERNOTINCREASING 683 /** Nonlinear override parameter not increasing */
+#define LIBMC_ERROR_NONLINEAROVERRIDEPARAMETEROUTOFRANGE 684 /** Nonlinear override parameter out of range */
+#define LIBMC_ERROR_NONLINEAROVERRIDEFACTOROUTOFRANGE 685 /** Nonlinear override factor out of range */
 
 /*************************************************************************************************************************
  Error strings for LibMC
@@ -1304,6 +1307,9 @@ inline const char * LIBMC_GETERRORSTRING (LibMCResult nErrorCode) {
     case LIBMC_ERROR_INVALIDROWRANGE: return "Invalid row range.";
     case LIBMC_ERROR_CONFIGURATIONLISTNAMEMISSING: return "Configuration list name missing";
     case LIBMC_ERROR_CONFIGURATIONLISTBUTTONNAMEMISSING: return "Configuration list button name missing";
+    case LIBMC_ERROR_NONLINEAROVERRIDEPARAMETERNOTINCREASING: return "Nonlinear override parameter not increasing";
+    case LIBMC_ERROR_NONLINEAROVERRIDEPARAMETEROUTOFRANGE: return "Nonlinear override parameter out of range";
+    case LIBMC_ERROR_NONLINEAROVERRIDEFACTOROUTOFRANGE: return "Nonlinear override factor out of range";
     default: return "unknown error";
   }
 }

Framework/InterfacesCore/libmc_types.hpp

@@ -696,6 +696,9 @@ typedef void * LibMC_pvoid;
 #define LIBMC_ERROR_INVALIDROWRANGE 680 /** Invalid row range. */
 #define LIBMC_ERROR_CONFIGURATIONLISTNAMEMISSING 681 /** Configuration list name missing */
 #define LIBMC_ERROR_CONFIGURATIONLISTBUTTONNAMEMISSING 682 /** Configuration list button name missing */
+#define LIBMC_ERROR_NONLINEAROVERRIDEPARAMETERNOTINCREASING 683 /** Nonlinear override parameter not increasing */
+#define LIBMC_ERROR_NONLINEAROVERRIDEPARAMETEROUTOFRANGE 684 /** Nonlinear override parameter out of range */
+#define LIBMC_ERROR_NONLINEAROVERRIDEFACTOROUTOFRANGE 685 /** Nonlinear override factor out of range */
 
 /*************************************************************************************************************************
  Error strings for LibMC
@@ -1304,6 +1307,9 @@ inline const char * LIBMC_GETERRORSTRING (LibMCResult nErrorCode) {
     case LIBMC_ERROR_INVALIDROWRANGE: return "Invalid row range.";
     case LIBMC_ERROR_CONFIGURATIONLISTNAMEMISSING: return "Configuration list name missing";
     case LIBMC_ERROR_CONFIGURATIONLISTBUTTONNAMEMISSING: return "Configuration list button name missing";
+    case LIBMC_ERROR_NONLINEAROVERRIDEPARAMETERNOTINCREASING: return "Nonlinear override parameter not increasing";
+    case LIBMC_ERROR_NONLINEAROVERRIDEPARAMETEROUTOFRANGE: return "Nonlinear override parameter out of range";
+    case LIBMC_ERROR_NONLINEAROVERRIDEFACTOROUTOFRANGE: return "Nonlinear override factor out of range";
     default: return "unknown error";
   }
 }

Implementation/Core/amc_toolpathlayerdata.cpp

@@ -464,8 +464,22 @@ namespace AMC {
 
 								size_t nInterpolationDataStartIndex = m_InterpolationData.size();
 								if (nonLinearValues.size() > 0) {
-									for (auto & interpolationData : nonLinearValues)
+									double dPreviousParameter = 0.0;
+									double dMinParameterIncrease = 1e-5;
+									double dMaxParameter = 1.0 - dMinParameterIncrease;
+
+									for (auto& interpolationData : nonLinearValues) {
+										if (interpolationData.m_Parameter < dPreviousParameter + dMinParameterIncrease) 
+											throw ELibMCCustomException(LIBMC_ERROR_NONLINEAROVERRIDEPARAMETERNOTINCREASING, std::to_string (interpolationData.m_Parameter) + " in " + m_sDebugName);
+
+										if (interpolationData.m_Parameter > dMaxParameter)
+											throw ELibMCCustomException(LIBMC_ERROR_NONLINEAROVERRIDEPARAMETEROUTOFRANGE, std::to_string(interpolationData.m_Parameter) + " in " + m_sDebugName);
+
+										if (interpolationData.m_Factor < 0.0 || interpolationData.m_Factor > 1.0)
+											throw ELibMCCustomException(LIBMC_ERROR_NONLINEAROVERRIDEFACTOROUTOFRANGE, std::to_string(interpolationData.m_Factor) + " in " + m_sDebugName);
+
 										m_InterpolationData.push_back(interpolationData);
+									}
 								}
 
 								if (hatchFactors.size() > 0) {