X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test4%2FMainPage.xaml.cs;h=2a1ef5154e9a76c5e7bf4642b4ab2767169b3433;hb=a1aee2b11bf1d315eaf4a2bbd8a96464d3848202;hp=0889acef60b6c7e62e7e15617714f36004bc43ea;hpb=14b5f406aebde0b4bdc36a94f0c315a2864a1fee;p=psychlops%2Fsilverlight.git

diff --git a/test4/MainPage.xaml.cs b/test4/MainPage.xaml.cs
index 0889ace..2a1ef51 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();
@@ -40,6 +41,18 @@ namespace PsychlopsSilverlight4test
 			Psychlops.Internal.Main.statusBar = AppStatusBar;
 			//Psychlops.Internal.Main.widgetStack = Controller;
 			AppStatusBar.Text = "Now starting Psychlops environment... please wait a minute";
+
+			/*
+			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);
+			Controller.Children.Add(img);
+			 * */
+			 
+			 
 		}
 		protected void getFocusMouseEnter(object sender, System.Windows.Input.MouseEventArgs e) {
 			this.Focus();
@@ -47,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)
 			//{