123

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

diff --git a/test4/PsychlopsMain.cs b/test4/PsychlopsMain.cs
index d33eb14..c880085 100644 (file)
--- a/test4/PsychlopsMain.cs
+++ b/test4/PsychlopsMain.cs
@@ -1,4 +1,4 @@
-using Psychlops;\r
+/*using Psychlops;\r
 \r
 namespace PsychlopsSilverlight4test\r
 {\r
@@ -108,9 +108,9 @@ namespace PsychlopsSilverlight4test
        }\r
 \r
 }\r
+*/\r
 \r
-/*\r
-using Psychlops;\r
+/*using Psychlops;\r
 \r
 namespace PsychlopsSilverlight4test\r
 {\r
@@ -159,7 +159,7 @@ namespace PsychlopsSilverlight4test
 */\r
 \r
 \r
-/*\r
+\r
 using Psychlops;\r
 \r
 namespace Psychlops\r
@@ -195,19 +195,24 @@ namespace PsychlopsSilverlight4test
        {\r
                Canvas cnvs;\r
                Image img;\r
-               Rectangle fixation;\r
+               Ellipse fixation;\r
                Shape shape;\r
                Color col;\r
                int isize = 100;\r
                double tfreq = 1;\r
                int frames;\r
                RandomDots dots;\r
+               Group g;\r
 \r
                public void psychlops_main()\r
                {\r
                        cnvs = new Canvas(500, 500);\r
+                       g = new Group();\r
                        img = new Image(isize * 2, isize * 2);\r
-                       fixation = new Rectangle(10, 10);\r
+                       Figures.drawGrating(ref img, 200, 200, 20, 1, 2, frames * 2.0 * Math.PI / tfreq / 60);\r
+                       g.append(img);\r
+                       g.rotation = 50;\r
+                       fixation = new Ellipse(10, 10);\r
                        fixation.fill = Color.red;\r
                        //var poly = new Rectangle(100, 100);\r
                        var poly = new Letters("日本語");\r
@@ -228,17 +233,26 @@ namespace PsychlopsSilverlight4test
                        {\r
                                frames++;\r
 \r
+\r
                                cnvs.clear(new Color(Mouse.left.pressed() ? 0.75 : 0.5));\r
                                col.set(Math.random(1.0));\r
 \r
+                               /*if (frames % 2 == 0)\r
+                               {\r
+                                       fixation.centering().shift(100, 100);\r
+                                       fixation.draw(new Stroke(Color.blue, 3));\r
+                               }*/\r
+\r
                                fixation.centering();\r
                                fixation.draw(Color.red);\r
 \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, 200, 200, 20, 1, 2, frames * 2.0 * Math.PI / tfreq / 60);\r
-                               img.centering(Mouse.position);\r
-                               img.draw();\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
+                               //g.centering(Mouse.position).draw();\r
+                               //g.rotation += 1;\r
 \r
                                shape.centering(Mouse.position).shift(100, 0);\r
                                shape.draw();\r
@@ -247,10 +261,13 @@ namespace PsychlopsSilverlight4test
                                cnvs.var(frames, 0, 20);\r
                                slider.value = frames / 100.0;\r
 \r
-                               fixation.shift(100, 100);\r
-                               fixation.draw(new Stroke(Color.blue, 3));\r
+                               /*if (frames % 2 != 0)\r
+                               {\r
+                                       fixation.shift(100, 100);\r
+                                       fixation.draw(new Stroke(Color.green, 3));\r
+                               }*/\r
 \r
-                               for (int i = 0; i < dots.cood.Length; i++)\r
+                               for (int i = 0; i < dots.cood.Length/4; i++)\r
                                {\r
                                        dots.cood[i].set(Math.random(500), Math.random(500));\r
                                }\r
@@ -260,6 +277,5 @@ namespace PsychlopsSilverlight4test
                        }\r
                }\r
        }\r
-\r
 }\r
-*/\r
+\r