From: unknown <hskwk@.(none)>
Date: Thu, 26 Aug 2010 08:21:19 +0000 (+0900)
Subject: dsada
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=06a470a0e79a283223a73d8c5f6e43ef76174d97;p=psychlops%2Fsilverlight.git

dsada
---

diff --git a/test4/MainPage.xaml.cs b/test4/MainPage.xaml.cs
index a303773..3925f7b 100644
--- a/test4/MainPage.xaml.cs
+++ b/test4/MainPage.xaml.cs
@@ -6,7 +6,7 @@ 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
@@ -30,7 +30,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();
diff --git a/test4/PsychlopsMain.cs b/test4/PsychlopsMain.cs
index bc1169f..385938f 100644
--- a/test4/PsychlopsMain.cs
+++ b/test4/PsychlopsMain.cs
@@ -2,7 +2,7 @@
 //// Lines for set up Psychlops environment
 using Psychlops;
 
-namespace PsychlopsSilverlight4test
+namespace PsychlopsSilverlightApp
 {
 
 	public class PsychlopsMain
@@ -25,6 +25,8 @@ namespace PsychlopsSilverlight4test
 			///- 0 linkto BasicCode3_1a
 
 			Canvas window = new Canvas(Canvas.window);
+			var img = new Image("logo.png");
+
 
 			///+ 1 linkto BasicCode3_1a
 			////Initialize