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 16e77c3..e2ccbeb 100644 Binary files a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo and b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo differ