123

[psychlops/silverlight.git] / test4 / PsychlopsMain.cs

diff --git a/test4/PsychlopsMain.cs b/test4/PsychlopsMain.cs
index adff3c4..d33eb14 100644 (file)
--- a/test4/PsychlopsMain.cs
+++ b/test4/PsychlopsMain.cs
@@ -6,9 +6,8 @@ namespace PsychlopsSilverlight4test
        public class PsychlopsMain\r
        {\r
 \r
-               Canvas cnvs;\r
+               Psychlops.Canvas cnvs;\r
                int i;\r
-               object xxx;\r
                double x, y, z, t, p, temp, xx, yy;\r
 \r
                //Set Target Initial Value\r
@@ -16,30 +15,11 @@ namespace PsychlopsSilverlight4test
 \r
                //Set Background Initial Value\r
                double DotNumber = 50, thetaSpeed = 3.0, Axis = 0.0, BGRadii = 150, BGSize = 5.0;\r
-               Psychlops.Widgets.Slider DotNumberS;\r
 \r
                public void psychlops_main()\r
                {\r
-                       //DotNumberS = new Psychlops.Widgets.Slider("test", new Interval(10, 500));\r
-                       //Independent ind = new Independent();\r
-\r
                        cnvs = new Canvas(500, 500);\r
 \r
-                       Image img = new Image(100, 100);\r
-                       img.field(delegate(int x, int y) { return new Color(0.5 + 0.5 * Math.sin(x + y)); });\r
-                       Image img2 = new Image(100, 100);\r
-                       img2.field(delegate(int x, int y) { return new Color(0.5 + 0.5 * Math.sin(x + y)); });\r
-                       /*\r
-                       for (int x = 0; x < 20; x++)\r
-                       {\r
-                               for (int y = 0; y < 20; y++)\r
-                               {\r
-//                                     img.pix(x, y, new Color(Math.sin(x + y)));\r
-                               }\r
-                       }\r
-                        * */\r
-\r
-\r
                        //Declare background dots and target\r
                        Rectangle[] BGDot = new Rectangle[2048];\r
                        for(int i=0; i<2048; i++){\r
@@ -76,7 +56,7 @@ namespace PsychlopsSilverlight4test
                        for(int i=0; i<10; i++)Target[i].set(TargetSize, TargetSize);\r
 \r
                        double COS, SIN;\r
-                       DotNumber = 100;\r
+                       DotNumber = 200;\r
                        //Main stimulus loop\r
                        while(true){\r
                                //Clear the main window\r
@@ -106,25 +86,21 @@ namespace PsychlopsSilverlight4test
                                        //Set Dotsize and Draw them\r
                                        BGDot[i].set(BGSize, BGSize);\r
                                        BGDot[i].centering().shift(xx,yy);\r
-                                       BGDot[i].draw( Color.blue);\r
+                                       BGDot[i].draw( Color.blue );\r
                                }\r
 \r
                                //Calculate positions of targets and set them\r
                                temp=Rotate*2*Math.PI/360.0;\r
-                               cnvs.msg(TargetNumber.ToString(), 0, 30);\r
                                for (int i = 0; i < 5; i++)\r
                                {\r
-                                       cnvs.msg(i.ToString(), 50+50*i, 30);\r
                                        t = 2.0 * Math.PI/TargetNumber;\r
-                                       x = 10.0 * i;//TargetEcce*Math.cos(i*t+temp);\r
-                                       y = 10.0 * i;//TargetEcce*Math.sin(i*t+temp);\r
+                                       x = TargetEcce*Math.cos(i*t+temp);\r
+                                       y = TargetEcce*Math.sin(i*t+temp);\r
                                        Target[i].centering().shift(x,y);\r
                                        Target[i].fill = Color.yellow;\r
                                        Target[i].draw();\r
                                }\r
 \r
-                               img.centering().draw();\r
-                               img2.centering().draw();\r
                                //Reflect drawing at the next frame;\r
                                cnvs.flip();\r
                        }\r
@@ -133,7 +109,6 @@ namespace PsychlopsSilverlight4test
 \r
 }\r
 \r
-\r
 /*\r
 using Psychlops;\r
 \r
@@ -183,9 +158,8 @@ namespace PsychlopsSilverlight4test
 \r
 */\r
 \r
-/*\r
-\r
 \r
+/*\r
 using Psychlops;\r
 \r
 namespace Psychlops\r
@@ -262,7 +236,7 @@ namespace PsychlopsSilverlight4test
 \r
                                //Figures.drawGabor(ref img, 20, 100, 1, 0, frames * 2.0 * Math.PI / tfreq / 60);\r
                                //Figures.drawGaussian(ref img, 20, 1);\r
-                               Figures.drawGrating(ref img, 30, 30, 20, 1, 2, frames * 2.0 * Math.PI / tfreq / 60);\r
+                               Figures.drawGrating(ref img, 200, 200, 20, 1, 2, frames * 2.0 * Math.PI / tfreq / 60);\r
                                img.centering(Mouse.position);\r
                                img.draw();\r
 \r
@@ -270,7 +244,7 @@ namespace PsychlopsSilverlight4test
                                shape.draw();\r
                                if (Keyboard.spc.pressed()) cnvs.var(Mouse.x, 100, 100);\r
 \r
-                               cnvs.var(frames, 20, 20);\r
+                               cnvs.var(frames, 0, 20);\r
                                slider.value = frames / 100.0;\r
 \r
                                fixation.shift(100, 100);\r
@@ -288,7 +262,4 @@ namespace PsychlopsSilverlight4test
        }\r
 \r
 }\r
- * \r
- * */\r
-\r
-\r
+*/\r