diff --git a/Documents/API文档.docx b/Documents/API文档.docx deleted file mode 100644 index 2a3ae68..0000000 Binary files a/Documents/API文档.docx and /dev/null differ diff --git a/Documents/API文档-old.docx b/Documents/Source/API文档-old.docx similarity index 100% rename from Documents/API文档-old.docx rename to Documents/Source/API文档-old.docx diff --git a/Documents/Source/API文档.docx b/Documents/Source/API文档.docx new file mode 100644 index 0000000..6fbd69f Binary files /dev/null and b/Documents/Source/API文档.docx differ diff --git a/Documents/移植说明.docx b/Documents/Source/SimpleGUI的移植.docx similarity index 100% rename from Documents/移植说明.docx rename to Documents/Source/SimpleGUI的移植.docx diff --git a/Documents/模拟器环境使用.docx b/Documents/Source/模拟器.docx similarity index 100% rename from Documents/模拟器环境使用.docx rename to Documents/Source/模拟器.docx diff --git a/Documents/Source/模拟器环境配置.docx b/Documents/Source/模拟器环境配置.docx new file mode 100644 index 0000000..cc34486 Binary files /dev/null and b/Documents/Source/模拟器环境配置.docx differ diff --git a/Documents/模拟器环境配置.pdf b/Documents/模拟器环境配置.pdf new file mode 100644 index 0000000..e8aea8c Binary files /dev/null and b/Documents/模拟器环境配置.pdf differ diff --git a/GUI/inc/SGUI_Frame.h b/GUI/inc/SGUI_Frame.h index 32d5863..5ff3102 100644 --- a/GUI/inc/SGUI_Frame.h +++ b/GUI/inc/SGUI_Frame.h @@ -18,7 +18,7 @@ typedef struct typedef struct { - SGUI_PCSZSTR Title; + SGUI_PCSZSTR Title; }SGUI_BOX_FRAME_DATA; typedef struct diff --git a/SimulatorEnv/Application/inc/Application.h b/SimulatorEnv/Application/inc/Application.h index 74b8bd6..252317c 100644 --- a/SimulatorEnv/Application/inc/Application.h +++ b/SimulatorEnv/Application/inc/Application.h @@ -10,8 +10,8 @@ #ifndef __INCLUDE_CLASS_APPLICATION_H__ #define __INCLUDE_CLASS_APPLICATION_H__ -#include -#include +#include +#include #include "LCDFrame.h" diff --git a/SimulatorEnv/Application/src/Application.cpp b/SimulatorEnv/Application/src/Application.cpp index 393f13f..a97e476 100644 --- a/SimulatorEnv/Application/src/Application.cpp +++ b/SimulatorEnv/Application/src/Application.cpp @@ -1,4 +1,3 @@ -#include "wx\wx.h" #include "Application.h" #include "Common.h" diff --git a/SimulatorEnv/Common/inc/Common.h b/SimulatorEnv/Common/inc/Common.h index e84915e..3473427 100644 --- a/SimulatorEnv/Common/inc/Common.h +++ b/SimulatorEnv/Common/inc/Common.h @@ -3,17 +3,6 @@ #include #include -#define LCD_COLOR_OBJ_PIX (0xFF168363) -#define LCD_COLOR_OBJ_BKG (0xFF00F0D7) -#define LCD_COLOR_OBJ_EDGE (0xFF383834) -#define LCD_COLOR_OBJ_GRID (0xFF383834) - -#define PARAM_DEFAULT_COLUMNS (192) -#define PARAM_DEFAULT_PAGES (8) -#define PARAM_DEFAULT_PIXEL (3) -#define PARAM_DEFAULT_EDGE (5) -#define PARAM_DEFAULT_GRID (false) - #define _TRANS_TEXT(STR) _(STR) #define LCD_COLOR_OBJ_PIX (0xFF168363) @@ -25,7 +14,7 @@ #define PARAM_DEFAULT_PIXEL_NUM_H (128) #define PARAM_DEFAULT_PIXEL_NUM_V (64) -#define PARAM_DEFAULT_PIXEL_SIZE (2) +#define PARAM_DEFAULT_PIXEL_SIZE (4) #define PARAM_DEFAULT_EDGE_WIDTH (5) #define PARAM_DEFAULT_GRID_ENABLE (true) #define PARAM_DEFAULT_GRID_DISABLE (false) diff --git a/SimulatorEnv/Common/src/Common.cpp b/SimulatorEnv/Common/src/Common.cpp index 1fc6e8e..cab498a 100644 --- a/SimulatorEnv/Common/src/Common.cpp +++ b/SimulatorEnv/Common/src/Common.cpp @@ -12,12 +12,12 @@ void SetDefaultParameterData(PixelPanelParameter* pstParameter) pstParameter->VerticalPixelNumber = PARAM_DEFAULT_PIXEL_NUM_V; pstParameter->PixelSize = PARAM_DEFAULT_PIXEL_SIZE; pstParameter->EdgeWidth = PARAM_DEFAULT_EDGE_WIDTH; - pstParameter->EnableGrid = PARAM_DEFAULT_GRID_DISABLE; + pstParameter->EnableGrid = PARAM_DEFAULT_GRID_ENABLE; // ScreenColor pstParameter->PanelColor.RGBA = LCD_COLOR_OBJ_BKG; pstParameter->PixelColor.RGBA = LCD_COLOR_OBJ_PIX; pstParameter->EdgeColor.RGBA = LCD_COLOR_OBJ_EDGE; - pstParameter->EdgeColor.RGBA = LCD_COLOR_OBJ_GRID; + pstParameter->GridColor.RGBA = LCD_COLOR_OBJ_GRID; } } diff --git a/SimulatorEnv/Frame/src/LCDFrame.cpp b/SimulatorEnv/Frame/src/LCDFrame.cpp index 0418b1e..4ef7fdc 100644 --- a/SimulatorEnv/Frame/src/LCDFrame.cpp +++ b/SimulatorEnv/Frame/src/LCDFrame.cpp @@ -8,7 +8,7 @@ //=======================================================================// //= Include files. =// //=======================================================================// -#include +#include #include "LCDFrame.h" #include "UserActionInterface.h" diff --git a/SimulatorEnv/Interface/inc/VirtualDeviceInterface.h b/SimulatorEnv/Interface/inc/VirtualDeviceInterface.h index 68b52ec..4a006a2 100644 --- a/SimulatorEnv/Interface/inc/VirtualDeviceInterface.h +++ b/SimulatorEnv/Interface/inc/VirtualDeviceInterface.h @@ -4,6 +4,7 @@ //= Include files. =// //=======================================================================// #include +#include //=======================================================================// //= User definition. =// @@ -39,8 +40,8 @@ #define KEY_PRESS_EVENT_VALUE_MAX (4) // Parameter -#define LCD_SIZE_WIDTH (128) -#define LCD_SIZE_HEIGHT (64) +#define LCD_SIZE_WIDTH (PARAM_DEFAULT_PIXEL_NUM_H) +#define LCD_SIZE_HEIGHT (PARAM_DEFAULT_PIXEL_NUM_V) #if LCD_SIZE_WIDTH < 16 #error Define width of LCD size must greater then 16. diff --git a/SimulatorEnv/Project/CodeBlocks/SimpleGUI.cbp b/SimulatorEnv/Project/CodeBlocks/SimpleGUI.cbp index e536e96..a2ff6eb 100644 --- a/SimulatorEnv/Project/CodeBlocks/SimpleGUI.cbp +++ b/SimulatorEnv/Project/CodeBlocks/SimpleGUI.cbp @@ -15,14 +15,14 @@