修改等间距触发设置参数问题。

This commit is contained in:
TAO Cheng
2014-08-06 20:56:13 +08:00
parent 4bb02c6002
commit c69fd170d9
4 changed files with 35 additions and 15 deletions
@@ -4763,3 +4763,8 @@ Usb Port Initialized.
Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Init:Open device succeed .
@@ -273,7 +273,6 @@ void CSo7_Util_External_Trig::m_UpdateCtrls(int _type)
if (m_TrigMode==E_DIS_TRIG_PULSE_EQDIS)
{
((CEdit*)GetDlgItem(IDC_EDIT_SO7_EXTRIG_EQDIS))->EnableWindow(TRUE);
((CEdit*)GetDlgItem(IDC_EDIT_SO7_EXTRIG_SPECLOCATION))->EnableWindow(FALSE);
((CButton*)GetDlgItem(IDC_LIST_SO7_EXTRIG_SPECLOCATION))->EnableWindow(FALSE);
if (_type==0)
{
@@ -288,7 +287,6 @@ void CSo7_Util_External_Trig::m_UpdateCtrls(int _type)
else
{
((CEdit*)GetDlgItem(IDC_EDIT_SO7_EXTRIG_EQDIS))->EnableWindow(FALSE);
((CEdit*)GetDlgItem(IDC_EDIT_SO7_EXTRIG_SPECLOCATION))->EnableWindow(TRUE);
((CButton*)GetDlgItem(IDC_LIST_SO7_EXTRIG_SPECLOCATION))->EnableWindow(TRUE);
if (_type==0)
{
@@ -343,7 +341,7 @@ void CSo7_Util_External_Trig::m_UpdatePara(BOOL _bSave)
cTmp=T2A(csTmp);
dTmp=atof(cTmp);
m_TrigPara[0] = static_cast<long>(m_pSO7_Proto->MMtoScale(dTmp,dResolution));
iParaNumber=1;
iParaNumber=m_ParaNumber;
dEndPos+=m_ParaNumber*dTmp;
}
else