111

diff --git a/dev4/psychlops/core/graphic/canvas.cs b/dev4/psychlops/core/graphic/canvas.cs
index 6216e53..e8d2af8 100644 (file)
--- a/dev4/psychlops/core/graphic/canvas.cs
+++ b/dev4/psychlops/core/graphic/canvas.cs
@@ -184,9 +184,9 @@ namespace Psychlops
                        width_ = wid;\r
                        height_ = hei;\r
                        api_canvas.Dispatcher.BeginInvoke(new TwoIntProcedure(initialize__), wid, hei);\r
-                       while(!AsyncInitBool)\r
-                       {\r
-                       }\r
+                       //while(!AsyncInitBool)\r
+                       //{\r
+                       //}\r
                        Mouse._prime = api_canvas;\r
                        Main.drawable = this;\r
                        Main.canvas = this;\r
@@ -233,6 +233,13 @@ namespace Psychlops
                                polygonPool[i] = new System.Windows.Shapes.Polygon();\r
                                lettersPool[i] = new System.Windows.Controls.TextBlock();\r
                        }\r
+                       /*\r
+                       imagePool = new System.Windows.Controls.Image[100];\r
+                       for (int i = 0; i < 100; i++)\r
+                       {\r
+                               imagePool[i] = new System.Windows.Controls.Image();\r
+                       }\r
+                        * */\r
 \r
                        masterPool = new System.Windows.Controls.Canvas();\r
                        prevPool = new System.Windows.Controls.Canvas();\r
@@ -749,6 +756,7 @@ namespace Psychlops
                        System.Windows.Controls.Canvas.SetTop(d.rectPool[d.rectPoolN], datum.y);\r
                        tmp.Visibility = Visibility.Visible;\r
                        d.rectPoolN++;\r
+                       throw new Exception("Image.poolNative");\r
                        return this;\r
                }\r
 \r

diff --git a/test4/PsychlopsMain.cs b/test4/PsychlopsMain.cs
index 7461d42..c808b11 100644 (file)
--- a/test4/PsychlopsMain.cs
+++ b/test4/PsychlopsMain.cs
@@ -20,19 +20,23 @@ namespace PsychlopsSilverlight4test
 \r
                public void psychlops_main()\r
                {\r
-                       DotNumberS = new Psychlops.Widgets.Slider("test", new Interval(10, 500));\r
+                       throw new System.Exception("Speed");\r
+                       //DotNumberS = new Psychlops.Widgets.Slider("test", new Interval(10, 500));\r
                        //Independent ind = new Independent();\r
 \r
                        cnvs = new Canvas(500, 500);\r
-                       xxx = 1;\r
-                       Image img = new Image(100,100);\r
-                       for (int x = 0; x < 100; x++)\r
+\r
+                       //Image img = new Image(20, 20);\r
+                       //img.field(delegate(int x, int y) { return new Color(Math.sin(x + y)); });\r
+                       /*\r
+                       for (int x = 0; x < 20; x++)\r
                        {\r
-                               for (int y = 0; y < 100; y++)\r
+                               for (int y = 0; y < 20; y++)\r
                                {\r
-                                       img.pix(x,y, new Color( Math.sin(x+y))  );\r
+//                                     img.pix(x, y, new Color(Math.sin(x + y)));\r
                                }\r
                        }\r
+                        * */\r
 \r
 \r
                        //Declare background dots and target\r
@@ -51,7 +55,6 @@ namespace PsychlopsSilverlight4test
                        double[] DotY = new double[2048];\r
 \r
 \r
-\r
                        //Set Independent variables to manipulate\r
 \r
 \r
@@ -119,7 +122,7 @@ namespace PsychlopsSilverlight4test
                                Target[i].draw();\r
                        }\r
 \r
-//                     img.centering().draw();\r
+                       //img.centering().draw();\r
                        //Reflect drawing at the next frame;\r
                        cnvs.flip();\r
                }\r

diff --git a/test4/PsychlopsSilverlight4test.csproj b/test4/PsychlopsSilverlight4test.csproj
index ba41041..5b49ffc 100644 (file)
--- a/test4/PsychlopsSilverlight4test.csproj
+++ b/test4/PsychlopsSilverlight4test.csproj
@@ -77,7 +77,7 @@
     <Compile Include="App.xaml.cs">\r
       <DependentUpon>App.xaml</DependentUpon>\r
     </Compile>\r
-    <Compile Include="Store.cs" />\r
+    <None Include="Store.cs" />\r
     <Compile Include="PsychlopsMain.cs" />\r
     <Compile Include="MainPage.xaml.cs">\r
       <DependentUpon>MainPage.xaml</DependentUpon>\r