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

Removed conversions from Settings and Functions into it's own file

Browse Source
This commit is contained in:
Lukasz Baldyga committed 2020-10-25 06:24:28 +00:00
1 parent 731005fc9b
commit 54215a6e00
4 files changed
+57 -46
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj
+1
View File
@@ -75,6 +75,7 @@
<Compile Include="Verbs\DrawingVerbs\RegularPolygon.cs" /> <Compile Include="Verbs\DrawingVerbs\RegularPolygon.cs" />
<Compile Include="Verbs\DrawingVerbs\Square.cs" /> <Compile Include="Verbs\DrawingVerbs\Square.cs" />
<Compile Include="Verbs\DrawingVerbs\Triangle.cs" /> <Compile Include="Verbs\DrawingVerbs\Triangle.cs" />
<Compile Include="Verbs\Value.cs" />
<Compile Include="Verbs\Verb.cs" /> <Compile Include="Verbs\Verb.cs" />
<Compile Include="Windows\AboutWindow.cs"> <Compile Include="Windows\AboutWindow.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
Advanced Software Engineering/Advanced Software Engineering/SettingsAndHelperFunctions.cs
-15
View File
@@ -74,21 +74,6 @@ namespace Advanced_Software_Engineering {
} }
public static int ConvertToInt(string text) {
text = Strip(text);
return int.Parse(text);
}
public static double ConvertToDouble(string text) {
text = Strip(text);
return double.Parse(text);
}
//TODO: Make unit tests for this function
public static Point ConvertToPoint(string text1, string text2) {
return new Point(ConvertToInt(text1), ConvertToInt(text2));
}
public static List<string> StripStringArray(string[] array) { public static List<string> StripStringArray(string[] array) {
List<string> newStringList = new List<string>(); List<string> newStringList = new List<string>();
Advanced Software Engineering/Advanced Software Engineering/Verbs/Value.cs
+25
View File
@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Advanced_Software_Engineering {
class Value {
public static int ConvertToInt(string text) {
text = SettingsAndHelperFunctions.Strip(text);
return int.Parse(text);
}
public static double ConvertToDouble(string text) {
text = SettingsAndHelperFunctions.Strip(text);
return double.Parse(text);
}
//TODO: Make unit tests for this function
public static Point ConvertToPoint(string text1, string text2) {
return new Point(ConvertToInt(text1), ConvertToInt(text2));
}
}
}
Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs
+31 -31
View File
@@ -24,8 +24,8 @@ namespace Advanced_Software_Engineering {
//Check parameters //Check parameters
if (parameters.Length == 2) { if (parameters.Length == 2) {
return new MoveTo(drawer, return new MoveTo(drawer,
SettingsAndHelperFunctions.ConvertToInt(parameters[0]), Value.ConvertToInt(parameters[0]),
SettingsAndHelperFunctions.ConvertToInt(parameters[1])); Value.ConvertToInt(parameters[1]));
} else throw new Exception("Command has an incorrect number of parameters"); } else throw new Exception("Command has an incorrect number of parameters");
@@ -36,8 +36,8 @@ namespace Advanced_Software_Engineering {
if (parameters.Length == 2) { if (parameters.Length == 2) {
return new return new
DrawTo(drawer, DrawTo(drawer,
SettingsAndHelperFunctions.ConvertToInt(parameters[0]), Value.ConvertToInt(parameters[0]),
SettingsAndHelperFunctions.ConvertToInt(parameters[1])); Value.ConvertToInt(parameters[1]));
} else throw new Exception("Command has an incorrect number of parameters"); } else throw new Exception("Command has an incorrect number of parameters");
case "regularpolygon": case "regularpolygon":
case "rp": case "rp":
@@ -45,14 +45,14 @@ namespace Advanced_Software_Engineering {
if (parameters.Length == 2) { if (parameters.Length == 2) {
return new return new
RegularPolygon(drawer, RegularPolygon(drawer,
SettingsAndHelperFunctions.ConvertToInt(parameters[0]), Value.ConvertToInt(parameters[0]),
SettingsAndHelperFunctions.ConvertToDouble(parameters[1]) Value.ConvertToDouble(parameters[1])
); );
} else if (parameters.Length == 3) { } else if (parameters.Length == 3) {
return new RegularPolygon(drawer, return new RegularPolygon(drawer,
SettingsAndHelperFunctions.ConvertToInt(parameters[0]), Value.ConvertToInt(parameters[0]),
SettingsAndHelperFunctions.ConvertToDouble(parameters[1]), Value.ConvertToDouble(parameters[1]),
SettingsAndHelperFunctions.ConvertToDouble(parameters[2]) Value.ConvertToDouble(parameters[2])
); );
} else throw new Exception("Command has an incorrect number of parameters"); } else throw new Exception("Command has an incorrect number of parameters");
case "square": case "square":
@@ -60,42 +60,42 @@ namespace Advanced_Software_Engineering {
if (parameters.Length == 1) { if (parameters.Length == 1) {
return new return new
Square(drawer, Square(drawer,
SettingsAndHelperFunctions.ConvertToDouble(parameters[0]) Value.ConvertToDouble(parameters[0])
); );
} else if (parameters.Length == 2) { } else if (parameters.Length == 2) {
return new Square(drawer, return new Square(drawer,
SettingsAndHelperFunctions.ConvertToDouble(parameters[0]), Value.ConvertToDouble(parameters[0]),
SettingsAndHelperFunctions.ConvertToDouble(parameters[1]) Value.ConvertToDouble(parameters[1])
); );
} else throw new Exception("Command has an incorrect number of parameters"); } else throw new Exception("Command has an incorrect number of parameters");
case "quadrilateral": case "quadrilateral":
//Check parameters //Check parameters
if (parameters.Length == 8) { if (parameters.Length == 8) {
return new Quadrilateral(drawer, return new Quadrilateral(drawer,
SettingsAndHelperFunctions.ConvertToPoint(parameters[0], parameters[1]), Value.ConvertToPoint(parameters[0], parameters[1]),
SettingsAndHelperFunctions.ConvertToPoint(parameters[2], parameters[3]), Value.ConvertToPoint(parameters[2], parameters[3]),
SettingsAndHelperFunctions.ConvertToPoint(parameters[4], parameters[5]), Value.ConvertToPoint(parameters[4], parameters[5]),
SettingsAndHelperFunctions.ConvertToPoint(parameters[6], parameters[7]) Value.ConvertToPoint(parameters[6], parameters[7])
); );
} else throw new Exception("Command has an incorrect number of parameters"); } else throw new Exception("Command has an incorrect number of parameters");
case "rectangle": case "rectangle":
//Check parameters //Check parameters
if (parameters.Length == 2) { if (parameters.Length == 2) {
return new Rectangle(drawer, return new Rectangle(drawer,
SettingsAndHelperFunctions.ConvertToDouble(parameters[0]), Value.ConvertToDouble(parameters[0]),
SettingsAndHelperFunctions.ConvertToDouble(parameters[1]) Value.ConvertToDouble(parameters[1])
); );
} else if (parameters.Length == 8) { } else if (parameters.Length == 8) {
return new Quadrilateral(drawer, return new Quadrilateral(drawer,
SettingsAndHelperFunctions.ConvertToPoint(parameters[0], parameters[1]), Value.ConvertToPoint(parameters[0], parameters[1]),
SettingsAndHelperFunctions.ConvertToPoint(parameters[2], parameters[3]), Value.ConvertToPoint(parameters[2], parameters[3]),
SettingsAndHelperFunctions.ConvertToPoint(parameters[4], parameters[5]), Value.ConvertToPoint(parameters[4], parameters[5]),
SettingsAndHelperFunctions.ConvertToPoint(parameters[6], parameters[7]) Value.ConvertToPoint(parameters[6], parameters[7])
); );
} else if (parameters.Length == 4) { } else if (parameters.Length == 4) {
return new Rectangle(drawer, return new Rectangle(drawer,
SettingsAndHelperFunctions.ConvertToPoint(parameters[0], parameters[1]), Value.ConvertToPoint(parameters[0], parameters[1]),
SettingsAndHelperFunctions.ConvertToPoint(parameters[2], parameters[3]) Value.ConvertToPoint(parameters[2], 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 "circle": case "circle":
@@ -103,7 +103,7 @@ namespace Advanced_Software_Engineering {
if (parameters.Length == 1) { if (parameters.Length == 1) {
return new return new
Circle(drawer, Circle(drawer,
SettingsAndHelperFunctions.ConvertToDouble(parameters[0]) Value.ConvertToDouble(parameters[0])
); );
} else throw new Exception("Command has an incorrect number of parameters"); } else throw new Exception("Command has an incorrect number of parameters");
case "triangle": case "triangle":
@@ -111,19 +111,19 @@ namespace Advanced_Software_Engineering {
if (parameters.Length == 1) { if (parameters.Length == 1) {
return new return new
Triangle(drawer, Triangle(drawer,
SettingsAndHelperFunctions.ConvertToDouble(parameters[0]) Value.ConvertToDouble(parameters[0])
); );
} else if (parameters.Length == 2) { } else if (parameters.Length == 2) {
return new return new
Triangle(drawer, Triangle(drawer,
SettingsAndHelperFunctions.ConvertToDouble(parameters[0]), Value.ConvertToDouble(parameters[0]),
SettingsAndHelperFunctions.ConvertToDouble(parameters[1]) Value.ConvertToDouble(parameters[1])
); );
} else if (parameters.Length == 6) { } else if (parameters.Length == 6) {
return new Triangle(drawer, return new Triangle(drawer,
SettingsAndHelperFunctions.ConvertToPoint(parameters[0], parameters[1]), Value.ConvertToPoint(parameters[0], parameters[1]),
SettingsAndHelperFunctions.ConvertToPoint(parameters[2], parameters[3]), Value.ConvertToPoint(parameters[2], parameters[3]),
SettingsAndHelperFunctions.ConvertToPoint(parameters[4], parameters[5]) Value.ConvertToPoint(parameters[4], parameters[5])
); );
} else throw new Exception("Command has an incorrect number of parameters"); } else throw new Exception("Command has an incorrect number of parameters");