clock interval

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

diff --git a/dev3/psychlops/core/graphic/font.cs b/dev3/psychlops/core/graphic/font.cs
index 3c03840..95dd6bc 100644 (file)
--- a/dev3/psychlops/core/graphic/font.cs
+++ b/dev3/psychlops/core/graphic/font.cs
@@ -15,8 +15,8 @@ namespace Psychlops
        {\r
                public static Font default_font;\r
 \r
-               public enum Style { normal_style, italic, oblique };\r
-               public enum Weight { normal_weight=400, bold=700 };\r
+               public enum Style { normal, italic, oblique };\r
+               public enum Weight { normal=400, bold=700 };\r
                public double size;\r
                public int weight;\r
                public Style style;\r
@@ -28,9 +28,9 @@ namespace Psychlops
                }\r
                public Font()\r
                {\r
-                       size = 24;\r
-                       weight = (int)Weight.normal_weight;\r
-                       style = Style.normal_style;\r
+                       size = 18;\r
+                       weight = (int)Weight.normal;\r
+                       style = Style.normal;\r
                        family = new string[1];\r
                }\r
                public Font(double size_, int weight_, Style style_, string family_)\r
@@ -54,7 +54,7 @@ namespace Psychlops
                }\r
        }\r
 \r
-       public class Letters : Shape\r
+       public partial class Letters : Shape\r
        {\r
                protected string str_;\r
                protected Font font_;\r
@@ -120,12 +120,12 @@ namespace Psychlops
 \r
                public void draw()\r
                {\r
-                       Main.drawable.letters(this, Color.white);\r
-               }\r
-               public void draw(Color c)\r
-               {\r
-                       Main.drawable.letters(this, c);\r
+                       Main.drawable.letters(this);\r
                }\r
+\r
+               public Color fill { get; set; }\r
+               public Stroke stroke { get; set; }\r
+\r
        }\r
 \r
 }\r