X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=dev3%2Fpsychlops%2Fcore%2Fgraphic%2Fcanvas.cs;h=9dfe0315c7be3cce13230306baa74a04ae35a3bb;hb=e22f217b876609c575411512e127062c35d49441;hp=bffa5c4034906ee2e670800774b297cb542fbaa4;hpb=9b27c61cea3e6ff6eef6511bf4f8c94858bfa2e1;p=psychlops%2Fsilverlight.git

diff --git a/dev3/psychlops/core/graphic/canvas.cs b/dev3/psychlops/core/graphic/canvas.cs
index bffa5c4..9dfe031 100644
--- a/dev3/psychlops/core/graphic/canvas.cs
+++ b/dev3/psychlops/core/graphic/canvas.cs
@@ -70,9 +70,9 @@ namespace Psychlops
 			}
 
 			public void msg(string str, double x, double y) { msg(str, x, y, Color.white); }
-			public virtual void msg(string str, double x, double y, Color col)
+			public virtual void msg(string dstr, double x, double y, Color col)
 			{
-				var let = new Letters(str);
+				var let = new Letters(dstr);
 				let.locate(x, y);
 				let.fill = col;
 				this.letters(let);
@@ -186,7 +186,7 @@ namespace Psychlops
 			rect(back_panel);
 		}
 
-		int nextIntervalFrame = 1;
+		int nextIntervalFrame = 1, chacked = 0;
 		public void flip()
 		{
 			//api_canvas.Dispatcher.BeginInvoke(flipexec);
@@ -195,6 +195,7 @@ namespace Psychlops
 			lock (this)
 			{
 				nextIntervalFrame = 1;
+				chacked = 1;
 			}
 			Internal.Main.canvas_flag.WaitOne();
 		}
@@ -206,18 +207,26 @@ namespace Psychlops
 			}
 			if (nextIntervalFrame <= 0)
 			{
-				var tmp = new System.Windows.Controls.Canvas();
-				if (stack.Count > 0)
+				//Psychlops.AppState.statusBar = chacked.ToString();
+				if (chacked > 0)
 				{
-					foreach (Internal.PrimitiveFigure f in stack)
+					var tmp = new System.Windows.Controls.Canvas();
+					if (stack.Count > 0)
 					{
-						tmp.Children.Add(f.toNative());
+						foreach (Internal.PrimitiveFigure f in stack)
+						{
+							tmp.Children.Add(f.toNative());
+						}
 					}
+					api_canvas.Children.Clear();
+					api_canvas.Children.Add(tmp);
+					stack.Clear();
+					lock (this)
+					{
+						chacked = 0;
+					}
+					Psychlops.Internal.Main.canvas_flag.Set();
 				}
-				api_canvas.Children.Clear();
-				api_canvas.Children.Add(tmp);
-				stack.Clear();
-				Psychlops.Internal.Main.canvas_flag.Set();
 			}
 			System.Threading.Thread.Sleep(0);
 		}
@@ -371,7 +380,7 @@ namespace Psychlops
 			LETTERS_H_ALIGN_BRIDGE.Add(Letters.HorizontalAlign.left, TextAlignment.Left);
 			LETTERS_H_ALIGN_BRIDGE.Add(Letters.HorizontalAlign.center, TextAlignment.Center);
 			LETTERS_H_ALIGN_BRIDGE.Add(Letters.HorizontalAlign.right, TextAlignment.Right);
-			LETTERS_H_ALIGN_BRIDGE.Add(Letters.HorizontalAlign.left, TextAlignment.Left);
+			LETTERS_H_ALIGN_BRIDGE.Add(Letters.HorizontalAlign.not_specified, TextAlignment.Left);
 		}
 		#endregion
 		public Letters clone()