X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test4%2FPsychlopsMain.cs;h=d33eb149eaadea2591768e58401599d13073bbfe;hb=8d02b5d184f6209f65920c2e63bba907e2221f75;hp=c808b11b879d04f2c2ddfdb7888fb5ea7e9bad3b;hpb=08ee5e41fb9be4360175fc4c31941306cc9f39e8;p=psychlops%2Fsilverlight.git

diff --git a/test4/PsychlopsMain.cs b/test4/PsychlopsMain.cs
index c808b11..d33eb14 100644
--- a/test4/PsychlopsMain.cs
+++ b/test4/PsychlopsMain.cs
@@ -6,9 +6,8 @@ namespace PsychlopsSilverlight4test
 	public class PsychlopsMain
 	{
 
-		Canvas cnvs;
+		Psychlops.Canvas cnvs;
 		int i;
-		object xxx;
 		double x, y, z, t, p, temp, xx, yy;
 
 		//Set Target Initial Value
@@ -16,37 +15,19 @@ namespace PsychlopsSilverlight4test
 
 		//Set Background Initial Value
 		double DotNumber = 50, thetaSpeed = 3.0, Axis = 0.0, BGRadii = 150, BGSize = 5.0;
-		Psychlops.Widgets.Slider DotNumberS;
 
 		public void psychlops_main()
 		{
-			throw new System.Exception("Speed");
-			//DotNumberS = new Psychlops.Widgets.Slider("test", new Interval(10, 500));
-			//Independent ind = new Independent();
-
 			cnvs = new Canvas(500, 500);
 
-			//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 < 20; y++)
-				{
-//					img.pix(x, y, new Color(Math.sin(x + y)));
-				}
-			}
-			 * */
-
-
 			//Declare background dots and target
 			Rectangle[] BGDot = new Rectangle[2048];
 			for(int i=0; i<2048; i++){
-			BGDot[i]=new Rectangle();
+				BGDot[i]=new Rectangle();
 			}
 			Rectangle[] Target= new Rectangle[10];
 			for(int i=0; i<10; i++){
-			Target[i]=new Rectangle();
+				Target[i]=new Rectangle();
 			}
 
 
@@ -60,81 +41,74 @@ namespace PsychlopsSilverlight4test
 
 			//Initialize positions of background dots
 			for(int i=0; i<2048; i++){
-			t=2.0*Math.PI*Math.random(1.0);
-			p=2.0*Math.PI*Math.random(1.0);
-			DotX[i]=t;
-			DotY[i]=p;
-
-			x=BGRadii*Math.cos(t)*Math.cos(p);
-			y=BGRadii*Math.sin(t)*Math.cos(p);
-			BGDot[i].set(BGSize, BGSize);
-			BGDot[i].centering().shift(x,y);
+				t=2.0*Math.PI*Math.random(1.0);
+				p=2.0*Math.PI*Math.random(1.0);
+				DotX[i]=t;
+				DotY[i]=p;
+
+				x=BGRadii*Math.cos(t)*Math.cos(p);
+				y=BGRadii*Math.sin(t)*Math.cos(p);
+				BGDot[i].set(BGSize, BGSize);
+				BGDot[i].centering().shift(x,y);
 			}
 
 			//Initialize positions of targets
 			for(int i=0; i<10; i++)Target[i].set(TargetSize, TargetSize);
 
 			double COS, SIN;
-
+			DotNumber = 200;
 			//Main stimulus loop
 			while(true){
-			//Clear the main window
-			cnvs.clear(Color.black);
-
-
-			temp=Axis/360*2*Math.PI;
-			COS=Math.cos(temp);
-			SIN=Math.sin(temp);
-
-			//Calculate positions of background dots and set them
-			for(int i=0; i<DotNumber; i++){
-			//Calculate in polar coordinate
-			t=DotX[i]+2.0*Math.PI*thetaSpeed/360.0;
-			p=DotY[i];
-
-			//Save current position
-			DotX[i]=t;
-
-			//Convert to Decartes coordinate
-			x=BGRadii*Math.cos(t)*Math.cos(p);
-			y=BGRadii*Math.sin(t)*Math.cos(p);
-			z=BGRadii*Math.sin(p);
-			xx=x;
-			yy=SIN*y+COS*z;
-
-			//Set Dotsize and Draw them
-			BGDot[i].set(BGSize, BGSize);
-			BGDot[i].centering().shift(xx,yy);
-			BGDot[i].draw( Color.blue);
-			}
-
-			//Calculate positions of targets and set them
-			temp=Rotate*2*Math.PI/360.0;
-			cnvs.msg(TargetNumber.ToString(), 0, 30);
-			for (int i = 0; i < 5; i++)
-			{
-				cnvs.msg(i.ToString(), 50+50*i, 30);
-				t = 2.0 * Math.PI/TargetNumber;
-				x = 10.0 * i;//TargetEcce*Math.cos(i*t+temp);
-				y = 10.0 * i;//TargetEcce*Math.sin(i*t+temp);
-				Target[i].centering().shift(x,y);
-				Target[i].fill = Color.yellow;
-				Target[i].draw();
-			}
-
-			//img.centering().draw();
-			//Reflect drawing at the next frame;
-			cnvs.flip();
-		}
-
+				//Clear the main window
+				cnvs.clear(Color.green);
+
+
+				temp=Axis/360*2*Math.PI;
+				COS=Math.cos(temp);
+				SIN=Math.sin(temp);
+
+				//Calculate positions of background dots and set them
+				for(int i=0; i<DotNumber; i++){
+					//Calculate in polar coordinate
+					t=DotX[i]+2.0*Math.PI*thetaSpeed/360.0;
+					p=DotY[i];
+
+					//Save current position
+					DotX[i]=t;
+
+					//Convert to Decartes coordinate
+					x=BGRadii*Math.cos(t)*Math.cos(p);
+					y=BGRadii*Math.sin(t)*Math.cos(p);
+					z=BGRadii*Math.sin(p);
+					xx=x;
+					yy=SIN*y+COS*z;
+
+					//Set Dotsize and Draw them
+					BGDot[i].set(BGSize, BGSize);
+					BGDot[i].centering().shift(xx,yy);
+					BGDot[i].draw( Color.blue );
+				}
 
+				//Calculate positions of targets and set them
+				temp=Rotate*2*Math.PI/360.0;
+				for (int i = 0; i < 5; i++)
+				{
+					t = 2.0 * Math.PI/TargetNumber;
+					x = TargetEcce*Math.cos(i*t+temp);
+					y = TargetEcce*Math.sin(i*t+temp);
+					Target[i].centering().shift(x,y);
+					Target[i].fill = Color.yellow;
+					Target[i].draw();
+				}
 
+				//Reflect drawing at the next frame;
+				cnvs.flip();
+			}
 		}
 	}
 
 }
 
-
 /*
 using Psychlops;
 
@@ -184,9 +158,8 @@ namespace PsychlopsSilverlight4test
 
 */
 
-/*
-
 
+/*
 using Psychlops;
 
 namespace Psychlops
@@ -263,7 +236,7 @@ namespace PsychlopsSilverlight4test
 
 				//Figures.drawGabor(ref img, 20, 100, 1, 0, frames * 2.0 * Math.PI / tfreq / 60);
 				//Figures.drawGaussian(ref img, 20, 1);
-				Figures.drawGrating(ref img, 30, 30, 20, 1, 2, frames * 2.0 * Math.PI / tfreq / 60);
+				Figures.drawGrating(ref img, 200, 200, 20, 1, 2, frames * 2.0 * Math.PI / tfreq / 60);
 				img.centering(Mouse.position);
 				img.draw();
 
@@ -271,7 +244,7 @@ namespace PsychlopsSilverlight4test
 				shape.draw();
 				if (Keyboard.spc.pressed()) cnvs.var(Mouse.x, 100, 100);
 
-				cnvs.var(frames, 20, 20);
+				cnvs.var(frames, 0, 20);
 				slider.value = frames / 100.0;
 
 				fixation.shift(100, 100);
@@ -289,7 +262,4 @@ namespace PsychlopsSilverlight4test
 	}
 
 }
- * 
- * */
-
-
+*/