X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=dev4%2Fpsychlops%2Fcore%2Fgraphic%2Fshape.cs;h=aa0885d4f29342e6c8e1595c4a2777bdd4e20254;hb=2025e2db455b85eae3dec989bdfd39f3c1292df1;hp=d6ec7934e83e6ac67428cb12f79b8b4032389b90;hpb=2d16c7bc232e1d8e0f57404c4b37e3a8db6ab207;p=psychlops%2Fsilverlight.git

diff --git a/dev4/psychlops/core/graphic/shape.cs b/dev4/psychlops/core/graphic/shape.cs
index d6ec793..aa0885d 100644
--- a/dev4/psychlops/core/graphic/shape.cs
+++ b/dev4/psychlops/core/graphic/shape.cs
@@ -19,6 +19,10 @@ namespace Psychlops{
 	}
 	public static class ShapeExtention
 	{
+		public static void draw(this Shape drawee, double c)
+		{
+			drawee.draw( new Color(c) );
+		}
 		public static void draw(this Shape drawee, Color c)
 		{
 			Color tmp_col = drawee.fill;
@@ -55,6 +59,8 @@ namespace Psychlops{
 			color = c;
 			thick = t;
 		}
+		public static readonly Stroke null_line = new Stroke(Color.null_color, 0);
+		public static readonly Stroke hair_line = new Stroke(Color.white, 1);
 	}
 
 	public partial class Line : Shape
@@ -66,23 +72,51 @@ namespace Psychlops{
 			set { begin = value; }
 		}
 
+		//public static Line[] this[int x] { get { return Array(x); } }
+		//public static Line[,] this[int x, int y] { get { return Array(x, y); } }
+		public static Line[] Array(int ind)
+		{
+			Line[] l = new Line[ind];
+			for(int i=0; i<ind; i++) { l[i] = new Line(); }
+			return l;
+		}
+		public static Line[,] Array(int indx, int indy)
+		{
+			Line[,] l = new Line[indx, indy];
+			for (int i = 0; i < indx; i++) { for (int j = 0; j < indy; j++) { l[i, j] = new Line(); } }
+			return l;
+		}
+
+
+		public Line()
+		{
+			fill = Color.white;
+			stroke = Stroke.hair_line;
+			set(0,0,0,0);
+		}
 		public Line(double x1, double y1, double x2, double y2)
 		{
+			fill = Color.white;
+			stroke = Stroke.hair_line;
 			set(x1, y1, x2, y2);
 		}
 		public Line(Point v1, Point v2)
 		{
+			fill = Color.white;
+			stroke = Stroke.hair_line;
 			set(v1, v2);
 		}
-		public void set(double x1, double y1, double x2, double y2)
+		public Line set(double x1, double y1, double x2, double y2)
 		{
 			begin.set(x1, y1);
 			end.set(x2, y2);
+			return this;
 		}
-		public void set(Point v1, Point v2)
+		public Line set(Point v1, Point v2)
 		{
 			begin = v1;
 			end   = v2;
+			return this;
 		}
 
 		public Figure shift(Point p)
@@ -101,7 +135,7 @@ namespace Psychlops{
 			return this;
 		}
 
-		public void draw()
+		public virtual void draw()
 		{
 			Main.drawable.line(this);
 		}
@@ -128,16 +162,38 @@ namespace Psychlops{
 	{
 		public Point v1, v2;
 
+		//public static Rectangle[] this[int x] { get { return Array(x); } }
+		//public static Rectangle[,] this[int x, int y] { get { return Array(x, y); } }
+		public static Rectangle[] Array(int ind)
+		{
+			Rectangle[] l = new Rectangle[ind];
+			for (int i = 0; i < ind; i++) { l[i] = new Rectangle(); }
+			return l;
+		}
+		public static Rectangle[,] Array(int indx, int indy)
+		{
+			Rectangle[,] l = new Rectangle[indx, indy];
+			for (int i = 0; i < indx; i++) { for (int j = 0; j < indy; j++) { l[i, j] = new Rectangle(); } }
+			return l;
+		}
+
+
 		public Rectangle()
 		{
+			fill = Color.white;
+			stroke = Stroke.null_line;
 			set(0,0);
 		}
 		public Rectangle(double wid, double hei)
 		{
+			fill = Color.white;
+			stroke = Stroke.null_line;
 			set(wid, hei);
 		}
 		public Rectangle(Rectangle another)
 		{
+			fill = Color.white;
+			stroke = Stroke.null_line;
 			v1 = another.v1;
 			v2 = another.v2;
 		}
@@ -200,7 +256,7 @@ namespace Psychlops{
 			return this;
 		}
 
-		public void draw()
+		public virtual void draw()
 		{
 			Main.drawable.rect(this);
 		}
@@ -289,12 +345,31 @@ namespace Psychlops{
 		public Point datum { get; set; }
 		public double xdiameter, ydiameter;
 
+		//public static Ellipse[] this[int x] { get { return Array(x); } }
+		//public static Ellipse[,] this[int x, int y] { get { return Array(x, y); } }
+		public static Ellipse[] Array(int ind)
+		{
+			Ellipse[] l = new Ellipse[ind];
+			for (int i = 0; i < ind; i++) { l[i] = new Ellipse(); }
+			return l;
+		}
+		public static Ellipse[,] Array(int indx, int indy)
+		{
+			Ellipse[,] l = new Ellipse[indx, indy];
+			for (int i = 0; i < indx; i++) { for (int j = 0; j < indy; j++) { l[i, j] = new Ellipse(); } }
+			return l;
+		}
+
 		public Ellipse()
 		{
+			fill = Color.white;
+			stroke = Stroke.null_line;
 			set(0,0);
 		}
 		public Ellipse(double wid, double hei)
 		{
+			fill = Color.white;
+			stroke = Stroke.null_line;
 			set(wid, hei);
 		}
 
@@ -304,6 +379,13 @@ namespace Psychlops{
 			ydiameter = hei;
 			return this;
 		}
+		public Ellipse resize(double width, double height)
+		{
+			Point po = center;
+			set(width, height);
+			centering(po);
+			return this;
+		}
 		public Figure shift(Point p)
 		{
 			datum += p;
@@ -315,7 +397,7 @@ namespace Psychlops{
 			return this;
 		}
 
-		public void draw()
+		public virtual void draw()
 		{
 			Main.drawable.ellipse(this);
 		}
@@ -351,10 +433,14 @@ namespace Psychlops{
 
 		public Polygon()
 		{
+			fill = Color.white;
+			stroke = Stroke.null_line;
 			vertices = new System.Collections.Generic.List<Point>();
 		}
 		public Polygon(double[] verts)
 		{
+			fill = Color.white;
+			stroke = Stroke.null_line;
 			vertices = new System.Collections.Generic.List<Point>();
 			for (int i=0; i < verts.Length; i+=2)
 			{
@@ -364,6 +450,8 @@ namespace Psychlops{
 		}
 		public Polygon(Point[] verts)
 		{
+			fill = Color.white;
+			stroke = Stroke.null_line;
 			vertices = new System.Collections.Generic.List<Point>();
 			foreach (Point p in verts)
 			{
@@ -387,7 +475,7 @@ namespace Psychlops{
 			return this;
 		}
 
-		public void draw()
+		public virtual void draw()
 		{
 			Main.drawable.polygon(this);
 		}