scene.ts changes for MicroData debugging

Author: KierPalin

scene.ts

@@ -113,17 +113,17 @@ namespace user_interface_base {
 
         public pushScene(scene: Scene) {
             const currScene = this.currScene()
-            basic.showNumber(9)
+            // basic.showNumber(9)
 
             if (currScene) {
                 currScene.deactivate()
             }
-            basic.showNumber(0)
+            // basic.showNumber(0)
             context.pushEventContext()
             this.scenes.push(scene)
-            basic.showNumber(1)
+            // basic.showNumber(1)
             scene.startup()
-            basic.showNumber(2)
+            // basic.showNumber(2)
             scene.activate()
             scene.__init()
         }
@@ -154,16 +154,16 @@ namespace user_interface_base {
         }
 
         private currScene(): Scene {
-            if (this.scenes != null) {
-                basic.showString("N");
-            } else {
-                basic.showString("H")
-            }
+            // if (this.scenes != null) {
+            //     basic.showString("N");
+            // } else {
+            //     basic.showString("H")
+            // }
             if (this.scenes.length) {
-                basic.showString("ye");
+                // basic.showString("ye");
                 return this.scenes[this.scenes.length - 1]
             }
-            basic.showString("undef")
+            // basic.showString("undef")
             return undefined
         }
     }

screen.ts

@@ -124,7 +124,14 @@ namespace user_interface_base {
 
             // basic.showNumber(SCREEN_FN_ID_DRAW_LINE);
             // radio.sendNumber(SCREEN_FN_ID_DRAW_LINE);
-            radio.sendBuffer(Buffer.fromArray([SCREEN_FN_ID_DRAW_LINE, x0, y0, x1, y1, c]));
+            radio.sendBuffer(
+                Buffer.fromArray([
+                    SCREEN_FN_ID_DRAW_LINE,
+                    x0 + Screen.HALF_WIDTH, y0 + Screen.HALF_HEIGHT,
+                    x1 + Screen.HALF_WIDTH, y1 + Screen.HALF_HEIGHT,
+                    c
+                ])
+            );
         }
 
         public static drawLineXfrm(
@@ -171,7 +178,7 @@ namespace user_interface_base {
             // Screen.image.drawRect(Screen.x(x), Screen.y(y), width, height, c)
             // basic.showNumber(SCREEN_FN_ID_DRAW_RECT);
             // radio.sendNumber(SCREEN_FN_ID_DRAW_RECT);
-            radio.sendBuffer(Buffer.fromArray([SCREEN_FN_ID_DRAW_RECT, x, y, width, height, c]));
+            radio.sendBuffer(Buffer.fromArray([SCREEN_FN_ID_DRAW_RECT, x + Screen.HALF_WIDTH, y + Screen.HALF_HEIGHT, width, height, c]));
         }
 
         public static drawRectXfrm(
@@ -203,20 +210,7 @@ namespace user_interface_base {
         ) {
             // basic.showNumber(SCREEN_FN_ID_FILL_RECT);
 
-            const b = Buffer.fromArray([SCREEN_FN_ID_FILL_RECT, x + Screen.HALF_WIDTH, y + Screen.HALF_HEIGHT, width, height, c])
-
-            // -80, -64, 176, 192
-            basic.showString("S")
-            basic.showNumber(x)
-            basic.showString("p")
-            basic.showNumber(y)
-            for (let i = 0; i < b.length; i++) {
-                basic.showString("" + i + ":" + b[i])
-
-            }
-            basic.showString("D")
-
-            radio.sendBuffer(Buffer.fromArray([SCREEN_FN_ID_FILL_RECT, x, y, width, height, c]));
+            radio.sendBuffer(Buffer.fromArray([SCREEN_FN_ID_FILL_RECT, x + Screen.HALF_WIDTH, y + Screen.HALF_HEIGHT, width, height, c]))
         }
 
         public static fillRectXfrm(
@@ -383,7 +377,7 @@ namespace user_interface_base {
             if (c) {
                 // Screen.image.setPixel(Screen.x(x), Screen.y(y), c)
                 // basic.showNumber(SCREEN_FN_ID_SET_PIXEL);
-                radio.sendBuffer(Buffer.fromArray([SCREEN_FN_ID_SET_PIXEL, x, y, c]));
+                radio.sendBuffer(Buffer.fromArray([SCREEN_FN_ID_SET_PIXEL, x + Screen.HALF_WIDTH, y + Screen.HALF_HEIGHT, c]));
             }
         }
 
@@ -410,7 +404,7 @@ namespace user_interface_base {
             radio.sendString(text);
 
             const c: number = (color == null) ? 0 : color;
-            radio.sendBuffer(Buffer.fromArray([SCREEN_FN_ID_PRINT, x, y, c]));
+            radio.sendBuffer(Buffer.fromArray([SCREEN_FN_ID_PRINT, x + Screen.HALF_WIDTH, y + Screen.HALF_HEIGHT, c]));
 
             // Screen.image.print(
             //     text,