Rijn/Advanced-Software-Engineering-Drawing-Project
Private
Public Access
1
0 Fork 0
Code Activity

Added extra options for fill and pen color

Browse Source
This commit is contained in:
Lukasz Baldyga committed 2020-10-25 09:43:07 +00:00
1 parent b1e307b6de
commit 72d94cddc6
1 file changed
+38 -4
Download Patch File Download Diff File Expand all files Collapse all files
Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs
+38 -4
View File
@@ -132,24 +132,58 @@ namespace Advanced_Software_Engineering {
return new Dot(drawer); return new Dot(drawer);
} else throw new Exception("Command doesn't take parameters"); } else throw new Exception("Command doesn't take parameters");
case "clear": case "clear":
if (parameters.Length == 0) { if (parameters.Length == 0) {
return new Clear(drawer); return new Clear(drawer);
} else throw new Exception("Command doesn't take parameters"); } else throw new Exception("Command doesn't take parameters");
case "reset": case "reset":
if (parameters.Length == 0) { if (parameters.Length == 0) {
return new ResetPen(drawer); return new ResetPen(drawer);
} else throw new Exception("Command doesn't take parameters"); } else throw new Exception("Command doesn't take parameters");
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: