Skip to content

Commit 8f71538

Browse files
committed
Update arm_2d_scene_flight_attitude_instrument.c
1 parent ef7ec03 commit 8f71538

File tree

1 file changed

+12
-25
lines changed

1 file changed

+12
-25
lines changed

examples/demos/arm_2d_scene_flight_attitude_instrument.c

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,6 @@ IMPL_PFB_ON_DRAW(__pfb_draw_scene_flight_attitude_instrument_handler)
332332

333333
arm_2d_canvas(ptTile, __top_canvas) {
334334
/*-----------------------draw the scene begin-----------------------*/
335-
336-
337335
arm_2d_align_centre(__top_canvas, VISUAL_AREA_MASK.tRegion.tSize) {
338336

339337
int16_t iVisualAreaWidth = VISUAL_AREA_MASK.tRegion.tSize.iWidth;
@@ -344,7 +342,6 @@ IMPL_PFB_ON_DRAW(__pfb_draw_scene_flight_attitude_instrument_handler)
344342
&VISUAL_AREA_MASK,
345343
(__arm_2d_color_t) {GLCD_COLOR_SKY_BLUE});
346344

347-
348345
/* draw land */
349346
spin_zoom_widget_show( &this.Roll.tLand,
350347
ptTile,
@@ -405,36 +402,26 @@ IMPL_PFB_ON_DRAW(__pfb_draw_scene_flight_attitude_instrument_handler)
405402

406403
arm_2d_align_top_centre(__dock_region, tRollScaleLabelSize.iWidth + 4,
407404
tRollScaleLabelSize.iHeight + 6) {
408-
409-
//arm_2d_helper_draw_box(ptTile, &__top_centre_region, 1, GLCD_COLOR_GREEN, 255);
410-
draw_round_corner_border( ptTile,
411-
&__top_centre_region,
412-
GLCD_COLOR_WHITE,
413-
(arm_2d_border_opacity_t)
414-
{128, 128, 128, 128},
415-
(arm_2d_corner_opacity_t)
416-
{128, 128, 128, 128});
417405

406+
draw_round_corner_border( ptTile,
407+
&__top_centre_region,
408+
GLCD_COLOR_WHITE,
409+
(arm_2d_border_opacity_t)
410+
{128, 128, 128, 128},
411+
(arm_2d_corner_opacity_t)
412+
{128, 128, 128, 128});
418413

419-
arm_lcd_text_set_target_framebuffer((arm_2d_tile_t *)ptTile);
420-
arm_lcd_text_set_font((arm_2d_font_t *)&ARM_2D_FONT_LiberationSansRegular14_A4);
421-
arm_lcd_text_set_draw_region(&__top_centre_region);
422-
arm_lcd_text_set_colour(GLCD_COLOR_WHITE, GLCD_COLOR_WHITE);
423-
424-
arm_lcd_printf_label(ARM_2D_ALIGN_TOP_CENTRE, "%"PRId16, -this.iRollScale / 10);
414+
arm_lcd_text_set_target_framebuffer((arm_2d_tile_t *)ptTile);
415+
arm_lcd_text_set_font((arm_2d_font_t *)&ARM_2D_FONT_LiberationSansRegular14_A4);
416+
arm_lcd_text_set_draw_region(&__top_centre_region);
417+
arm_lcd_text_set_colour(GLCD_COLOR_WHITE, GLCD_COLOR_WHITE);
425418

419+
arm_lcd_printf_label(ARM_2D_ALIGN_TOP_CENTRE, "%"PRId16, -this.iRollScale / 10);
426420
}
427-
428-
429421
}
430-
431-
432422
}
433423

434-
435-
436424
/* draw text at the top-left corner */
437-
438425
arm_lcd_text_set_target_framebuffer((arm_2d_tile_t *)ptTile);
439426
arm_lcd_text_set_font(&ARM_2D_FONT_6x8.use_as__arm_2d_font_t);
440427
arm_lcd_text_set_draw_region(NULL);

0 commit comments

Comments
 (0)