OSDN Git Service
(root)
/
psychlops
/
silverlight.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.sourceforge.jp:/gitroot/psychlops/silverlight
[psychlops/silverlight.git]
/
dev4
/
psychlops
/
core
/
graphic
/
shape.cs
diff --git
a/dev4/psychlops/core/graphic/shape.cs
b/dev4/psychlops/core/graphic/shape.cs
index
b007b7f
..
aa0885d
100644
(file)
--- a/
dev4/psychlops/core/graphic/shape.cs
+++ b/
dev4/psychlops/core/graphic/shape.cs
@@
-59,6
+59,8
@@
namespace Psychlops{
color = c;
\r
thick = t;
\r
}
\r
color = c;
\r
thick = t;
\r
}
\r
+ public static readonly Stroke null_line = new Stroke(Color.null_color, 0);
\r
+ public static readonly Stroke hair_line = new Stroke(Color.white, 1);
\r
}
\r
\r
public partial class Line : Shape
\r
}
\r
\r
public partial class Line : Shape
\r
@@
-88,14
+90,20
@@
namespace Psychlops{
\r
public Line()
\r
{
\r
\r
public Line()
\r
{
\r
+ fill = Color.white;
\r
+ stroke = Stroke.hair_line;
\r
set(0,0,0,0);
\r
}
\r
public Line(double x1, double y1, double x2, double y2)
\r
{
\r
set(0,0,0,0);
\r
}
\r
public Line(double x1, double y1, double x2, double y2)
\r
{
\r
+ fill = Color.white;
\r
+ stroke = Stroke.hair_line;
\r
set(x1, y1, x2, y2);
\r
}
\r
public Line(Point v1, Point v2)
\r
{
\r
set(x1, y1, x2, y2);
\r
}
\r
public Line(Point v1, Point v2)
\r
{
\r
+ fill = Color.white;
\r
+ stroke = Stroke.hair_line;
\r
set(v1, v2);
\r
}
\r
public Line set(double x1, double y1, double x2, double y2)
\r
set(v1, v2);
\r
}
\r
public Line set(double x1, double y1, double x2, double y2)
\r
@@
-172,14
+180,20
@@
namespace Psychlops{
\r
public Rectangle()
\r
{
\r
\r
public Rectangle()
\r
{
\r
+ fill = Color.white;
\r
+ stroke = Stroke.null_line;
\r
set(0,0);
\r
}
\r
public Rectangle(double wid, double hei)
\r
{
\r
set(0,0);
\r
}
\r
public Rectangle(double wid, double hei)
\r
{
\r
+ fill = Color.white;
\r
+ stroke = Stroke.null_line;
\r
set(wid, hei);
\r
}
\r
public Rectangle(Rectangle another)
\r
{
\r
set(wid, hei);
\r
}
\r
public Rectangle(Rectangle another)
\r
{
\r
+ fill = Color.white;
\r
+ stroke = Stroke.null_line;
\r
v1 = another.v1;
\r
v2 = another.v2;
\r
}
\r
v1 = another.v1;
\r
v2 = another.v2;
\r
}
\r
@@
-348,10
+362,14
@@
namespace Psychlops{
\r
public Ellipse()
\r
{
\r
\r
public Ellipse()
\r
{
\r
+ fill = Color.white;
\r
+ stroke = Stroke.null_line;
\r
set(0,0);
\r
}
\r
public Ellipse(double wid, double hei)
\r
{
\r
set(0,0);
\r
}
\r
public Ellipse(double wid, double hei)
\r
{
\r
+ fill = Color.white;
\r
+ stroke = Stroke.null_line;
\r
set(wid, hei);
\r
}
\r
\r
set(wid, hei);
\r
}
\r
\r
@@
-415,10
+433,14
@@
namespace Psychlops{
\r
public Polygon()
\r
{
\r
\r
public Polygon()
\r
{
\r
+ fill = Color.white;
\r
+ stroke = Stroke.null_line;
\r
vertices = new System.Collections.Generic.List<Point>();
\r
}
\r
public Polygon(double[] verts)
\r
{
\r
vertices = new System.Collections.Generic.List<Point>();
\r
}
\r
public Polygon(double[] verts)
\r
{
\r
+ fill = Color.white;
\r
+ stroke = Stroke.null_line;
\r
vertices = new System.Collections.Generic.List<Point>();
\r
for (int i=0; i < verts.Length; i+=2)
\r
{
\r
vertices = new System.Collections.Generic.List<Point>();
\r
for (int i=0; i < verts.Length; i+=2)
\r
{
\r
@@
-428,6
+450,8
@@
namespace Psychlops{
}
\r
public Polygon(Point[] verts)
\r
{
\r
}
\r
public Polygon(Point[] verts)
\r
{
\r
+ fill = Color.white;
\r
+ stroke = Stroke.null_line;
\r
vertices = new System.Collections.Generic.List<Point>();
\r
foreach (Point p in verts)
\r
{
\r
vertices = new System.Collections.Generic.List<Point>();
\r
foreach (Point p in verts)
\r
{
\r