clock interval

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

diff --git a/dev3/psychlops/core/graphic/canvas.cs b/dev3/psychlops/core/graphic/canvas.cs
index d9e0d37..9d2cad3 100644 (file)
--- a/dev3/psychlops/core/graphic/canvas.cs
+++ b/dev3/psychlops/core/graphic/canvas.cs
@@ -7,6 +7,7 @@ using System.Windows.Media;
 using System.Windows.Media.Animation;\r
 using System.Windows.Media.Imaging;\r
 using System.Windows.Shapes;\r
+using System.Windows.Browser;\r
 \r
 \r
 \r
@@ -140,6 +141,12 @@ namespace Psychlops
                        api_canvas.MouseWheel += Mouse.Canvas_MouseWheel;\r
                        panel.KeyDown += Keyboard.Canvas_KeyDown;\r
                        panel.KeyUp += Keyboard.Canvas_KeyUp;\r
+\r
+                       HtmlElement htmlHost = HtmlPage.Document.GetElementById("silverlightControlHost");\r
+                       //if (htmlHost != null) HtmlPage.Window.Alert("silverlightControlHost is null");\r
+                       htmlHost.SetStyleAttribute("width", (200+wid).ToString()+"px");\r
+                       htmlHost.SetStyleAttribute("height", (20+hei).ToString() + "px");\r
+                       htmlHost.SetStyleAttribute("margin", "2em auto auto auto");\r
                }\r
 \r
                #endregion\r
@@ -200,9 +207,12 @@ namespace Psychlops
                        if (nextIntervalFrame <= 0)\r
                        {\r
                                var tmp = new System.Windows.Controls.Canvas();\r
-                               foreach (Internal.PrimitiveFigure f in stack)\r
+                               if (stack.Count > 0)\r
                                {\r
-                                       tmp.Children.Add(f.toNative());\r
+                                       foreach (Internal.PrimitiveFigure f in stack)\r
+                                       {\r
+                                               tmp.Children.Add(f.toNative());\r
+                                       }\r
                                }\r
                                api_canvas.Children.Clear();\r
                                api_canvas.Children.Add(tmp);\r