修改显示的内容

TCLTools/TCLTools/TCLTools.rc

@@ -77,35 +77,35 @@ IDR_MAINFRAME           ICON                    "res\\TCLTools.ico"
 // Dialog
 //
 
-IDD_TCLTOOLS_DIALOG DIALOGEX 0, 0, 347, 273
+IDD_TCLTOOLS_DIALOG DIALOGEX 0, 0, 511, 323
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "抄写工具"
 FONT 9, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    COMBOBOX        IDC_COMBO_PORTS,28,9,52,76,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "串口",IDC_STATIC,11,11,15,8
-    COMBOBOX        IDC_COMBO_CMDS,28,27,151,159,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "指令",IDC_STATIC,11,29,15,8
-    EDITTEXT        IDC_EDIT_KEY,28,44,151,14,ES_AUTOHSCROLL | ES_READONLY
-    PUSHBUTTON      "打开key",BTN_OPEN_FILE,181,44,34,14
-    CONTROL         "HEX-BIN",IDC_CHECK_HB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,219,46,42,10
-    CONTROL         "BIN-HEX",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,259,46,42,10
-    LTEXT           "文件",IDC_STATIC,11,47,15,8
-    LTEXT           "状态：",IDC_STATIC,22,72,22,8
-    EDITTEXT        IDC_EDIT_INT,49,89,74,12,ES_AUTOHSCROLL | ES_READONLY
-    EDITTEXT        IDC_EDIT_STR,49,106,286,14,ES_AUTOHSCROLL | ES_READONLY
-    LTEXT           "单字节：",IDC_STATIC,16,89,28,8
-    EDITTEXT        IDC_EDIT_HEX,49,125,286,133,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
-    PUSHBUTTON      "执行",BTN_EXEC_CMD,181,27,34,14
-    PUSHBUTTON      "打开串口",BTN_OPEN_PORT,82,8,50,14
+    COMBOBOX        IDC_COMBO_PORTS,32,11,57,76,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "串口",IDC_STATIC,15,14,15,8
+    COMBOBOX        IDC_COMBO_CMDS,32,27,199,159,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "指令",IDC_STATIC,15,29,15,8
+    EDITTEXT        IDC_EDIT_KEY,32,43,198,14,ES_AUTOHSCROLL | ES_READONLY
+    PUSHBUTTON      "打开key",BTN_OPEN_FILE,236,43,34,14
+    CONTROL         "HEX-BIN",IDC_CHECK_HB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,274,45,42,10
+    CONTROL         "BIN-HEX",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,314,45,42,10
+    LTEXT           "文件",IDC_STATIC,15,45,15,8
+    LTEXT           "状态：",IDC_STATIC,22,75,22,8
+    EDITTEXT        IDC_EDIT_INT,49,90,74,12,ES_AUTOHSCROLL | ES_READONLY
+    EDITTEXT        IDC_EDIT_STR,49,106,451,87,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
+    LTEXT           "单字节：",IDC_STATIC,16,90,28,8
+    EDITTEXT        IDC_EDIT_HEX,49,197,451,115,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
+    PUSHBUTTON      "执行",BTN_EXEC_CMD,236,26,34,14
+    PUSHBUTTON      "打开串口",BTN_OPEN_PORT,92,10,50,14
     LTEXT           "字符串：",IDC_STATIC,16,108,28,8
-    LTEXT           "十六进制：",IDC_STATIC,10,125,35,8
-    EDITTEXT        IDC_EDIT_STATUS,49,70,74,14,ES_AUTOHSCROLL | ES_READONLY
-    GROUPBOX        "结果",IDC_STATIC,7,60,333,203
-    LTEXT           "错误：",IDC_STATIC,131,72,22,8
-    EDITTEXT        IDC_EDIT_ERROR,153,70,181,31,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
-    PUSHBUTTON      "重新加载命令",BTN_RELOAD_CMD,134,8,50,14
+    LTEXT           "十六进制：",IDC_STATIC,10,197,35,8
+    EDITTEXT        IDC_EDIT_STATUS,49,73,74,14,ES_AUTOHSCROLL | ES_READONLY
+    GROUPBOX        "结果",IDC_STATIC_RESULT,7,60,497,256
+    LTEXT           "错误：",IDC_STATIC,131,74,22,8
+    EDITTEXT        IDC_EDIT_ERROR,153,73,348,31,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
+    PUSHBUTTON      "重新加载命令",BTN_RELOAD_CMD,144,10,50,14
 END
 
 
@@ -159,9 +159,9 @@ BEGIN
     IDD_TCLTOOLS_DIALOG, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 340
+        RIGHTMARGIN, 504
         TOPMARGIN, 7
-        BOTTOMMARGIN, 266
+        BOTTOMMARGIN, 316
     END
 END
 #endif    // APSTUDIO_INVOKED

TCLTools/TCLTools/TCLToolsDlg.cpp

@@ -304,11 +304,12 @@ void CTCLToolsDlg::OnBnClickedExecCmd()
     CString strText;
     int nCurSel = m_cbCommands.GetCurSel();
     if ( nCurSel != CB_ERR ) {
+        CString strCMDName;
+        m_cbCommands.GetLBText(nCurSel, strCMDName);
+        SetDlgItemText(IDC_STATIC_RESULT, strCMDName + _T("->执行结果："));
         if ( g_tclCommand.IsOpen() ) {
             bool bStatus = false;
             CommandParam cmdpara;
-			CString strCMDName;
-            m_cbCommands.GetLBText(nCurSel, strCMDName);
             g_tclCommand.GetCommandParams(strCMDName.GetString(), cmdpara);
             if ( cmdpara.nOption == CMDOPT_Set )
             {
@@ -362,6 +363,7 @@ void CTCLToolsDlg::OnBnClickedExecCmd()
                     SetDlgItemInt(IDC_EDIT_INT, (byte)cmdpara._rtnData[0] << 8 | (byte)cmdpara._rtnData[1]);
             }
 
+#if 0
             // 设置原字符串显示;
             if ( cmdpara.nOption == CMDOPT_Get )
             {
@@ -373,7 +375,10 @@ void CTCLToolsDlg::OnBnClickedExecCmd()
             {
                 SetDlgItemText(IDC_EDIT_HEX, utils::BytesToHexString((byte*)cmdpara._rtnData.c_str(), cmdpara._rtnData.size(), ' ').c_str());
             }
-
+#else
+            SetDlgItemText(IDC_EDIT_STR, cmdpara._rtnContext.c_str());
+            SetDlgItemText(IDC_EDIT_HEX, utils::BytesToHexString((byte*)cmdpara._rtnContext.c_str(), cmdpara._rtnContext.size(), ' ').c_str());
+#endif
         }
         else
         {

TCLTools/TCLTools/resource.h

@@ -20,8 +20,8 @@
 #define BTN_OPEN_PORT                   1011
 #define IDC_EDIT_STATUS                 1012
 #define IDC_EDIT_ERROR                  1013
-#define IDC_BUTTON1                     1014
 #define BTN_RELOAD_CMD                  1014
+#define IDC_STATIC_RESULT               1015
 
 // Next default values for new objects
 // 
@@ -29,7 +29,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        130
 #define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1015
+#define _APS_NEXT_CONTROL_VALUE         1016
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif