Skip to content

Commit 38d1f3b

Browse files
committed
screen.ts: added & implemented radio messages.
1 parent 18630a8 commit 38d1f3b

File tree

1 file changed

+52
-17
lines changed

1 file changed

+52
-17
lines changed

screen.ts

Lines changed: 52 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,24 @@
11
namespace user_interface_base {
2+
const SCREEN_FN_ID_RESET_SCREEN_IMAGE: number = 5;
3+
const SCREEN_FN_ID_SET_IMAGE_SIZE: number = 6;
4+
const SCREEN_FN_ID_DRAW_TRANSPARENT_IMAGE: number = 7;
5+
const SCREEN_FN_ID_DRAW_TRANSPARENT_IMAGE_XFRM: number = 8;
6+
const SCREEN_FN_ID_DRAW_LINE: number = 9;
7+
const SCREEN_FN_ID_DRAW_LINE_XFRM: number = 10;
8+
const SCREEN_FN_ID_DRAW_LINE_SHADED: number = 11;
9+
const SCREEN_FN_ID_DRAW_RECT: number = 12;
10+
const SCREEN_FN_ID_DRAW_RECT_XFRM: number = 13;
11+
const SCREEN_FN_ID_FILL: number = 14;
12+
const SCREEN_FN_ID_FILL_RECT: number = 15;
13+
const SCREEN_FN_ID_FILL_RECT_XFRM: number = 16;
14+
const SCREEN_FN_ID_FILL_BOUNDS_XFRM: number = 17;
15+
const SCREEN_FN_ID_DRAW_BOUNDS_XFRM: number = 18;
16+
const SCREEN_FN_ID_OUTLINE_BOUNDS_XFRM: number = 19;
17+
const SCREEN_FN_ID_OUTLINE_BOUNDS_XFRM4: number = 20;
18+
const SCREEN_FN_ID_SET_PIXEL: number = 21;
19+
const SCREEN_FN_ID_SET_PIXEL_XFRM: number = 22;
20+
const SCREEN_FN_ID_PRINT: number = 23;
21+
222
export class Screen {
323
private static image_: Bitmap
424

@@ -51,19 +71,27 @@ namespace user_interface_base {
5171
return Screen.image_
5272
}
5373
public static resetScreenImage() {
54-
Screen.image_ = screen()
55-
Screen.updateBounds()
74+
// Screen.image_ = screen()
75+
// Screen.updateBounds()
76+
basic.showNumber(SCREEN_FN_ID_RESET_SCREEN_IMAGE);
5677
}
5778

5879
public static setImageSize(width: number, height: number) {
59-
Screen.image_ = bitmaps.create(width, height)
60-
Screen.updateBounds()
80+
// Screen.image_ = bitmaps.create(width, height)
81+
// Screen.updateBounds()
82+
basic.showNumber(SCREEN_FN_ID_SET_IMAGE_SIZE);
83+
radio.sendNumber(SCREEN_FN_ID_SET_IMAGE_SIZE);
6184
}
6285

6386
public static drawTransparentImage(from: Bitmap, x: number, y: number) {
64-
Screen.image.drawTransparentBitmap(from, Screen.x(x), Screen.y(y))
87+
// Screen.image.drawTransparentBitmap(from, Screen.x(x), Screen.y(y));
88+
89+
// basic.showNumber(SCREEN_FN_ID_DRAW_TRANSPARENT_IMAGE);
90+
// radio.sendString(from);
91+
// radio.sendNumber(SCREEN_FN_ID_SET_IMAGE_SIZE);
6592
}
6693

94+
6795
public static drawTransparentImageXfrm(
6896
xfrm: Affine,
6997
from: Bitmap,
@@ -85,13 +113,16 @@ namespace user_interface_base {
85113
y1: number,
86114
c: number
87115
) {
88-
Screen.image.drawLine(
89-
Screen.x(x0),
90-
Screen.y(y0),
91-
Screen.x(x1),
92-
Screen.y(y1),
93-
c
94-
)
116+
// Screen.image.drawLine(
117+
// Screen.x(x0),
118+
// Screen.y(y0),
119+
// Screen.x(x1),
120+
// Screen.y(y1),
121+
// c
122+
// )
123+
124+
basic.showNumber(SCREEN_FN_ID_DRAW_LINE);
125+
radio.sendNumber(SCREEN_FN_ID_DRAW_LINE);
95126
}
96127

97128
public static drawLineXfrm(
@@ -135,7 +166,9 @@ namespace user_interface_base {
135166
height: number,
136167
c: number
137168
) {
138-
Screen.image.drawRect(Screen.x(x), Screen.y(y), width, height, c)
169+
// Screen.image.drawRect(Screen.x(x), Screen.y(y), width, height, c)
170+
basic.showNumber(SCREEN_FN_ID_DRAW_RECT);
171+
radio.sendNumber(SCREEN_FN_ID_DRAW_RECT);
139172
}
140173

141174
public static drawRectXfrm(
@@ -155,7 +188,7 @@ namespace user_interface_base {
155188
c: number
156189
) {
157190
basic.showNumber(0);
158-
radio.sendBuffer(Buffer.fromArray([0, 6]));
191+
radio.sendBuffer(Buffer.fromArray([0, c]));
159192
}
160193

161194
public static fillRect(
@@ -165,8 +198,8 @@ namespace user_interface_base {
165198
height: number,
166199
c: number
167200
) {
168-
basic.showNumber(1);
169-
radio.sendBuffer(Buffer.fromArray([1, x, y, width, height, c]));
201+
basic.showNumber(SCREEN_FN_ID_FILL_RECT);
202+
radio.sendBuffer(Buffer.fromArray([SCREEN_FN_ID_FILL_RECT, x, y, width, height, c]));
170203
}
171204

172205
public static fillRectXfrm(
@@ -331,7 +364,9 @@ namespace user_interface_base {
331364

332365
public static setPixel(x: number, y: number, c: number) {
333366
if (c) {
334-
Screen.image.setPixel(Screen.x(x), Screen.y(y), c)
367+
// Screen.image.setPixel(Screen.x(x), Screen.y(y), c)
368+
basic.showNumber(SCREEN_FN_ID_SET_PIXEL);
369+
radio.sendNumber(SCREEN_FN_ID_SET_PIXEL);
335370
}
336371
}
337372

0 commit comments

Comments
 (0)