OSDN Git Service

123
authorunknown <hskwk@.(none)>
Mon, 9 Aug 2010 15:18:41 +0000 (00:18 +0900)
committerunknown <hskwk@.(none)>
Mon, 9 Aug 2010 15:18:41 +0000 (00:18 +0900)
dev4/psychlops/core/graphic/canvas.cs
dev4/psychlops/core/graphic/module.cs

index 282d67a..5a1a7c9 100644 (file)
@@ -960,9 +960,10 @@ namespace Psychlops
                        cnvs = new System.Windows.Controls.Canvas();\r
                        AsyncBool = true;\r
                }\r
-               delegate void AppendFunc1(System.Func<Figure> func);\r
-               public void append__(Shape fig)\r
+               delegate void AppendFunc1(System.Func<Internal.PrimitiveFigure> func);\r
+               public void append__(Internal.PrimitiveFigure fig)\r
                {\r
+                       cnvs.Children.Add(fig.toNative());\r
                }\r
 \r
                public Group clone()\r
index a53a41a..b899cae 100644 (file)
@@ -147,20 +147,23 @@ namespace Psychlops
        {\r
                System.Collections.Generic.List<Figure> list;\r
                System.Windows.Controls.Canvas cnvs;\r
+               AppendFunc1 append_;\r
                bool AsyncBool;\r
                public double rotation;\r
                Point axis, scaling;\r
 \r
                public Group()\r
                {\r
+                       append_ = new AppendFunc1(append__);\r
                        list = new System.Collections.Generic.List<Figure>();\r
                        AsyncBool = false;\r
                        initialize__();\r
                        while (!AsyncBool) { }\r
                }\r
-               public Group append(Figure fig)\r
+               public Group append(Internal.PrimitiveFigure fig)\r
                {\r
                        list.Add(fig);\r
+                       append_(fig);\r
                        return this;\r
                }\r
 \r