enable

[psychlops/silverlight.git] / dev4 / psychlops / extention / standard / figures.cs

diff --git a/dev4/psychlops/extention/standard/figures.cs b/dev4/psychlops/extention/standard/figures.cs
index a7a8273..f82d1a2 100644 (file)
--- a/dev4/psychlops/extention/standard/figures.cs
+++ b/dev4/psychlops/extention/standard/figures.cs
@@ -13,7 +13,7 @@ namespace Psychlops
                 img = new Image(width, height);\r
             double freq = 2 * Math.PI / wavelength;\r
                        img.field(\r
-                               (x, y) => new Color(.5 +.5 * Math.sin(phase + (Math.sin(orientation)*x-Math.cos(orientation)*y) * freq))\r
+                               (x, y) => new Color(.5 + contrast * .5 * Math.sin(phase + (Math.sin(orientation)*x-Math.cos(orientation)*y) * freq))\r
                        );\r
            }\r
                public static void drawGaussian(ref Image img, double sigma, double factor)\r
@@ -27,15 +27,15 @@ namespace Psychlops
                        );\r
                }\r
 \r
-               public static void drawGabor(ref Image img, double sigma, double wavelength, double contrast, double orientation, double phase)\r
+               public static void drawGabor(ref Image img, double sigma, double frequency, double contrast, double orientation, double phase)\r
            {\r
             int width = (int)(sigma * 8), height = (int)(sigma * 8);\r
                        double width_half = width / 2.0, height_half = height / 2.0;\r
             if (img==null || img.width != width || img.height != height)\r
                 img = new Image(width, height);\r
-            double freq = 2 * Math.PI / wavelength;\r
+            double freq = 2 * Math.PI * frequency;\r
                        img.field(\r
-                               (x, y) => new Color(.5 + Math.gaussian(Math.radius(x - width_half, y - height_half), width / 8.0) * .5 * Math.sin(phase + (Math.sin(orientation)*x-Math.cos(orientation)*y) * freq))\r
+                               (x, y) => new Color(.5 + contrast * Math.gaussian(Math.radius(x - width_half, y - height_half), width / 8.0) * .5 * Math.sin(phase + (Math.sin(orientation) * x - Math.cos(orientation) * y) * freq))\r
                        );\r
            }\r
 \r