From 51531a3c1f05b7cf474723c5cf38a3206e65407f Mon Sep 17 00:00:00 2001 From: whothe Date: Thu, 22 Feb 2024 22:49:18 +0100 Subject: [PATCH] fix ternary compile error --- Camera-AgX-Lib.h | 51 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/Camera-AgX-Lib.h b/Camera-AgX-Lib.h index 8b3e284..1ce08f8 100644 --- a/Camera-AgX-Lib.h +++ b/Camera-AgX-Lib.h @@ -699,8 +699,21 @@ angle = XYZ.x ==0.0f? 0.0f:angle; angle = angle - Roffset; angle = angle>1?angle - 1:angle<0?angle+1:angle; -float slope = angle > Gangle && angle <= Bangle ? RGBBoundaries.blue.x : angle > Bangle or angle <= Rangle ? RGBBoundaries.green.x : angle > Rangle && angle <= Gangle ? RGBBoundaries.red.x : 1; -float Bound = angle > Gangle && angle <= Bangle ? RGBBoundaries.blue.y : angle > Bangle or angle <= Rangle ? RGBBoundaries.green.y : angle > Rangle && angle <= Gangle ? RGBBoundaries.red.y: 1; +float slope, Bound; + +if (angle > Gangle && angle <= Bangle) { + slope = RGBBoundaries.blue.x; + Bound = RGBBoundaries.blue.y; +} else if (angle > Bangle || angle <= Rangle) { + slope = RGBBoundaries.green.x; + Bound = RGBBoundaries.green.y; +} else if (angle > Rangle && angle <= Gangle) { + slope = RGBBoundaries.red.x; + Bound = RGBBoundaries.red.y; +} else { + slope = 1; + Bound = 1; +} float interx = Bound/(divxy-slope); float intery = interx*divxy; @@ -761,8 +774,21 @@ float angle = hcl.x; angle = angle - Roffset; angle = angle>1?angle - 1:angle<0?angle+1:angle; -float slope = angle > Gangle && angle <= Bangle ? RGBBoundaries.blue.x : angle > Bangle or angle <= Rangle ? RGBBoundaries.green.x : angle > Rangle && angle <= Gangle ? RGBBoundaries.red.x : 1; -float Bound = angle > Gangle && angle <= Bangle ? RGBBoundaries.blue.y : angle > Bangle or angle <= Rangle ? RGBBoundaries.green.y : angle > Rangle && angle <= Gangle ? RGBBoundaries.red.y: 1; +float slope, Bound; + +if (angle > Gangle && angle <= Bangle) { + slope = RGBBoundaries.blue.x; + Bound = RGBBoundaries.blue.y; +} else if (angle > Bangle || angle <= Rangle) { + slope = RGBBoundaries.green.x; + Bound = RGBBoundaries.green.y; +} else if (angle > Rangle && angle <= Gangle) { + slope = RGBBoundaries.red.x; + Bound = RGBBoundaries.red.y; +} else { + slope = 1; + Bound = 1; +} angle = angle + Roffset; angle = angle>1?angle - 1:angle<0?angle+1:angle; @@ -841,8 +867,21 @@ float angle = hcl.x; angle = angle - Roffset; angle = angle>1?angle - 1:angle<0?angle+1:angle; -float slope = angle > Gangle && angle <= Bangle ? RGBBoundaries.blue.x : angle > Bangle or angle <= Rangle ? RGBBoundaries.green.x : angle > Rangle && angle <= Gangle ? RGBBoundaries.red.x : 1; -float Bound = angle > Gangle && angle <= Bangle ? RGBBoundaries.blue.y : angle > Bangle or angle <= Rangle ? RGBBoundaries.green.y : angle > Rangle && angle <= Gangle ? RGBBoundaries.red.y: 1; +float slope, Bound; + +if (angle > Gangle && angle <= Bangle) { + slope = RGBBoundaries.blue.x; + Bound = RGBBoundaries.blue.y; +} else if (angle > Bangle || angle <= Rangle) { + slope = RGBBoundaries.green.x; + Bound = RGBBoundaries.green.y; +} else if (angle > Rangle && angle <= Gangle) { + slope = RGBBoundaries.red.x; + Bound = RGBBoundaries.red.y; +} else { + slope = 1; + Bound = 1; +} angle = angle + Roffset; angle = angle>1?angle - 1:angle<0?angle+1:angle;