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

[psychlops/silverlight.git] / test4 / MainPage.xaml.cs

diff --git a/test4/MainPage.xaml.cs b/test4/MainPage.xaml.cs
index 7aa4b92..3925f7b 100644 (file)
--- a/test4/MainPage.xaml.cs
+++ b/test4/MainPage.xaml.cs
@@ -1,12 +1,12 @@
 using Psychlops;\r
 \r
-namespace PsychlopsSilverlight3test\r
+namespace PsychlopsSilverlight4test\r
 {\r
        public partial class MainPage : System.Windows.Controls.UserControl\r
        {\r
                //System.Collections.Generic.IEnumerator<int> main_routine;\r
                public System.Windows.Controls.Image master;\r
-               public PsychlopsMain main;\r
+               public PsychlopsSilverlightApp.PsychlopsMain main;\r
 #if DEBUG\r
                public System.Windows.Controls.TextBlock DebugConsole;\r
 #endif\r
@@ -23,21 +23,33 @@ namespace PsychlopsSilverlight3test
                        System.Windows.Application.Current.Host.Settings.MaxFrameRate = 60;\r
                        System.Windows.Application.Current.Host.Settings.EnableFrameRateCounter = true;\r
                        System.Windows.Application.Current.Host.Settings.EnableCacheVisualization = false;\r
+                       //System.Windows.Application.Current.Host.Settings.EnableGPUAcceleration = false;\r
                        //<param name="enableGPUAcceleration" value="true"/>\r
                        System.Windows.Media.CompositionTarget.Rendering += new System.EventHandler(CompositionTarget_Rendering);\r
                        //main_routine =  new System.ComponentModel.BackgroundWorker();\r
                        //main_routine.DoWork += new System.ComponentModel.DoWorkEventHandler(psychlops_main);\r
                        //main_routine.RunWorkerAsync();\r
 \r
-                       main = new PsychlopsMain();\r
+                       main = new PsychlopsSilverlightApp.PsychlopsMain();\r
+//                     Psychlops.AppState.statusBar.\r
                        Psychlops.Internal.Main.routine = new System.Threading.Thread(main.psychlops_main);\r
                        Psychlops.Internal.Main.routine.Start();\r
                        //main.initialize();\r
                        //main_routine = main.psychlops_main();\r
 \r
                        Psychlops.Internal.Main.statusBar = AppStatusBar;\r
-                       Psychlops.Internal.Main.widgetStack = Controller;\r
-                       AppStatusBar.Text = System.Windows.Application.Current.Host.Settings.EnableGPUAcceleration.ToString();\r
+                       //Psychlops.Internal.Main.widgetStack = Controller;\r
+                       AppStatusBar.Text = "Now starting Psychlops environment... please wait a minute";\r
+\r
+\r
+                       var ur = new System.Uri("Resources/logo.png", System.UriKind.RelativeOrAbsolute);\r
+                       var bitmap = new System.Windows.Media.Imaging.BitmapImage(ur);\r
+                       var img = new System.Windows.Controls.Image();\r
+                       img.Source = bitmap;\r
+                       System.Windows.Controls.Canvas.SetLeft(img, 100);\r
+                       System.Windows.Controls.Canvas.SetTop(img, 100);\r
+                       LayoutRoot.Children.Add(img);\r
+\r
                }\r
                protected void getFocusMouseEnter(object sender, System.Windows.Input.MouseEventArgs e) {\r
                        this.Focus();\r