From 491e3c245fbee1df80b0c1da9818664856a7ed67 Mon Sep 17 00:00:00 2001 From: LIAO Tiegang Date: Mon, 19 Jan 2015 10:06:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=A9=E5=BA=A6=E4=BC=A0=E6=84=9F=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc | 91 +++++++------- .../UsbUtil/SO7_Temperature_Display.cpp | 113 +++++++++++------- .../UsbUtil/Usb_Util.vcxproj.filters | 8 +- .../Hsi/Tools/UsbUtility/UsbUtil/resource.h | 8 +- .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 156160 -> 156160 bytes 5 files changed, 131 insertions(+), 89 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc index 64c2f59..6dee26e 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc @@ -1134,52 +1134,55 @@ BEGIN COMBOBOX IDC_COMBO_SO7_TEMOERATURE_SENSOR_PORT,7,40,48,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP END -IDD_SO7_UTIL_TEMPERATURE_DISPLAY DIALOGEX 0, 0, 511, 276 +IDD_SO7_UTIL_TEMPERATURE_DISPLAY DIALOGEX 0, 0, 556, 281 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "温度检测" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - PUSHBUTTON "打开串口",IDC_BUTTON_SO7_UTIL_TEMPERATURE_DISPLAY_OPEN,445,14,50,14 - PUSHBUTTON "关闭串口",IDC_BUTTON_SO7_UTIL_TEMPERATURE_DISPLAY_CLOSE,445,41,50,14 - PUSHBUTTON "开始检测",IDC_BUTTON_SO7_UTIL_TEMPERATURE_DISPLAY_START,445,86,50,14 - PUSHBUTTON "退出",IDC_BUTTON_SO7_UTIL_TEMPERATURE_DISPLAY_EXIT,444,244,50,14 - GROUPBOX "通信设置",IDC_STATIC,7,7,431,51 - COMBOBOX IDC_COMBO_SO7_UTIL_TEMPERATURE_DISPLAY_PORT,116,24,48,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "端口：",IDC_STATIC,58,26,25,10 - LTEXT "波特率：",IDC_STATIC,233,25,33,8 - COMBOBOX IDC_COMBO_SO7_UTIL_TEMPERATURE_DISPLAY_BAUD,293,23,48,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "数据显示",IDC_STATIC,7,67,431,195 - LTEXT "a",IDC_STATIC,93,103,8,8 - LTEXT "b",IDC_STATIC,169,104,8,8 - LTEXT "c",IDC_STATIC,252,104,8,8 - LTEXT "传感器编号:",IDC_STATIC,14,105,44,8 - PUSHBUTTON "终止检测",IDC_BUTTON_SO7_UTIL_TEMPERATURE_DISPLAY_END,443,140,50,14 - EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A1,67,127,62,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_B1,143,127,64,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C1,223,127,68,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A2,66,162,62,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_B2,145,161,62,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C2,223,161,68,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A3,65,196,62,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_B3,145,196,62,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C3,223,196,67,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor1,7,126,47,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor2,7,162,47,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor3,7,196,45,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature1,339,129,40,14,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature2,337,162,40,14,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature3,337,198,40,14,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature4,337,228,40,14,ES_AUTOHSCROLL | ES_READONLY - LTEXT "℃",IDC_STATIC,395,130,9,8 - LTEXT "℃",IDC_STATIC,395,164,9,8 - LTEXT "℃",IDC_STATIC,395,199,9,8 - LTEXT "℃",IDC_STATIC,396,230,9,8 - PUSHBUTTON "保 存",IDC_BUTTON_SO7_UTIL_TEMPERATURE_DISPLAY_SAVE,445,191,50,14 - GROUPBOX "特征值设定",IDC_STATIC,63,92,249,129 - GROUPBOX "温度显示",IDC_STATIC,321,90,106,161 - LTEXT "温度",IDC_STATIC,344,106,17,8 - LTEXT "单位",IDC_STATIC,389,105,17,8 - EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor4,7,227,46,14,ES_AUTOHSCROLL + PUSHBUTTON "打开串口",IDC_BUTTON_SO7_UTIL_TEMPERATURE_DISPLAY_OPEN,491,16,50,14 + PUSHBUTTON "关闭串口",IDC_BUTTON_SO7_UTIL_TEMPERATURE_DISPLAY_CLOSE,489,57,50,14 + PUSHBUTTON "开始检测",IDC_BUTTON_SO7_UTIL_TEMPERATURE_DISPLAY_START,489,94,50,14 + PUSHBUTTON "退出",IDC_BUTTON_SO7_UTIL_TEMPERATURE_DISPLAY_EXIT,489,232,50,14 + GROUPBOX "通信设置",IDC_STATIC,7,7,469,39 + COMBOBOX IDC_COMBO_SO7_UTIL_TEMPERATURE_DISPLAY_PORT,92,21,48,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "端口：",IDC_STATIC,45,22,25,10 + LTEXT "波特率：",IDC_STATIC,210,22,33,8 + COMBOBOX IDC_COMBO_SO7_UTIL_TEMPERATURE_DISPLAY_BAUD,271,21,48,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX "数据显示",IDC_STATIC,7,61,469,199 + LTEXT "A",IDC_STATIC,121,98,8,8 + LTEXT "B",IDC_STATIC,221,98,8,8 + LTEXT "C",IDC_STATIC,317,98,8,8 + PUSHBUTTON "终止检测",IDC_BUTTON_SO7_UTIL_TEMPERATURE_DISPLAY_END,489,137,50,14 + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A1,80,122,88,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_B1,173,122,98,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C1,277,122,91,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A2,80,154,88,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_B2,173,154,97,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C2,277,154,91,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A3,82,189,85,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_B3,173,189,98,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C3,277,189,90,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor1,17,121,47,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor2,18,153,47,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor3,17,189,45,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature1,383,122,54,14,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature2,383,156,55,14,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature3,383,191,55,14,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature4,383,223,56,14,ES_AUTOHSCROLL | ES_READONLY + LTEXT "℃",IDC_STATIC,444,122,9,8 + LTEXT "℃",IDC_STATIC,445,159,9,8 + LTEXT "℃",IDC_STATIC,445,193,9,8 + LTEXT "℃",IDC_STATIC,446,223,9,8 + PUSHBUTTON "保 存",IDC_BUTTON_SO7_UTIL_TEMPERATURE_DISPLAY_SAVE,489,183,50,14 + GROUPBOX "特征值设定",IDC_STATIC,76,82,296,160 + GROUPBOX "温度显示",IDC_STATIC,373,82,101,160 + LTEXT "温度",IDC_STATIC,398,98,17,8 + LTEXT "单位",IDC_STATIC,441,98,17,8 + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor4,16,220,46,14,ES_AUTOHSCROLL + GROUPBOX "传感器编号:",IDC_STATIC,7,82,69,160 + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A4,82,221,85,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_B4,175,221,96,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C4,277,221,90,14,ES_AUTOHSCROLL END @@ -1398,9 +1401,9 @@ BEGIN IDD_SO7_UTIL_TEMPERATURE_DISPLAY, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 504 + RIGHTMARGIN, 549 TOPMARGIN, 7 - BOTTOMMARGIN, 269 + BOTTOMMARGIN, 274 END END #endif // APSTUDIO_INVOKED diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Temperature_Display.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Temperature_Display.cpp index 187e8dc..ddc0c44 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Temperature_Display.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Temperature_Display.cpp @@ -7,23 +7,12 @@ #include "..\..\..\SevenOcean\CMMIO_SERIAL.H" #include extern CPSerial* m_pSO7_TemperatureDisplay; +UINT_PTR nIDTimer1 = 1; static BYTE bSendData[8]= {0x01,0x04,0x00,0x00,0x00,0x0C,0xF0,0x0F}; static CString csFileTitle("Eigenvalue.txt"); static double dbK = 273.15; -UINT_PTR nIDTimer1 = 1; -static double dbTemperature[126] = { - 32650.9,31030.8,29500.5,28054.1,26687.5,25392.0,24172.5,23015.9,21921.2,20884.7,19903.2,18973.3, - 18092.2,17256.9,16464.9,15713.7,15000.9,14324.5,13682.3,13072.6,12493.3,11943.0,11419.9,10922.7, - 10449.8,10000.0,9572.0,9164.7,8777.0,8407.7,8056.1,7721.0,7401.7,7097.3,6807.1,6530.3, - 6266.2,6014.3,5773.8,5544.2,5325.0,5155.6,4915.6,4724.4,4541.7,4367.0,4200.0,4040.2, - 3887.4,3741.1,3601.1,3467.0,3338.7,3215.8,3098.0,2985.2,2877.0,2773.3,2673.9,2578.6, - 2478.1,2399.4,2315.2,2234.4,2156.8,2082.3,2010.8,1942.1,1876.0,1812.6,1751.6,1693.0, - 1636.6,1582.4,1530.2,1480.1,1431.8,1385.3,1340.6,1297.5,1256.1,1216.1,1177.7,1140.6, - 1104.9,1070.5,1037.3,1005.3,974.4,944.7,916.0,888.3,861.5,835.8,810.9,786.8, - 763.6,741.2,719.6,698.6,678.4,658.9,640.0,621.8,604.2,587.1,570.6,554.6, - 539.2,524.3,509.8,495.9,482.3,469.2,456.5,444.2,432.3,420.8,409.7,398.8, - 378.2,368.3,358.8,349.5,340.6 -}; +static double dbTemperature[256]; + // CSO7_Temperature_Display 霘る簮鞗 IMPLEMENT_DYNAMIC(CSO7_Temperature_Display, CDialogEx) @@ -295,82 +284,113 @@ BOOL CSO7_Temperature_Display::ReadDataFromFile() { strtxt = "0"; } - GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor1)->SetWindowTextW((LPCTSTR)strtxt.Mid(15,strtxt.GetLength())); + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor1)->SetWindowTextW((LPCTSTR)strtxt.Mid(14,strtxt.GetLength())); if(!file.ReadString(strtxt)) { strtxt = "0"; } - GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A1)->SetWindowTextW((LPCTSTR)strtxt.Mid(4,strtxt.GetLength())); + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A1)->SetWindowTextW((LPCTSTR)strtxt.Mid(2,strtxt.GetLength())); if(!file.ReadString(strtxt)) { strtxt = "0"; } - GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_B1)->SetWindowTextW((LPCTSTR)strtxt.Mid(4,strtxt.GetLength())); + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_B1)->SetWindowTextW((LPCTSTR)strtxt.Mid(2,strtxt.GetLength())); if(!file.ReadString(strtxt)) { strtxt = "0"; } - GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C1)->SetWindowTextW((LPCTSTR)strtxt.Mid(4,strtxt.GetLength())); + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C1)->SetWindowTextW((LPCTSTR)strtxt.Mid(2,strtxt.GetLength())); file.ReadString(strtxt); if(!file.ReadString(strtxt)) { strtxt = "0"; } - GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor2)->SetWindowTextW((LPCTSTR)strtxt.Mid(15,strtxt.GetLength())); + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor2)->SetWindowTextW((LPCTSTR)strtxt.Mid(14,strtxt.GetLength())); if(!file.ReadString(strtxt)) { strtxt = "0"; } - GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A2)->SetWindowTextW((LPCTSTR)strtxt.Mid(4,strtxt.GetLength())); + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A2)->SetWindowTextW((LPCTSTR)strtxt.Mid(2,strtxt.GetLength())); if(!file.ReadString(strtxt)) { strtxt = "0"; } - GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_B2)->SetWindowTextW((LPCTSTR)strtxt.Mid(4,strtxt.GetLength())); + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_B2)->SetWindowTextW((LPCTSTR)strtxt.Mid(2,strtxt.GetLength())); if(!file.ReadString(strtxt)) { strtxt = "0"; } - GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C2)->SetWindowTextW((LPCTSTR)strtxt.Mid(4,strtxt.GetLength())); + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C2)->SetWindowTextW((LPCTSTR)strtxt.Mid(2,strtxt.GetLength())); file.ReadString(strtxt); if(!file.ReadString(strtxt)) { strtxt = "0"; } - GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor3)->SetWindowTextW((LPCTSTR)strtxt.Mid(15,strtxt.GetLength())); + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor3)->SetWindowTextW((LPCTSTR)strtxt.Mid(14,strtxt.GetLength())); if(!file.ReadString(strtxt)) { strtxt = "0"; } - GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A3)->SetWindowTextW((LPCTSTR)strtxt.Mid(4,strtxt.GetLength())); + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A3)->SetWindowTextW((LPCTSTR)strtxt.Mid(2,strtxt.GetLength())); if(!file.ReadString(strtxt)) { strtxt = "0"; } - GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_B3)->SetWindowTextW((LPCTSTR)strtxt.Mid(4,strtxt.GetLength())); + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_B3)->SetWindowTextW((LPCTSTR)strtxt.Mid(2,strtxt.GetLength())); if(!file.ReadString(strtxt)) { strtxt = "0"; } - GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C3)->SetWindowTextW((LPCTSTR)strtxt.Mid(4,strtxt.GetLength())); + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C3)->SetWindowTextW((LPCTSTR)strtxt.Mid(2,strtxt.GetLength())); file.ReadString(strtxt); if(!file.ReadString(strtxt)) { strtxt = "0"; } - GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor4)->SetWindowTextW((LPCTSTR)strtxt.Mid(15,strtxt.GetLength())); + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor4)->SetWindowTextW((LPCTSTR)strtxt.Mid(14,strtxt.GetLength())); + + if(!file.ReadString(strtxt)) + { + strtxt = "0"; + } + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A4)->SetWindowTextW((LPCTSTR)strtxt.Mid(2,strtxt.GetLength())); + + if(!file.ReadString(strtxt)) + { + strtxt = "0"; + } + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_B4)->SetWindowTextW((LPCTSTR)strtxt.Mid(2,strtxt.GetLength())); + + if(!file.ReadString(strtxt)) + { + strtxt = "0"; + } + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C4)->SetWindowTextW((LPCTSTR)strtxt.Mid(2,strtxt.GetLength())); + + /* + int i = 0; + while(file.ReadString(strtxt)) + { + dbTemperature[i] = _ttof(strtxt.Mid(5,strtxt.GetLength())); + i++; + if(i >= 256) + { + break; + } + } + */ return true; } @@ -400,6 +420,13 @@ BOOL CSO7_Temperature_Display::GetValueFromEdit() GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C3)->GetWindowTextW(csValue); dbValue[2][2] = _ttof(csValue); + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A4)->GetWindowTextW(csValue); + dbValue[3][0] = _ttof(csValue); + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_B4)->GetWindowTextW(csValue); + dbValue[3][1] = _ttof(csValue); + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C4)->GetWindowTextW(csValue); + dbValue[3][2] = _ttof(csValue); + /* CString csdata; csdata.Format(L"%f",dbValue[0][0]); @@ -473,13 +500,7 @@ void CSO7_Temperature_Display::OnTimer(UINT_PTR nIDEvent) if(dbR4 > 0) { - //dbT4 = 1/(dbValue[3][0] + dbValue[3][1]*log(dbR4) + dbValue[3][2]*log(dbR4)*log(dbR4)*log(dbR4)) - dbK; - int i = 0; - while(dbR4 <= dbTemperature[i]) - { - i++; - } - dbT4 = (i-1) + (dbR4 -dbTemperature[i]) /(dbTemperature[i-1] - dbTemperature[i]); + dbT4 = 1/(dbValue[3][0] + dbValue[3][1]*log(dbR4) + dbValue[3][2]*log(dbR4)*log(dbR4)*log(dbR4)) - dbK; csdata.Format(L"%f",dbT4); } else @@ -487,8 +508,6 @@ void CSO7_Temperature_Display::OnTimer(UINT_PTR nIDEvent) csdata.Format(L"%s",L"璇ヤ紶鎰熷櫒寮傚父"); } GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature4)->SetWindowTextW((LPCTSTR)csdata); - - } else { @@ -513,10 +532,10 @@ void CSO7_Temperature_Display::OnBnClickedButtonSo7UtilTemperatureDisplaySave() // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜 CString csWriteData,csValue; CString csn("\n"); - CString csa("a = "); - CString csb("b = "); - CString csc("c = "); - CString csTempNumber("sensor number: "); + CString csa("a="); + CString csb("b="); + CString csc("c="); + CString csTempNumber("sensor_number="); file.Close(); if(file.Open(csFileTitle,CFile::modeWrite,&e)) { @@ -579,8 +598,20 @@ void CSO7_Temperature_Display::OnBnClickedButtonSo7UtilTemperatureDisplaySave() csWriteData = csTempNumber + csValue + csn; file.WriteString(csWriteData); + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A4)->GetWindowTextW(csValue); + csWriteData = csa + csValue + csn; + file.WriteString(csWriteData); + + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_B4)->GetWindowTextW(csValue); + csWriteData = csb + csValue + csn; + file.WriteString(csWriteData); + + GetDlgItem(IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C4)->GetWindowTextW(csValue); + csWriteData = csc + csValue + csn; + file.WriteString(csWriteData); + file.Flush(); - m_StatusBar.SetText(_T("淇濆瓨鎴愬姛"), 1, 0); + m_StatusBar.SetText(_T("淇濆瓨鎴愬姛"), 2, 0); } diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters index e07f6ce..9561a9b 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters @@ -238,7 +238,9 @@ Sources Files - + + Sources Files + @@ -511,7 +513,9 @@ Header Files - + + Header Files + diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h index 9b2e260..b646018 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h @@ -354,6 +354,7 @@ #define IDC_EDIT_SO7_EXTRIG_SPECLOCATION 1274 #define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_C1 1274 #define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C1 1274 +#define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C0 1274 #define IDC_EDIT_FRESHSPEED_X2 1275 #define IDC_EDIT_IMAGEDLL_2LASER_TOPZ2 1275 #define IDC_EDIT_MANUAL_MACHINE_MSG 1275 @@ -1122,7 +1123,6 @@ #define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_B4 1945 #define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor2 1945 #define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_C4 1946 -#define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C4 1946 #define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor3 1946 #define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature1 1947 #define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature2 1948 @@ -1134,6 +1134,10 @@ #define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_A1 1953 #define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A1 1953 #define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_Temperature_Sensor4 1954 +#define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_B4 1955 +#define IDC_EDIT5 1956 +#define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_C4 1956 +#define IDC_EDIT_SO7_UTIL_TEMPERATURE_DISPLAY_VALUE_A4 1957 #define IDC_BUTTON_DIY_EXIT_BUTTON 32740 #define ID_EDIT_SO7_CONFIG_MOTION 32741 @@ -1143,7 +1147,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 200 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1955 +#define _APS_NEXT_CONTROL_VALUE 1958 #define _APS_NEXT_SYMED_VALUE 104 #endif #endif diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo index 16e77c3bdfe663112e10ffdc82210fff89932ef5..e2ccbeb3512a4c7a5ba7b2a391c4a3f26cb938d6 100644 GIT binary patch delta 4477 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 ACIA2c delta 3796 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