Merge branch 'master' of git.sourceforge.jp:/gitroot/psychlops/silverlight

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

diff --git a/dev4/psychlops/core/graphic/canvas.cs b/dev4/psychlops/core/graphic/canvas.cs
index be3cbae..e037ef7 100644 (file)
--- a/dev4/psychlops/core/graphic/canvas.cs
+++ b/dev4/psychlops/core/graphic/canvas.cs
@@ -10,7 +10,7 @@ using System.Windows.Shapes;
 using System.Windows.Browser;\r
 \r
 using System.Collections.Generic;\r
-\r
+ \r
 \r
 \r
 namespace Psychlops\r
@@ -237,7 +237,7 @@ namespace Psychlops
                        Psychlops.Internal.Main.widgetStack.Orientation = Orientation.Vertical;\r
                        Psychlops.Internal.Main.widgetStack.Height = hei;\r
                        api_canvas.Children.Add(Psychlops.Internal.Main.widgetStack);\r
-                       \r
+                       Internal.Main.statusBar.Visibility = Visibility.Collapsed;\r
 \r
 \r
                        UIElementPool = new System.Windows.Controls.Canvas[CONST.MAX_OBJ_N];\r
@@ -1116,16 +1116,16 @@ namespace Psychlops
                        var bitmap = new BitmapImage();\r
                        bitmap.CreateOptions = BitmapCreateOptions.None;\r
                        bitmap.UriSource = uri;\r
-                       try\r
-                       {\r
+                       //try\r
+                       //{\r
                                var wbm = new System.Windows.Media.Imaging.WriteableBitmap(bitmap);\r
                                buffer = wbm;\r
-                       }\r
-                       catch (Exception e)\r
-                       {\r
-                               buffer = new WriteableBitmap(64, 64);\r
-                               buffer.ForEach(bitmap_drawChecker);\r
-                       }\r
+                       //}\r
+                       //catch (Exception e)\r
+                       //{\r
+                       //      buffer = new WriteableBitmap(64, 64);\r
+                       //      buffer.ForEach(bitmap_drawChecker);\r
+                       //}\r
                        self_rect.set(buffer.PixelWidth, buffer.PixelHeight);\r
                        AsyncBool = true;\r
                }\r