hk

[psychlops/silverlight.git] / dev3 / psychlops / core / graphic / module.cs

diff --git a/dev3/psychlops/core/graphic/module.cs b/dev3/psychlops/core/graphic/module.cs
index b21784c..2ecc730 100644 (file)
--- a/dev3/psychlops/core/graphic/module.cs
+++ b/dev3/psychlops/core/graphic/module.cs
@@ -66,6 +66,13 @@ namespace Psychlops
                        r = g = b = lum;\r
                        a = 1.0;\r
                }\r
+               public Color(double red, double green, double blue)\r
+               {\r
+                       r = red;\r
+                       g = green;\r
+                       b = blue;\r
+                       a = 1.0;\r
+               }\r
                public Color(double red, double green, double blue, double alpha)\r
                {\r
                        r = red;\r
@@ -73,6 +80,25 @@ namespace Psychlops
                        b = blue;\r
                        a = alpha;\r
                }\r
+               public void set(double lum)\r
+               {\r
+                       r = g = b = lum;\r
+                       a = 1.0;\r
+               }\r
+               public void set(double red, double green, double blue)\r
+               {\r
+                       r = red;\r
+                       g = green;\r
+                       b = blue;\r
+                       a = 1.0;\r
+               }\r
+               public void set(double red, double green, double blue, double alpha)\r
+               {\r
+                       r = red;\r
+                       g = green;\r
+                       b = blue;\r
+                       a = alpha;\r
+               }\r
                public static implicit operator System.Windows.Media.Color(Color d)\r
                {\r
                        return System.Windows.Media.Color.FromArgb((byte)(d.a * 255), (byte)(d.r * 255), (byte)(d.g * 255), (byte)(d.b * 255));\r
@@ -100,8 +126,9 @@ namespace Psychlops
                void line(Line drawee, Color col);\r
                void rect(Rectangle drawee, Color col);\r
                void ellipse(Ellipse drawee, Color col);\r
-               void image(Image drawee);\r
                void polygon(Polygon drawee, Color col);\r
+               void letters(Letters drawee, Color col);\r
+               void image(Image drawee);\r
        }\r
 \r
 \r
@@ -122,10 +149,12 @@ namespace Psychlops
                {\r
                        return target.centering(Main.drawable.getCenter());\r
                }\r
+               public static Figure centering(this Figure target, double x, double y)\r
+               {\r
+                       return target.centering(new Point(x, y));\r
+               }\r
        }\r
 \r
-\r
-\r
        public class Image : Figure\r
        {\r
                public WriteableBitmap buffer;\r