Skip to content

Commit ed1e996

Browse files
committed
Fixed incorrect assignment in the xyz to labch conversion.
1 parent 4b0cab5 commit ed1e996

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

Controller/ChromaticityConversion.cs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -139,33 +139,33 @@ public static CIELABCH XYZ2Labch(CIEXYZ XYZ, Standardilluminant illuminant, Stan
139139
b = 200.0 * (temY - temZ);
140140

141141
if (L < 0) L = 0.00;
142-
//C = Math.Sqrt(a * a + b * b);
143-
//if ((a == 0) && (b > 0))
144-
// H = 90;
145-
//else if ((a == 0) && (b < 0))
146-
// H = 270;
147-
//else if ((a >= 0) && (b == 0))
148-
// H = 0;
149-
//else if ((a < 0) && (b == 0))
150-
// H = 180;
151-
//else
152-
//{
153-
// H = Math.Atan(b / a);
154-
// H = H * 57.3;
155-
// if ((a > 0) && (b > 0))
156-
// H = H;
157-
// else if (a < 0)
158-
// H = 180 + H;
159-
// else
160-
// H = 360 + H;
161-
//}
142+
C = Math.Sqrt(a * a + b * b);
143+
if ((a == 0) && (b > 0))
144+
H = 90;
145+
else if ((a == 0) && (b < 0))
146+
H = 270;
147+
else if ((a >= 0) && (b == 0))
148+
H = 0;
149+
else if ((a < 0) && (b == 0))
150+
H = 180;
151+
else
152+
{
153+
H = Math.Atan(b / a);
154+
H = H * 57.3;
155+
if ((a > 0) && (b > 0))
156+
H = H;
157+
else if (a < 0)
158+
H = 180 + H;
159+
else
160+
H = 360 + H;
161+
}
162162

163163
double[] labch = new double[7];
164-
labch[0] = Math.Round(labch[0], 2);
165-
labch[1] = Math.Round(labch[1], 2);
166-
labch[2] = Math.Round(labch[2], 2);
167-
//labch[3] = C;
168-
//labch[4] = H;
164+
labch[0] = Math.Round(L, 2);
165+
labch[1] = Math.Round(a, 2);
166+
labch[2] = Math.Round(b, 2);
167+
labch[3] = C;
168+
labch[4] = H;
169169

170170
//double[] lab = new double[3];
171171
//lab[0] = Math.Round(labch[0], 2); // 将 L 值保留小数点后两位

0 commit comments

Comments
 (0)