OSDN Git Service

123
[psychlops/silverlight.git] / dev4 / psychlops / core / graphic / canvas.cs
index d7388d3..282d67a 100644 (file)
@@ -109,6 +109,10 @@ namespace Psychlops
                                //                              stack.Enqueue(drawee.clone());\r
                                drawee.copyToStack(this);\r
                        }\r
+                       public virtual void group(Group drawee)\r
+                       {\r
+                               drawee.copyToStack(this);\r
+                       }\r
 \r
                        public void msg(string str, double x, double y) { msg(str, x, y, Color.white); }\r
                        public virtual void msg(string dstr, double x, double y, Color col)\r
@@ -198,6 +202,7 @@ namespace Psychlops
                        back_panel = new Rectangle(wid, hei);\r
 \r
                        flipexec = new SimpleProcedure(executeFlip);\r
+                       AppState.statusBar = "";\r
                }\r
                protected void initialize__(int wid, int hei)\r
                {\r
@@ -248,10 +253,12 @@ namespace Psychlops
                        api_canvas.Children.Add(masterPool);\r
                        //api_canvas.Children.Remove(Internal.Main.widgetStack);\r
 \r
+                       /*\r
                        for (int i = 0; i < 10000; i++)\r
                        {\r
                                masterPool.Children.Add(UIElementPool[i]);\r
                        }\r
+                        * */\r
 \r
 \r
                        AsyncInitBool = true;\r
@@ -327,9 +334,9 @@ namespace Psychlops
 \r
                        Internal.Main.canvas_flag.WaitOne();\r
                }\r
+               #region version modifyNative\r
                public void executeFlip()\r
                {\r
-                       #region version modifyNative\r
                        Line lineS;\r
                        Rectangle rectS;\r
                        Ellipse ellipseS;\r
@@ -342,7 +349,6 @@ namespace Psychlops
                        System.Windows.Shapes.Polygon polygonP;\r
                        System.Windows.Controls.TextBlock lettersP;\r
                        System.Windows.Controls.Image imageP;\r
-                       #endregion\r
 \r
                        lock (this)\r
                        {\r
@@ -351,7 +357,6 @@ namespace Psychlops
 \r
                        var en = masterPool.Children.GetEnumerator();\r
                        bool full = en.MoveNext();\r
-                       UIElementPoolN = 0;\r
                        if (nextIntervalFrame <= 0)\r
                        {\r
                                if (chacked > 0)\r
@@ -361,12 +366,6 @@ namespace Psychlops
                                        {\r
                                                for (int i = 0; i < stackN - 2; i++)\r
                                                {\r
-                                                       UIElementPool[UIElementPoolN] = stack[i].poolNative(this);\r
-                                                       UIElementPool[UIElementPoolN].Visibility = Visibility.Visible;\r
-                                                       UIElementPoolN++;\r
-\r
-                                                       #region version modifyNative\r
-                                                       /*\r
                                                        if (full == false)\r
                                                        {\r
                                                                masterPool.Children.Add(stack[i].poolNative(this));\r
@@ -375,7 +374,7 @@ namespace Psychlops
                                                        {\r
                                                                if( null != (rectS = stack[i] as Rectangle) )\r
                                                                {\r
-                                                                       if ( null != (rectP = en.Current as System.Windows.Shapes.Rectangle) )\r
+                                                                       if (null != (rectP = en.Current as System.Windows.Shapes.Rectangle))\r
                                                                        {\r
                                                                                rectS.modifyNative(rectP, this);\r
                                                                        }\r
@@ -417,8 +416,43 @@ namespace Psychlops
                                                                }\r
                                                                full = en.MoveNext();\r
                                                        }\r
-                                                        * */\r
-                                                       #endregion\r
+                                               }\r
+                                               stackN = 0;\r
+                                       }\r
+                                       lock (this)\r
+                                       {\r
+                                               chacked = 0;\r
+                                       }\r
+                                       Psychlops.Internal.Main.canvas_flag.Set();\r
+                               }\r
+                       }\r
+                       System.Threading.Thread.Sleep(0);\r
+               }\r
+               #endregion\r
+\r
+               /*\r
+               #region version poolNative 2\r
+               public void executeFlip()\r
+               {\r
+\r
+                       lock (this)\r
+                       {\r
+                               nextIntervalFrame--;\r
+                       }\r
+                       UIElementPoolN = 0;\r
+                       if (nextIntervalFrame <= 0)\r
+                       {\r
+                               if (chacked > 0)\r
+                               {\r
+                                       //masterPool.Children.Clear();\r
+                                       if (stackN > 0)\r
+                                       {\r
+                                               for (int i = 0; i < stackN - 2; i++)\r
+                                               {\r
+                                                       UIElementPool[UIElementPoolN] = stack[i].poolNative(this);\r
+                                                       UIElementPool[UIElementPoolN].Visibility = Visibility.Visible;\r
+                                                       UIElementPoolN++;\r
+\r
                                                }\r
                                                for (int i = stackN - 2; i < 10000; i++)\r
                                                {\r
@@ -437,7 +471,8 @@ namespace Psychlops
                        }\r
                        System.Threading.Thread.Sleep(0);\r
                }\r
-\r
+               #endregion\r
+               */\r
 \r
 \r
                #region Properties\r
@@ -652,7 +687,7 @@ namespace Psychlops
                        tmp.Height = height;\r
                        tmp.Fill = fill;\r
                        System.Windows.Controls.Canvas.SetLeft(tmp, left);\r
-                       System.Windows.Controls.Canvas.SetTop(d.rectPool[d.rectPoolN], top);\r
+                       System.Windows.Controls.Canvas.SetTop(tmp, top);\r
                        tmp.Visibility = Visibility.Visible;\r
                        d.ellipsePoolN++;\r
                        return tmp;\r
@@ -663,7 +698,7 @@ namespace Psychlops
                        tmp.Height = height;\r
                        tmp.Fill = fill;\r
                        System.Windows.Controls.Canvas.SetLeft(tmp, left);\r
-                       System.Windows.Controls.Canvas.SetTop(d.rectPool[d.rectPoolN], top);\r
+                       System.Windows.Controls.Canvas.SetTop(tmp, top);\r
                        tmp.Visibility = Visibility.Visible;\r
                }\r
        }\r
@@ -716,7 +751,7 @@ namespace Psychlops
                                tmp.Points.Add(v);\r
                        }\r
                        System.Windows.Controls.Canvas.SetLeft(tmp, datum.x);\r
-                       System.Windows.Controls.Canvas.SetTop(d.rectPool[d.rectPoolN], datum.y);\r
+                       System.Windows.Controls.Canvas.SetTop(tmp, datum.y);\r
                        tmp.Visibility = Visibility.Visible;\r
                        d.polygonPoolN++;\r
                        return tmp;\r
@@ -730,7 +765,7 @@ namespace Psychlops
                                tmp.Points.Add(v);\r
                        }\r
                        System.Windows.Controls.Canvas.SetLeft(tmp, datum.x);\r
-                       System.Windows.Controls.Canvas.SetTop(d.rectPool[d.rectPoolN], datum.y);\r
+                       System.Windows.Controls.Canvas.SetTop(tmp, datum.y);\r
                        tmp.Visibility = Visibility.Visible;\r
                }\r
 \r
@@ -814,7 +849,7 @@ namespace Psychlops
                        tmp.TextAlignment = LETTERS_H_ALIGN_BRIDGE[align];\r
                        tmp.Foreground = fill;\r
                        System.Windows.Controls.Canvas.SetLeft(tmp, datum.x);\r
-                       System.Windows.Controls.Canvas.SetTop(d.rectPool[d.rectPoolN], datum.y);\r
+                       System.Windows.Controls.Canvas.SetTop(tmp, datum.y);\r
                        tmp.Visibility = Visibility.Visible;\r
                        d.lettersPoolN++;\r
                        return tmp;\r
@@ -831,7 +866,7 @@ namespace Psychlops
                        tmp.TextAlignment = LETTERS_H_ALIGN_BRIDGE[align];\r
                        tmp.Foreground = fill;\r
                        System.Windows.Controls.Canvas.SetLeft(tmp, datum.x);\r
-                       System.Windows.Controls.Canvas.SetTop(d.rectPool[d.rectPoolN], datum.y);\r
+                       System.Windows.Controls.Canvas.SetTop(tmp, datum.y);\r
                        tmp.Visibility = Visibility.Visible;\r
                }\r
        }\r
@@ -898,22 +933,86 @@ namespace Psychlops
                        var tmp = d.imagePool[d.imagePoolN];\r
                        tmp.Source = buffer;\r
                        System.Windows.Controls.Canvas.SetLeft(tmp, datum.x);\r
-                       System.Windows.Controls.Canvas.SetTop(d.rectPool[d.rectPoolN], datum.y);\r
+                       System.Windows.Controls.Canvas.SetTop(tmp, datum.y);\r
                        tmp.Visibility = Visibility.Visible;\r
                        d.imagePoolN++;\r
                        return this;\r
                }\r
                public void modifyNative(System.Windows.Controls.Image tmp, Canvas d)\r
                {\r
-                       throw new Exception("Image.modifyNative");\r
                        tmp.Source = buffer;\r
                        System.Windows.Controls.Canvas.SetLeft(tmp, datum.x);\r
-                       System.Windows.Controls.Canvas.SetTop(d.rectPool[d.rectPoolN], datum.y);\r
+                       System.Windows.Controls.Canvas.SetTop(tmp, datum.y);\r
                        tmp.Visibility = Visibility.Visible;\r
                }\r
 \r
        }\r
 \r
+\r
+       partial class Group\r
+       {\r
+               internal void initialize__()\r
+               {\r
+                       Canvas.default_api_canvas.Dispatcher.BeginInvoke(new Canvas.SimpleProcedure(create__));\r
+               }\r
+               internal void create__()\r
+               {\r
+                       cnvs = new System.Windows.Controls.Canvas();\r
+                       AsyncBool = true;\r
+               }\r
+               delegate void AppendFunc1(System.Func<Figure> func);\r
+               public void append__(Shape fig)\r
+               {\r
+               }\r
+\r
+               public Group clone()\r
+               {\r
+                       return (Group)MemberwiseClone();\r
+               }\r
+\r
+               public static implicit operator System.Windows.Controls.Canvas(Group d)\r
+               {\r
+                       var tmp = new System.Windows.Controls.Canvas();\r
+/*                     foreach (var item in list)\r
+                       {\r
+                               tmp.Children.Add(d.);\r
+                       }\r
+                       System.Windows.Controls.Canvas.SetLeft(tmp, d.datum.x);\r
+                       System.Windows.Controls.Canvas.SetTop(tmp, d.datum.y);\r
+*/                     return tmp;\r
+               }\r
+               public UIElement toNative() { return this; }\r
+\r
+               public void copyToStack(Templates.StackableDrawable d)\r
+               {\r
+/*                     var tmp = d.imageStack[d.imageStackN];\r
+                       tmp.datum = datum;\r
+                       tmp.buffer = buffer;\r
+                       tmp.self_rect = self_rect;\r
+                       d.stack[d.stackN] = tmp;\r
+                       d.imageStackN++;\r
+                       d.stackN++;\r
+*/             }\r
+               public UIElement poolNative(Canvas d)\r
+               {\r
+/*                     var tmp = d.imagePool[d.imagePoolN];\r
+                       tmp.Source = buffer;\r
+                       System.Windows.Controls.Canvas.SetLeft(tmp, datum.x);\r
+                       System.Windows.Controls.Canvas.SetTop(tmp, datum.y);\r
+                       tmp.Visibility = Visibility.Visible;\r
+                       d.imagePoolN++;\r
+*/                     return this;\r
+               }\r
+               public void modifyNative(System.Windows.Controls.Canvas tmp, Canvas d)\r
+               {\r
+/*                     tmp.Source = buffer;\r
+                       System.Windows.Controls.Canvas.SetLeft(tmp, datum.x);\r
+                       System.Windows.Controls.Canvas.SetTop(tmp, datum.y);\r
+                       tmp.Visibility = Visibility.Visible;\r
+*/             }\r
+\r
+       }\r
+       \r
        #endregion\r
 \r
 \r