Private
Public Access
Changed DrawingVerbs to have a different name space
This commit is contained in:
1 parent
c136093ab3
commit
0d8fa71602
15 files changed
+17
-16
No files matched your search
+1
-1
@@ -4,7 +4,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Advanced_Software_Engineering {
|
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||||
class Circle : Verb {
|
class Circle : Verb {
|
||||||
Drawer drawer;
|
Drawer drawer;
|
||||||
double scale;
|
double scale;
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Advanced_Software_Engineering {
|
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||||
public class Clear : Verb {
|
public class Clear : Verb {
|
||||||
Drawer drawer;
|
Drawer drawer;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Advanced_Software_Engineering {
|
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||||
public class Dot : Verb {
|
public class Dot : Verb {
|
||||||
Drawer drawer;
|
Drawer drawer;
|
||||||
public Dot(Drawer drawer) {
|
public Dot(Drawer drawer) {
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Advanced_Software_Engineering {
|
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||||
class DrawLines : Verb {
|
class DrawLines : Verb {
|
||||||
Drawer drawer;
|
Drawer drawer;
|
||||||
Point[] points;
|
Point[] points;
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Advanced_Software_Engineering {
|
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||||
public class DrawTo : Verb {
|
public class DrawTo : Verb {
|
||||||
protected Drawer drawer;
|
protected Drawer drawer;
|
||||||
protected Point moveToPoint;
|
protected Point moveToPoint;
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Advanced_Software_Engineering {
|
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||||
public class FillColor : Verb {
|
public class FillColor : Verb {
|
||||||
|
|
||||||
Drawer drawer;
|
Drawer drawer;
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Advanced_Software_Engineering {
|
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||||
public class MoveTo : Verb {
|
public class MoveTo : Verb {
|
||||||
|
|
||||||
protected Drawer drawer;
|
protected Drawer drawer;
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Advanced_Software_Engineering {
|
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||||
class PenColor : Verb {
|
class PenColor : Verb {
|
||||||
|
|
||||||
Drawer drawer;
|
Drawer drawer;
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Advanced_Software_Engineering {
|
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||||
class Quadrilateral : Verb {
|
class Quadrilateral : Verb {
|
||||||
Verb verb;
|
Verb verb;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Advanced_Software_Engineering {
|
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||||
//TODO: correct
|
//TODO: correct
|
||||||
class Rectangle : Verb {
|
class Rectangle : Verb {
|
||||||
Verb verb;
|
Verb verb;
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Advanced_Software_Engineering {
|
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// A class that generates a RegularPolygon verb.
|
/// A class that generates a RegularPolygon verb.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Advanced_Software_Engineering {
|
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||||
public class ResetPen : Verb {
|
public class ResetPen : Verb {
|
||||||
Drawer drawer;
|
Drawer drawer;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Advanced_Software_Engineering {
|
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||||
class Square : Verb {
|
class Square : Verb {
|
||||||
|
|
||||||
Verb verb;
|
Verb verb;
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Advanced_Software_Engineering {
|
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||||
public class Triangle : Verb {
|
public class Triangle : Verb {
|
||||||
Verb verb;
|
Verb verb;
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ using System.Linq;
|
|||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
using System.Windows.Forms.VisualStyles;
|
using System.Windows.Forms.VisualStyles;
|
||||||
|
using Advanced_Software_Engineering.Verbs.DrawingVerbs;
|
||||||
|
|
||||||
namespace Advanced_Software_Engineering {
|
namespace Advanced_Software_Engineering {
|
||||||
public class VerbFactory {
|
public class VerbFactory {
|
||||||
@@ -81,7 +82,7 @@ namespace Advanced_Software_Engineering {
|
|||||||
case "rectangle":
|
case "rectangle":
|
||||||
//Check parameters
|
//Check parameters
|
||||||
if (parameters.Length == 2) {
|
if (parameters.Length == 2) {
|
||||||
return new Rectangle(drawer,
|
return new Advanced_Software_Engineering.Verbs.DrawingVerbs.Rectangle(drawer,
|
||||||
Value.ConvertToDouble(parameters[0]),
|
Value.ConvertToDouble(parameters[0]),
|
||||||
Value.ConvertToDouble(parameters[1])
|
Value.ConvertToDouble(parameters[1])
|
||||||
);
|
);
|
||||||
@@ -93,7 +94,7 @@ namespace Advanced_Software_Engineering {
|
|||||||
Value.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 Advanced_Software_Engineering.Verbs.DrawingVerbs.Rectangle(drawer,
|
||||||
Value.ConvertToPoint(parameters[0], parameters[1]),
|
Value.ConvertToPoint(parameters[0], parameters[1]),
|
||||||
Value.ConvertToPoint(parameters[2], parameters[3])
|
Value.ConvertToPoint(parameters[2], parameters[3])
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in new issue
Block a user