完善设置值的同步。

This commit is contained in:
TAO Cheng
2014-05-28 15:44:42 +08:00
parent 92299ad02a
commit ec719c48bb
7 changed files with 69 additions and 41 deletions
@@ -350,7 +350,9 @@ void CSO7_UtilDlg::UpdateCtrlsStatus(bool _bEnable)
GetDlgItem(IDC_CHECK_SO7_SPARE_LIGHT_ON)->EnableWindow(_bEnable);
GetDlgItem(IDC_BUTTON_SO7_TRIGPULSE_STOP)->EnableWindow(_bEnable);
GetDlgItem(IDC_BUTTON_SO7_TRIGPULSE_START)->EnableWindow(_bEnable);
GetDlgItem(IDC_BUTTON_SO7_TRIGPULSE_START)->EnableWindow(_bEnable);
GetDlgItem(IDC_BUTTON_SO7_TRIGPULSE_WRITE_PARA)->EnableWindow(_bEnable);
GetDlgItem(IDC_BUTTON_SO7_TRIGPULSE_READ_PARA)->EnableWindow(_bEnable);
GetDlgItem(IDC_EDIT_SET_SEQ_NO)->EnableWindow(_bEnable);
GetDlgItem(IDC_BUTTON_SO7_GET_SEQ_NUMBER)->EnableWindow(_bEnable);
GetDlgItem(IDC_BUTTON_SO7_SET_SEQ_NUMBER)->EnableWindow(_bEnable);
@@ -435,6 +437,12 @@ void CSO7_UtilDlg::OnBnClickedButtonStartSo7machine()
SetTimer(1, m_ReadAxisIntervalTime, 0);
m_OutMessage.Format(_T("%d"),m_ReadAxisIntervalTime);
GetDlgItem(IDC_EDIT_UPDATE_FREQ)->SetWindowText(m_OutMessage);
m_cs_XScaleCoeff.Format(_T("%.2f"),(m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution));
m_cs_YScaleCoeff.Format(_T("%.2f"),(m_pSO7_Proto->g_machine.s_machine_config.y_axis._scale_resolution));
m_cs_ZScaleCoeff.Format(_T("%.2f"),(m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution));
UpdateData(FALSE);
}
//=====================================================================
@@ -969,6 +977,11 @@ void CSO7_UtilDlg::OnBnClickedButtonSetupSo7config()
delete m_pSO7_AutoZoom;
m_pSO7_AutoZoom=NULL;
}
m_cs_XScaleCoeff.Format(_T("%.2f"),(m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution));
m_cs_YScaleCoeff.Format(_T("%.2f"),(m_pSO7_Proto->g_machine.s_machine_config.y_axis._scale_resolution));
m_cs_ZScaleCoeff.Format(_T("%.2f"),(m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution));
UpdateData(FALSE);
SetTimer(1,m_ReadAxisIntervalTime,NULL);
}
@@ -50,8 +50,8 @@ BOOL CSetSo7MotionConfig::OnInitDialog()
m_ConfigList.InsertColumn(0,_T("编号"),LVCFMT_LEFT, m_rect.right*2/40);
m_ConfigList.InsertColumn(1,_T("参数名"),LVCFMT_LEFT, m_rect.right*12/40);
m_ConfigList.InsertColumn(2,_T(""),LVCFMT_LEFT, m_rect.right*3/40);
m_ConfigList.InsertColumn(3,_T("描述"),LVCFMT_LEFT, m_rect.right*22/40);
m_ConfigList.InsertColumn(2,_T(""),LVCFMT_LEFT, m_rect.right*4/40);
m_ConfigList.InsertColumn(3,_T("描述"),LVCFMT_LEFT, m_rect.right*21/40);
for (int i = 1; i < 100; i++)
{
@@ -485,6 +485,14 @@ void CSetSo7MotionConfig::SaveDataValue()
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[3]=atoi(cTemp);
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_MachineType=atoi(cTemp);
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_VideoCardType=atoi(cTemp);
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);