From 08ee5e41fb9be4360175fc4c31941306cc9f39e8 Mon Sep 17 00:00:00 2001
From: unknown <hskwk@.(none)>
Date: Wed, 4 Aug 2010 16:42:01 +0900
Subject: [PATCH] 111

---
 dev4/psychlops/core/graphic/canvas.cs  | 14 +++++++++++---
 test4/PsychlopsMain.cs                 | 19 +++++++++++--------
 test4/PsychlopsSilverlight4test.csproj |  2 +-
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/dev4/psychlops/core/graphic/canvas.cs b/dev4/psychlops/core/graphic/canvas.cs
index 6216e53..e8d2af8 100644
--- a/dev4/psychlops/core/graphic/canvas.cs
+++ b/dev4/psychlops/core/graphic/canvas.cs
@@ -184,9 +184,9 @@ namespace Psychlops
 			width_ = wid;
 			height_ = hei;
 			api_canvas.Dispatcher.BeginInvoke(new TwoIntProcedure(initialize__), wid, hei);
-			while(!AsyncInitBool)
-			{
-			}
+			//while(!AsyncInitBool)
+			//{
+			//}
 			Mouse._prime = api_canvas;
 			Main.drawable = this;
 			Main.canvas = this;
@@ -233,6 +233,13 @@ namespace Psychlops
 				polygonPool[i] = new System.Windows.Shapes.Polygon();
 				lettersPool[i] = new System.Windows.Controls.TextBlock();
 			}
+			/*
+			imagePool = new System.Windows.Controls.Image[100];
+			for (int i = 0; i < 100; i++)
+			{
+				imagePool[i] = new System.Windows.Controls.Image();
+			}
+			 * */
 
 			masterPool = new System.Windows.Controls.Canvas();
 			prevPool = new System.Windows.Controls.Canvas();
@@ -749,6 +756,7 @@ namespace Psychlops
 			System.Windows.Controls.Canvas.SetTop(d.rectPool[d.rectPoolN], datum.y);
 			tmp.Visibility = Visibility.Visible;
 			d.rectPoolN++;
+			throw new Exception("Image.poolNative");
 			return this;
 		}
 
diff --git a/test4/PsychlopsMain.cs b/test4/PsychlopsMain.cs
index 7461d42..c808b11 100644
--- a/test4/PsychlopsMain.cs
+++ b/test4/PsychlopsMain.cs
@@ -20,19 +20,23 @@ namespace PsychlopsSilverlight4test
 
 		public void psychlops_main()
 		{
-			DotNumberS = new Psychlops.Widgets.Slider("test", new Interval(10, 500));
+			throw new System.Exception("Speed");
+			//DotNumberS = new Psychlops.Widgets.Slider("test", new Interval(10, 500));
 			//Independent ind = new Independent();
 
 			cnvs = new Canvas(500, 500);
-			xxx = 1;
-			Image img = new Image(100,100);
-			for (int x = 0; x < 100; x++)
+
+			//Image img = new Image(20, 20);
+			//img.field(delegate(int x, int y) { return new Color(Math.sin(x + y)); });
+			/*
+			for (int x = 0; x < 20; x++)
 			{
-				for (int y = 0; y < 100; y++)
+				for (int y = 0; y < 20; y++)
 				{
-					img.pix(x,y, new Color( Math.sin(x+y))  );
+//					img.pix(x, y, new Color(Math.sin(x + y)));
 				}
 			}
+			 * */
 
 
 			//Declare background dots and target
@@ -51,7 +55,6 @@ namespace PsychlopsSilverlight4test
 			double[] DotY = new double[2048];
 
 
-
 			//Set Independent variables to manipulate
 
 
@@ -119,7 +122,7 @@ namespace PsychlopsSilverlight4test
 				Target[i].draw();
 			}
 
-//			img.centering().draw();
+			//img.centering().draw();
 			//Reflect drawing at the next frame;
 			cnvs.flip();
 		}
diff --git a/test4/PsychlopsSilverlight4test.csproj b/test4/PsychlopsSilverlight4test.csproj
index ba41041..5b49ffc 100644
--- a/test4/PsychlopsSilverlight4test.csproj
+++ b/test4/PsychlopsSilverlight4test.csproj
@@ -77,7 +77,7 @@
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Store.cs" />
+    <None Include="Store.cs" />
     <Compile Include="PsychlopsMain.cs" />
     <Compile Include="MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
-- 
2.11.0