X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test4%2FMainPage.xaml.cs;h=e368a540434ea3cc2ebaf674ed7ba08b48736fde;hb=2025e2db455b85eae3dec989bdfd39f3c1292df1;hp=a303773f294ec39c31116c123fff9ccb559377d1;hpb=a4fbd5c94992b9e0e3e57d550706ba6b05bfd6a6;p=psychlops%2Fsilverlight.git

diff --git a/test4/MainPage.xaml.cs b/test4/MainPage.xaml.cs
index a303773..e368a54 100644
--- a/test4/MainPage.xaml.cs
+++ b/test4/MainPage.xaml.cs
@@ -6,10 +6,11 @@ namespace PsychlopsSilverlight4test
 	{
 		//System.Collections.Generic.IEnumerator<int> main_routine;
 		public System.Windows.Controls.Image master;
-		public PsychlopsMain main;
+		public PsychlopsSilverlightApp.PsychlopsMain main;
 #if DEBUG
 		public System.Windows.Controls.TextBlock DebugConsole;
 #endif
+		System.Windows.Controls.Image img;
 		public MainPage()
 		{
 			InitializeComponent();
@@ -30,7 +31,7 @@ namespace PsychlopsSilverlight4test
 			//main_routine.DoWork += new System.ComponentModel.DoWorkEventHandler(psychlops_main);
 			//main_routine.RunWorkerAsync();
 
-			main = new PsychlopsMain();
+			main = new PsychlopsSilverlightApp.PsychlopsMain();
 //			Psychlops.AppState.statusBar.
 			Psychlops.Internal.Main.routine = new System.Threading.Thread(main.psychlops_main);
 			Psychlops.Internal.Main.routine.Start();
@@ -41,15 +42,17 @@ namespace PsychlopsSilverlight4test
 			//Psychlops.Internal.Main.widgetStack = Controller;
 			AppStatusBar.Text = "Now starting Psychlops environment... please wait a minute";
 
-
-			var ur = new System.Uri("Resources/logo.png", System.UriKind.RelativeOrAbsolute);
+			/*
+			var ur = new System.Uri("Resources/Benham.png", System.UriKind.RelativeOrAbsolute);
 			var bitmap = new System.Windows.Media.Imaging.BitmapImage(ur);
 			var img = new System.Windows.Controls.Image();
 			img.Source = bitmap;
 			System.Windows.Controls.Canvas.SetLeft(img, 100);
 			System.Windows.Controls.Canvas.SetTop(img, 100);
-			LayoutRoot.Children.Add(img);
-
+			Controller.Children.Add(img);
+			 * */
+			 
+			 
 		}
 		protected void getFocusMouseEnter(object sender, System.Windows.Input.MouseEventArgs e) {
 			this.Focus();
@@ -57,6 +60,7 @@ namespace PsychlopsSilverlight4test
 
 		private void CompositionTarget_Rendering(object sender, System.EventArgs e)
 		{
+			//Controller.Children.Clear();
 			if (Main.canvas != null) Main.canvas.executeFlip();
 			//if (nextIntervalFrame-- <= 0)
 			//{