diff --git a/DemoProc/inc/DemoResource_UTF8.h b/DemoProc/inc/DemoResource_UTF8.h index 83afd5b..84128e0 100644 --- a/DemoProc/inc/DemoResource_UTF8.h +++ b/DemoProc/inc/DemoResource_UTF8.h @@ -4,7 +4,7 @@ /* Screen 1: List Components. */ /* Start screen with list. */ #define SCR1_TITLE ("列表组件") -#define SCR1_LIST_ITEM1 ("基础绘图") +#define SCR1_LIST_ITEM1 ("基础绘图组件") #define SCR1_LIST_ITEM2 ("文本") #define SCR1_LIST_ITEM3 ("输入框") #define SCR1_LIST_ITEM4 ("实时曲线") diff --git a/DemoProc/src/Basic.c b/DemoProc/src/Basic.c index cb1c73b..204e4d5 100644 --- a/DemoProc/src/Basic.c +++ b/DemoProc/src/Basic.c @@ -74,7 +74,7 @@ HMI_ENGINE_RESULT HMI_DemoBasic_RefreshScreen(SGUI_SCR_DEV* pstDeviceIF, const v // Paint background for(iPaintBkgIdx=0; iPaintBkgIdxstSize.iHeight; iPaintBkgIdx+=5) { - SGUI_Basic_DrawHorizontalLine(pstDeviceIF, 0, pstDeviceIF->stSize.iWidth-1, iPaintBkgIdx, iPaintBkgIdx/pstDeviceIF->stSize.iHeight*0x0F); + SGUI_Basic_DrawHorizontalLine(pstDeviceIF, 0, pstDeviceIF->stSize.iWidth-1, iPaintBkgIdx, iPaintBkgIdx*0x0F/pstDeviceIF->stSize.iHeight); } // Paint rectangle SGUI_Basic_DrawRectangle(pstDeviceIF, 1, 1, 30, 20, 0x0F, SGUI_COLOR_TRANS); diff --git a/DemoProc/src/RealtimeGraph.c b/DemoProc/src/RealtimeGraph.c index f3f3bc6..b464df9 100644 --- a/DemoProc/src/RealtimeGraph.c +++ b/DemoProc/src/RealtimeGraph.c @@ -83,7 +83,7 @@ HMI_ENGINE_RESULT HMI_DemoRealGraph_RefreshScreen(SGUI_SCR_DEV* pstDeviceIF, con stTextDisplayArea.iHeight = 8; stInnerPos.iX = 0; stInnerPos.iY = 0; - SGUI_Text_DrawText(pstDeviceIF, SCR5_RT_GRAPH_TITLE, SGUI_FONT_REF(FONT_8), &stTextDisplayArea, &stInnerPos, SGUI_DRAW_NORMAL); + SGUI_Text_DrawText(pstDeviceIF, SCR5_RT_GRAPH_TITLE, SGUI_FONT_REF(FONT_8), &stTextDisplayArea, &stInnerPos, 0x0F); // Paint value. SGUI_Common_IntegerToString(s_stRealtimeGraph.Data->ValueArray[s_stRealtimeGraph.Data->ValueCount-1], szTextBuffer, 10, 4, ' '); stTextDisplayArea.iX = 1; @@ -92,7 +92,7 @@ HMI_ENGINE_RESULT HMI_DemoRealGraph_RefreshScreen(SGUI_SCR_DEV* pstDeviceIF, con stTextDisplayArea.iHeight = 5; stInnerPos.iX = 0; stInnerPos.iY = 0; - SGUI_Text_DrawText(pstDeviceIF, szTextBuffer, SGUI_FONT_REF(MiniNum), &stTextDisplayArea, &stInnerPos, SGUI_DRAW_NORMAL); + SGUI_Text_DrawText(pstDeviceIF, szTextBuffer, SGUI_FONT_REF(MiniNum), &stTextDisplayArea, &stInnerPos, 0x0F); SGUI_RealtimeGraph_Repaint(pstDeviceIF, &s_stRealtimeGraph); return HMI_RET_NORMAL; }