Private
Public Access
Added extra options for fill and pen color
This commit is contained in:
1 parent
b1e307b6de
commit
72d94cddc6
1 file changed
+34
@@ -146,10 +146,44 @@ namespace Advanced_Software_Engineering {
|
|||||||
case "pen":
|
case "pen":
|
||||||
if (parameters.Length == 1) {
|
if (parameters.Length == 1) {
|
||||||
return new PenColor(drawer, Value.TextToColor(parameters[0]));
|
return new PenColor(drawer, Value.TextToColor(parameters[0]));
|
||||||
|
} else if (parameters.Length == 3) {
|
||||||
|
return new PenColor(drawer,
|
||||||
|
Value.IntsToColor(
|
||||||
|
Value.ConvertToInt(parameters[0]),
|
||||||
|
Value.ConvertToInt(parameters[1]),
|
||||||
|
Value.ConvertToInt(parameters[2])
|
||||||
|
)
|
||||||
|
);
|
||||||
|
} else if (parameters.Length == 4) {
|
||||||
|
return new PenColor(drawer,
|
||||||
|
Value.IntsToColor(
|
||||||
|
Value.ConvertToInt(parameters[0]),
|
||||||
|
Value.ConvertToInt(parameters[1]),
|
||||||
|
Value.ConvertToInt(parameters[2]),
|
||||||
|
Value.ConvertToInt(parameters[3])
|
||||||
|
)
|
||||||
|
);
|
||||||
} else throw new Exception("Command has an incorrect number of parameters");
|
} else throw new Exception("Command has an incorrect number of parameters");
|
||||||
case "fill":
|
case "fill":
|
||||||
if (parameters.Length == 1) {
|
if (parameters.Length == 1) {
|
||||||
return new FillColor(drawer, Value.TextToColor(parameters[0]));
|
return new FillColor(drawer, Value.TextToColor(parameters[0]));
|
||||||
|
} else if (parameters.Length == 3) {
|
||||||
|
return new FillColor(drawer,
|
||||||
|
Value.IntsToColor(
|
||||||
|
Value.ConvertToInt(parameters[0]),
|
||||||
|
Value.ConvertToInt(parameters[1]),
|
||||||
|
Value.ConvertToInt(parameters[2])
|
||||||
|
)
|
||||||
|
);
|
||||||
|
} else if (parameters.Length == 4) {
|
||||||
|
return new FillColor(drawer,
|
||||||
|
Value.IntsToColor(
|
||||||
|
Value.ConvertToInt(parameters[0]),
|
||||||
|
Value.ConvertToInt(parameters[1]),
|
||||||
|
Value.ConvertToInt(parameters[2]),
|
||||||
|
Value.ConvertToInt(parameters[3])
|
||||||
|
)
|
||||||
|
);
|
||||||
} else throw new Exception("Command has an incorrect number of parameters");
|
} else throw new Exception("Command has an incorrect number of parameters");
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|||||||
Reference in new issue
Block a user