|
|
@ -157,6 +157,11 @@ CAnnealMonitoringMgr::CAnnealMonitoringMgr(void)
|
|
|
|
|
|
|
|
|
|
|
|
m_bBeamCheckByYmtc = false;//是否将beam 数据发送给YMTC 检测
|
|
|
|
m_bBeamCheckByYmtc = false;//是否将beam 数据发送给YMTC 检测
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
m_BeamCheckSetCur1 = 10;
|
|
|
|
|
|
|
|
m_BeamCheckSetCur2 = 10;
|
|
|
|
|
|
|
|
m_BeamSetDimmer1 = 38;
|
|
|
|
|
|
|
|
m_BeamSetDimmer2 = 38;
|
|
|
|
|
|
|
|
|
|
|
|
m_GateCheck_bUse = true;//是否监控光闸状态
|
|
|
|
m_GateCheck_bUse = true;//是否监控光闸状态
|
|
|
|
m_GateCheck_MinDataCnt = 540;//最小判断Data数
|
|
|
|
m_GateCheck_MinDataCnt = 540;//最小判断Data数
|
|
|
|
m_GateCheck_MidDataCnt = 180;//中间判断Data数(需要小于最小点数)
|
|
|
|
m_GateCheck_MidDataCnt = 180;//中间判断Data数(需要小于最小点数)
|
|
|
@ -592,6 +597,95 @@ CMFCPropertyGridProperty *CAnnealMonitoringMgr::CreatGridProperty()
|
|
|
|
pGroup1->AddSubItem(p);
|
|
|
|
pGroup1->AddSubItem(p);
|
|
|
|
gDevicePropertieMgr.Insert(p, pPropertie);
|
|
|
|
gDevicePropertieMgr.Insert(p, pPropertie);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
//添加属性变量映射
|
|
|
|
|
|
|
|
Name = _T("m_BeamCheckSetCur1");//变量名字
|
|
|
|
|
|
|
|
CPropertie *pPropertie = new CPropertie;
|
|
|
|
|
|
|
|
pPropertie->SetpVal((void*)&m_BeamCheckSetCur1);
|
|
|
|
|
|
|
|
pPropertie->SetType(_PROP_TYPE_DOUBLE);
|
|
|
|
|
|
|
|
pPropertie->SetpModule(this);
|
|
|
|
|
|
|
|
pPropertie->SetPath(Path);
|
|
|
|
|
|
|
|
pPropertie->SetName(Name);
|
|
|
|
|
|
|
|
pPropertie->WriteRead(true);//读取保存的属性
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//添加属性显示
|
|
|
|
|
|
|
|
PropertyName = _T("Laser1设置电流");
|
|
|
|
|
|
|
|
Description = _T("光斑检测时Laser1设置电流");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pPropertie->SetGroupName(GroupName);
|
|
|
|
|
|
|
|
pPropertie->SetShowName(PropertyName);
|
|
|
|
|
|
|
|
pPropertie->SetModuleName(ModuleName);
|
|
|
|
|
|
|
|
CMFCPropertyGridProperty* p = new CMFCPropertyGridProperty(PropertyName, (_variant_t)m_BeamCheckSetCur1, Description);
|
|
|
|
|
|
|
|
pGroup1->AddSubItem(p);
|
|
|
|
|
|
|
|
gDevicePropertieMgr.Insert(p, pPropertie);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
//添加属性变量映射
|
|
|
|
|
|
|
|
Name = _T("m_BeamCheckSetCur2");//变量名字
|
|
|
|
|
|
|
|
CPropertie *pPropertie = new CPropertie;
|
|
|
|
|
|
|
|
pPropertie->SetpVal((void*)&m_BeamCheckSetCur2);
|
|
|
|
|
|
|
|
pPropertie->SetType(_PROP_TYPE_DOUBLE);
|
|
|
|
|
|
|
|
pPropertie->SetpModule(this);
|
|
|
|
|
|
|
|
pPropertie->SetPath(Path);
|
|
|
|
|
|
|
|
pPropertie->SetName(Name);
|
|
|
|
|
|
|
|
pPropertie->WriteRead(true);//读取保存的属性
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//添加属性显示
|
|
|
|
|
|
|
|
PropertyName = _T("Laser2设置电流");
|
|
|
|
|
|
|
|
Description = _T("光斑检测时Laser2设置电流");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pPropertie->SetGroupName(GroupName);
|
|
|
|
|
|
|
|
pPropertie->SetShowName(PropertyName);
|
|
|
|
|
|
|
|
pPropertie->SetModuleName(ModuleName);
|
|
|
|
|
|
|
|
CMFCPropertyGridProperty* p = new CMFCPropertyGridProperty(PropertyName, (_variant_t)m_BeamCheckSetCur2, Description);
|
|
|
|
|
|
|
|
pGroup1->AddSubItem(p);
|
|
|
|
|
|
|
|
gDevicePropertieMgr.Insert(p, pPropertie);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
//添加属性变量映射
|
|
|
|
|
|
|
|
Name = _T("m_BeamSetDimmer1");//变量名字
|
|
|
|
|
|
|
|
CPropertie *pPropertie = new CPropertie;
|
|
|
|
|
|
|
|
pPropertie->SetpVal((void*)&m_BeamSetDimmer1);
|
|
|
|
|
|
|
|
pPropertie->SetType(_PROP_TYPE_DOUBLE);
|
|
|
|
|
|
|
|
pPropertie->SetpModule(this);
|
|
|
|
|
|
|
|
pPropertie->SetPath(Path);
|
|
|
|
|
|
|
|
pPropertie->SetName(Name);
|
|
|
|
|
|
|
|
pPropertie->WriteRead(true);//读取保存的属性
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//添加属性显示
|
|
|
|
|
|
|
|
PropertyName = _T("Laser1设置衰减角度");
|
|
|
|
|
|
|
|
Description = _T("光斑检测时Laser1设置衰减角度(最小默认30)");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pPropertie->SetGroupName(GroupName);
|
|
|
|
|
|
|
|
pPropertie->SetShowName(PropertyName);
|
|
|
|
|
|
|
|
pPropertie->SetModuleName(ModuleName);
|
|
|
|
|
|
|
|
CMFCPropertyGridProperty* p = new CMFCPropertyGridProperty(PropertyName, (_variant_t)m_BeamSetDimmer1, Description);
|
|
|
|
|
|
|
|
pGroup1->AddSubItem(p);
|
|
|
|
|
|
|
|
gDevicePropertieMgr.Insert(p, pPropertie);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
//添加属性变量映射
|
|
|
|
|
|
|
|
Name = _T("m_BeamSetDimmer2");//变量名字
|
|
|
|
|
|
|
|
CPropertie *pPropertie = new CPropertie;
|
|
|
|
|
|
|
|
pPropertie->SetpVal((void*)&m_BeamSetDimmer2);
|
|
|
|
|
|
|
|
pPropertie->SetType(_PROP_TYPE_DOUBLE);
|
|
|
|
|
|
|
|
pPropertie->SetpModule(this);
|
|
|
|
|
|
|
|
pPropertie->SetPath(Path);
|
|
|
|
|
|
|
|
pPropertie->SetName(Name);
|
|
|
|
|
|
|
|
pPropertie->WriteRead(true);//读取保存的属性
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//添加属性显示
|
|
|
|
|
|
|
|
PropertyName = _T("Laser2设置衰减角度");
|
|
|
|
|
|
|
|
Description = _T("光斑检测时Laser2设置衰减角度(最小默认30)");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pPropertie->SetGroupName(GroupName);
|
|
|
|
|
|
|
|
pPropertie->SetShowName(PropertyName);
|
|
|
|
|
|
|
|
pPropertie->SetModuleName(ModuleName);
|
|
|
|
|
|
|
|
CMFCPropertyGridProperty* p = new CMFCPropertyGridProperty(PropertyName, (_variant_t)m_BeamSetDimmer2, Description);
|
|
|
|
|
|
|
|
pGroup1->AddSubItem(p);
|
|
|
|
|
|
|
|
gDevicePropertieMgr.Insert(p, pPropertie);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pGroup->AddSubItem(pGroup1);
|
|
|
|
pGroup->AddSubItem(pGroup1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1612,6 +1706,33 @@ void CAnnealMonitoringMgr::BindingCheckList(CListCtrl *Power1List,CListCtrl *Pow
|
|
|
|
m_pLaserBeamCheckList = BeamList;
|
|
|
|
m_pLaserBeamCheckList = BeamList;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
double CAnnealMonitoringMgr::GetBeamCheckSetCur(eLaserDeviceType LaserDevice)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (_LaserDeviceType_MainLaser1 == LaserDevice)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return m_BeamCheckSetCur1;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return m_BeamCheckSetCur2;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
double CAnnealMonitoringMgr::GetBeamSetDimmer(eLaserDeviceType LaserDevice)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
double Val;
|
|
|
|
|
|
|
|
if (_LaserDeviceType_MainLaser1 == LaserDevice)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
Val = m_BeamSetDimmer1 > 30 ? m_BeamSetDimmer1 : 30;
|
|
|
|
|
|
|
|
return Val;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
Val = m_BeamSetDimmer2 > 30 ? m_BeamSetDimmer2 : 30;
|
|
|
|
|
|
|
|
return Val;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void CAnnealMonitoringMgr::InitPrepareWorkVec()
|
|
|
|
void CAnnealMonitoringMgr::InitPrepareWorkVec()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
int Cnt = (int)(_AnnealMonitoringType_Max);
|
|
|
|
int Cnt = (int)(_AnnealMonitoringType_Max);
|
|
|
|