xhouse/EF3-Interface
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增SV4000E视频卡的降噪功能，以及so7_config.ini降噪参数的设置。

Browse Source
This commit is contained in:
TAO Cheng
2014-03-07 15:51:13 +08:00
parent 7379e48b67
commit 4a66a20928
16 changed files with 528 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log
+64
View File
@@ -3818,3 +3818,67 @@ Init:Open device succeed .
Destruct Cso7_Proto.
Construct Cso7_Proto.
Unable to open device Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Unable to open device Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Unable to open device Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Unable to open device Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Unable to open device Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Unable to open device Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Init:Open device succeed .
_start_machine
Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/Utility_Config.ini
+3 -3
View File
@@ -112,9 +112,9 @@ Z_MOTOR_WHEELBASE=1.500
MOTOR_PULSE_NUM=10000
;
[WORKTABLE]
X_SCALE_RESOLUTION=0.500
Y_SCALE_RESOLUTION=0.500
Z_SCALE_RESOLUTION=0.500
X_SCALE_RESOLUTION=0.400
Y_SCALE_RESOLUTION=0.400
Z_SCALE_RESOLUTION=0.400
;
X_NEG_WORKING_LIMIT=0.000
Y_NEG_WORKING_LIMIT=0.000
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/so7_config.ini
+9 -3
View File
@@ -10,14 +10,13 @@ ZOOM_READING_INTERVAL_TIME=60
ZOOM_MOTOR_SPEED_FAST=2000
ZOOM_MOTOR_SPEED_SLOW=800
;
[HARDWARE]
[MOTION]
CLOSE_LOOP_ENABLED=0
MOTION_RETRY_TIMES=5
SHIFT_POSITION_X=0.000000
SHIFT_POSITION_Y=0.000000
SHIFT_POSITION_Z=0.000000
SDK3000_SLEEP_COUNT=550000
GET_USB_MESSAGE_METHOD=0
GET_USB_MESSAGE_METHOD=1
WRITE_DATA_SLEEP_TIME=0
ACCURA_ERROR_PULSE_X=1
ACCURA_ERROR_PULSE_Y=1
@@ -25,6 +24,13 @@ ACCURA_ERROR_PULSE_Z=1
EQUIDISTANCE_PULSE_X=0
EQUIDISTANCE_PULSE_Y=0
EQUIDISTANCE_PULSE_Z=0
;
SDK3000_SLEEP_COUNT=550000
SV4000E_DENOISE_PARA_CHANNEL1=100
SV4000E_DENOISE_PARA_CHANNEL2=70
SV4000E_DENOISE_PARA_CHANNEL3=60
SV4000E_DENOISE_PARA_CHANNEL4=70
;
[HSI]
MACHINE_CONTROLLER_TYPE=0
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc
+10 -6
View File
@@ -169,9 +169,11 @@ BEGIN
CONTROL "ON",IDC_CHECK_SO7_COAXIAL_LIGHT_ON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,366,98,26,10
CONTROL "ON",IDC_CHECK_SO7_SPARE_LIGHT_ON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,366,112,26,10
LTEXT "----------------------------------------------------",IDC_STATIC,305,170,140,8
EDITTEXT IDC_EDIT_SET_SEQ_NO,261,46,29,14,ES_AUTOHSCROLL
PUSHBUTTON "Get SEQ NO.",IDC_BUTTON_SO7_GET_SEQ_NUMBER,230,66,60,15,BS_MULTILINE
LTEXT "SEQ NO.",IDC_STATIC,232,48,29,8
EDITTEXT IDC_EDIT_SET_SEQ_NO,261,67,29,14,ES_AUTOHSCROLL
PUSHBUTTON "Get SEQ NO.",IDC_BUTTON_SO7_GET_SEQ_NUMBER,230,87,60,15,BS_MULTILINE
LTEXT "SEQ NO.",IDC_STATIC,232,69,29,8
PUSHBUTTON "Set SEQ NO.",IDC_BUTTON_SO7_SET_SEQ_NUMBER,230,108,60,15,BS_MULTILINE
PUSHBUTTON "Set Ver NO.",IDC_BUTTON_SO7_SET_VER_NUMBER,230,45,60,15,BS_MULTILINE
END
IDD_SO7_UTIL_SEND_PARAMETER DIALOGEX 0, 0, 750, 480
@@ -782,9 +784,9 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "开始",IDOK,372,298,50,14
PUSHBUTTON "退出",IDCANCEL,435,298,50,14
CONTROL "彩色图像",IDC_RADIO_SV4000E_RGB,"Button",BS_AUTORADIOBUTTON | WS_GROUP,435,49,48,10
CONTROL "黑白图像",IDC_RADIO_SV4000E_GRAY,"Button",BS_AUTORADIOBUTTON,435,67,48,10
CONTROL "垂直镜像",IDC_SV4000E_CHECK_MIRROR_VERTICALLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,435,93,48,10
CONTROL "彩色图像",IDC_RADIO_SV4000E_RGB,"Button",BS_AUTORADIOBUTTON | WS_GROUP,435,13,48,10
CONTROL "黑白图像",IDC_RADIO_SV4000E_GRAY,"Button",BS_AUTORADIOBUTTON,435,31,48,10
CONTROL "垂直镜像",IDC_SV4000E_CHECK_MIRROR_VERTICALLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,435,57,48,10
PUSHBUTTON "保存图片",IDC_BUTTON_SV4000E_SAVEFILE,435,117,50,14
GROUPBOX "通道选择",IDC_STATIC,438,145,43,102
CONTROL "",IDC_STATIC_SV4000E_PICTURE,"Static",SS_BLACKFRAME | NOT WS_VISIBLE,225,300,71,12
@@ -793,6 +795,8 @@ BEGIN
CONTROL "3",IDC_RADIO_SV4000E_CHANNEL3,"Button",BS_AUTORADIOBUTTON,451,196,20,10
CONTROL "4",IDC_RADIO_SV4000E_CHANNEL4,"Button",BS_AUTORADIOBUTTON,451,213,20,10
CONTROL "All",IDC_RADIO_SV4000E_CHANNEL_ALL,"Button",BS_AUTORADIOBUTTON,451,230,23,10
EDITTEXT IDC_EDIT_SV4000E_DENOISE,441,93,40,14,ES_AUTOHSCROLL
GROUPBOX "降噪(5-100)",IDC_STATIC,437,75,47,39
END
IDD_SO7_UTIL_PROGRAM DIALOGEX 0, 0, 590, 386
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp
+8 -8
View File
@@ -117,7 +117,6 @@ BEGIN_MESSAGE_MAP(CSO7_UtilDlg, CDialog)
ON_BN_CLICKED(IDC_BUTTON_RESET_V, &CSO7_UtilDlg::OnBnClickedButtonResetV)
ON_BN_CLICKED(IDC_BUTTON_GET_FIXTURE_FLAG, &CSO7_UtilDlg::OnBnClickedButtonGetFixtureFlag)
ON_BN_CLICKED(IDC_BUTTON_SET_RESET_FLAG, &CSO7_UtilDlg::OnBnClickedButtonSetResetFlag)
ON_EN_KILLFOCUS(IDC_EDIT_SET_VER_NO, &CSO7_UtilDlg::OnEnKillfocusEditSetVerNo)
ON_BN_CLICKED(IDC_BUTTON_RESET_WORKTABLE_RIGHT, &CSO7_UtilDlg::OnBnClickedButtonResetWorktableRight)
ON_BN_CLICKED(IDC_BUTTON_SET_OUT_PORT, &CSO7_UtilDlg::OnBnClickedButtonSetOutPort)
ON_EN_KILLFOCUS(IDC_EDIT_X_SCALE_COEFFICIENT, &CSO7_UtilDlg::OnEnKillfocusEditXScaleCoefficient)
@@ -145,8 +144,9 @@ BEGIN_MESSAGE_MAP(CSO7_UtilDlg, CDialog)
ON_BN_CLICKED(IDC_CHECK_SO7_COAXIAL_LIGHT_ON, &CSO7_UtilDlg::OnBnClickedCheckSo7CoaxialLightOn)
ON_BN_CLICKED(IDC_CHECK_SO7_SPARE_LIGHT_ON, &CSO7_UtilDlg::OnBnClickedCheckSo7SpareLightOn)
ON_BN_CLICKED(IDC_RADIO_READ_OUTPUT_PORT2, &CSO7_UtilDlg::OnBnClickedRadioReadOutputPort2)
ON_EN_KILLFOCUS(IDC_EDIT_SET_SEQ_NO, &CSO7_UtilDlg::OnEnKillfocusEditSetSeqNo)
ON_BN_CLICKED(IDC_BUTTON_SO7_GET_SEQ_NUMBER, &CSO7_UtilDlg::OnBnClickedButtonSo7GetSeqNumber)
ON_BN_CLICKED(IDC_BUTTON_SO7_SET_SEQ_NUMBER, &CSO7_UtilDlg::OnBnClickedButtonSo7SetSeqNumber)
ON_BN_CLICKED(IDC_BUTTON_SO7_SET_VER_NUMBER, &CSO7_UtilDlg::OnBnClickedButtonSo7SetVerNumber)
END_MESSAGE_MAP()
@@ -355,7 +355,8 @@ void CSO7_UtilDlg::UpdateCtrlsStatus(bool _bEnable)
GetDlgItem(IDC_BUTTON_GO)->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);
GetDlgItem(IDC_BUTTON_SO7_SET_VER_NUMBER)->EnableWindow(_bEnable);
}
@@ -828,7 +829,7 @@ void CSO7_UtilDlg::OnBnClickedButtonSetResetFlag()
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_RESET_FLAG();
}
void CSO7_UtilDlg::OnEnKillfocusEditSetVerNo()
void CSO7_UtilDlg::OnBnClickedButtonSo7SetVerNumber()
{
UpdateData(TRUE);
USES_CONVERSION;
@@ -837,7 +838,8 @@ void CSO7_UtilDlg::OnEnKillfocusEditSetVerNo()
m_pSO7_Proto->g_machine.cVerNumber = static_cast<char>(atoi(cTempSendCmd));
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_VER_NUMBER();
}
void CSO7_UtilDlg::OnEnKillfocusEditSetSeqNo()
void CSO7_UtilDlg::OnBnClickedButtonSo7SetSeqNumber()
{
UpdateData(TRUE);
USES_CONVERSION;
@@ -848,12 +850,12 @@ void CSO7_UtilDlg::OnEnKillfocusEditSetSeqNo()
m_pSO7_Proto->_send_cmd_SO7_CMD_SET_SEQ_NUMBER();
}
void CSO7_UtilDlg::OnBnClickedButtonSo7GetSeqNumber()
{
m_pSO7_Proto->_send_cmd_SO7_CMD_GET_SEQ_NUMBER();
CString csOutMessage;
csOutMessage.Format(_T("%d"),static_cast<BYTE>(m_pSO7_Proto->g_machine.SEQ_NUMBER));
GetDlgItem(IDC_EDIT_SET_SEQ_NO)->SetWindowTextW(csOutMessage);
m_OutMessage = _T("[SEQ NO]: ")+csOutMessage;
OutputWithScroll(m_OutMessage,m_edMSG);
}
@@ -1504,5 +1506,3 @@ void CSO7_UtilDlg::OnBnClickedButtonGo()
m_pSO7_Proto->_send_cmd_SO7_CMD_MOVE_TO_POS_Z();
}
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h
+2 -2
View File
@@ -98,7 +98,6 @@ public:
afx_msg void OnBnClickedButtonResetV();
afx_msg void OnBnClickedButtonGetFixtureFlag();
afx_msg void OnBnClickedButtonSetResetFlag();
afx_msg void OnEnKillfocusEditSetVerNo();
afx_msg void OnBnClickedButtonResetWorktableRight();
afx_msg void OnBnClickedButtonSetOutPort();
afx_msg void OnEnKillfocusEditXScaleCoefficient();
@@ -126,6 +125,7 @@ public:
afx_msg void OnBnClickedCheckSo7CoaxialLightOn();
afx_msg void OnBnClickedCheckSo7SpareLightOn();
afx_msg void OnBnClickedRadioReadOutputPort2();
afx_msg void OnEnKillfocusEditSetSeqNo();
afx_msg void OnBnClickedButtonSo7GetSeqNumber();
afx_msg void OnBnClickedButtonSo7SetSeqNumber();
afx_msg void OnBnClickedButtonSo7SetVerNumber();
};
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SetSo7MotionConfig.cpp
+64 -16
View File
@@ -60,7 +60,7 @@ BOOL CSetSo7MotionConfig::OnInitDialog()
}
UpdateLabelName();
UpdateDataValue();
m_ConfigList.SetMaxItemIndex(0,13,2,2);
m_ConfigList.SetMaxItemIndex(0,17,2,2);
return TRUE;
}
@@ -98,13 +98,7 @@ void CSetSo7MotionConfig::UpdateLabelName()
cStr="default:0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="SDK3000_SLEEP_COUNT";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="default:550000";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="GET_USB_MESSAGE_METHOD";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="default:1";
@@ -152,6 +146,37 @@ void CSetSo7MotionConfig::UpdateLabelName()
cStr="default:0";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
//=================VIDEOCARD==================
cStr="SDK3000_SLEEP_COUNT";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="default:550000";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="SV4000E_DENOISE_PARA_CHANNEL1";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="default:70";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="SV4000E_DENOISE_PARA_CHANNEL2";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="default:70";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="SV4000E_DENOISE_PARA_CHANNEL3";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="default:70";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
cStr="SV4000E_DENOISE_PARA_CHANNEL4";
m_ConfigList.SetItemText(iRow,iCol,cStr);
cStr="default:70";
m_ConfigList.SetItemText(iRow,iCol+2,cStr);
iRow++;
}
void CSetSo7MotionConfig::UpdateDataValue()
{
@@ -168,8 +193,6 @@ void CSetSo7MotionConfig::UpdateDataValue()
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%.3f"),m_pSO7_Proto->g_machine.s_machine_config.motion._ShiftPositionZ);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_CntThreadSleepVal);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.GetInterruptMsgMethod);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_WriteDataSleepTime);
@@ -186,6 +209,16 @@ void CSetSo7MotionConfig::UpdateDataValue()
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_EQUIDIS_Z);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_SDK3000_CntThreadSleepVal);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[0]);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[1]);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[2]);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
cStr.Format(_T("%d"),m_pSO7_Proto->g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[3]);
m_ConfigList.SetItemText(iRow++,iCol,cStr);
}
void CSetSo7MotionConfig::SaveDataValue()
{
@@ -214,11 +247,7 @@ void CSetSo7MotionConfig::SaveDataValue()
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion._ShiftPositionZ=atof(cTemp);
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_CntThreadSleepVal=atoi(cTemp);
m_pSO7_Proto->g_machine.s_machine_config.motion._ShiftPositionZ=atof(cTemp);
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);
@@ -252,7 +281,26 @@ void CSetSo7MotionConfig::SaveDataValue()
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_EQUIDIS_Z=atoi(cTemp);
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_SDK3000_CntThreadSleepVal=atoi(cTemp);
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[0]=atoi(cTemp);
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[1]=atoi(cTemp);
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[2]=atoi(cTemp);
iRow++;
cStr=m_ConfigList.GetItemText(iRow,iCol);
cTemp=T2A(cStr);
m_pSO7_Proto->g_machine.s_machine_config.motion.m_SV4000E_DenoisePara[3]=atoi(cTemp);
iRow++;
}
void CSetSo7MotionConfig::OnBnClickedButtonSo7MotionConfigOk()
{
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_SV4000E.cpp
+40 -2
View File
@@ -29,6 +29,10 @@ IMPLEMENT_DYNAMIC(CVideocard_SV4000E, CDialog)
m_bMirror=FALSE;
m_ConvertColorType=YUY2TORGB;
m_bSaveFile=FALSE;
for (int i=0;i<4;i++)
{
m_DenoiseValue[i]=0;
}
}
CVideocard_SV4000E::~CVideocard_SV4000E()
@@ -37,6 +41,7 @@ CVideocard_SV4000E::~CVideocard_SV4000E()
void CVideocard_SV4000E::DoDataExchange(CDataExchange* pDX)
{
DDX_Text(pDX, IDC_EDIT_SV4000E_DENOISE,m_EditDenoise);
CDialog::DoDataExchange(pDX);
}
@@ -54,6 +59,7 @@ BEGIN_MESSAGE_MAP(CVideocard_SV4000E, CDialog)
ON_BN_CLICKED(IDC_RADIO_SV4000E_CHANNEL3, &CVideocard_SV4000E::OnBnClickedRadioSV4000EChannel3)
ON_BN_CLICKED(IDC_RADIO_SV4000E_CHANNEL4, &CVideocard_SV4000E::OnBnClickedRadioSV4000EChannel4)
ON_BN_CLICKED(IDC_RADIO_SV4000E_CHANNEL_ALL, &CVideocard_SV4000E::OnBnClickedRadioSv4000eChannelAll)
ON_EN_KILLFOCUS(IDC_EDIT_SV4000E_DENOISE, &CVideocard_SV4000E::OnEnKillfocusEditSv4000eDenoise)
END_MESSAGE_MAP()
@@ -90,7 +96,9 @@ BOOL CVideocard_SV4000E::OnInitDialog()
((CButton *)GetDlgItem(IDC_RADIO_SV4000E_CHANNEL2))->SetCheck(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_SV4000E_CHANNEL3))->SetCheck(FALSE);
((CButton *)GetDlgItem(IDC_RADIO_SV4000E_CHANNEL4))->SetCheck(FALSE);
m_EditDenoise.Format(_T("%d"),m_DenoiseValue[m_Channel]);
EnableDenoise(m_Channel);
UpdateData(FALSE);
return TRUE; // return TRUE unless you set the focus to a control
}
//===================================================
@@ -158,6 +166,8 @@ void CVideocard_SV4000E::OnBnClickedRadioSV4000EChannel1()
{
#ifdef _RELEASE_FULL_VERSION
m_Channel=0;
m_EditDenoise.Format(_T("%d"),m_DenoiseValue[m_Channel]);
UpdateData(FALSE);
#endif //_RELEASE_FULL_VERSION
}
//===================================================
@@ -165,6 +175,8 @@ void CVideocard_SV4000E::OnBnClickedRadioSV4000EChannel2()
{
#ifdef _RELEASE_FULL_VERSION
m_Channel=1;
m_EditDenoise.Format(_T("%d"),m_DenoiseValue[m_Channel]);
UpdateData(FALSE);
#endif //_RELEASE_FULL_VERSION
}
//===================================================
@@ -172,6 +184,8 @@ void CVideocard_SV4000E::OnBnClickedRadioSV4000EChannel3()
{
#ifdef _RELEASE_FULL_VERSION
m_Channel=2;
m_EditDenoise.Format(_T("%d"),m_DenoiseValue[m_Channel]);
UpdateData(FALSE);
#endif //_RELEASE_FULL_VERSION
}
//===================================================
@@ -179,6 +193,8 @@ void CVideocard_SV4000E::OnBnClickedRadioSV4000EChannel4()
{
#ifdef _RELEASE_FULL_VERSION
m_Channel=3;
m_EditDenoise.Format(_T("%d"),m_DenoiseValue[m_Channel]);
UpdateData(FALSE);
#endif //_RELEASE_FULL_VERSION
}
@@ -186,6 +202,26 @@ void CVideocard_SV4000E::OnBnClickedRadioSv4000eChannelAll()
{
m_Channel=4;
}
//===================================================
void CVideocard_SV4000E::EnableDenoise(int _DeviceID)
{
#ifdef _RELEASE_FULL_VERSION
DXEnableDenoise(m_device[_DeviceID],m_DenoiseValue[_DeviceID]);
#endif //_RELEASE_FULL_VERSION
}
//===================================================
void CVideocard_SV4000E::OnEnKillfocusEditSv4000eDenoise()
{
if(m_Channel<4)
{
UpdateData(TRUE);
USES_CONVERSION;
const char* cTempValue=T2A(m_EditDenoise);
m_DenoiseValue[m_Channel] = static_cast<unsigned>(atoi(cTempValue));
EnableDenoise(m_Channel);
}
}
//=======================================
BOOL CVideocard_SV4000E::LoadVideocard()
@@ -284,6 +320,7 @@ BOOL CVideocard_SV4000E::UnloadVideocard()
{
m_status=DXStopRawVideoCallback(m_device[i]);
m_status=DXSetRawVideoCallback(m_device[i],NULL,NULL);
Sleep(100);
CloseDevice(m_device[i]);
}
DXUninitialize();
@@ -292,7 +329,8 @@ BOOL CVideocard_SV4000E::UnloadVideocard()
}
//================================================================
void CVideocard_SV4000E::ConvertVideoSubType(const Image_Buffer& _ImageBuffer, BYTE *_pSrcData,ConvertColorType _type,BOOL _bMirror)
void CVideocard_SV4000E::ConvertVideoSubType(const Image_Buffer& _ImageBuffer,
BYTE *_pSrcData,ConvertColorType _type,BOOL _bMirror)
{
int x=0;
int y=0;
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Videocard_SV4000E.h
+4 -2
View File
@@ -33,7 +33,7 @@ public:
protected:
unsigned int m_status;
device_handle m_device[4];
unsigned m_DenoiseValue[4];
int m_nDevNum;
DWORD m_dwCard;
Image_Buffer m_ImageBuffer;
@@ -42,6 +42,7 @@ protected:
BOOL m_bMirror;
BOOL m_bSaveFile;
CString m_SaveFile;
CString m_EditDenoise;
unsigned int m_Channel;
unsigned int bInitSdk;
public:
@@ -51,11 +52,12 @@ public:
void CloseDevice(device_handle _Device);
void ConvertVideoSubType(const Image_Buffer& _ImageBuffer, BYTE *pSrcData,ConvertColorType _type,BOOL _bMirror);
BOOL SaveBitmapToFile(const CBitmap& bitmap, CString lpFileName);
void EnableDenoise(int _DeviceID);
afx_msg void OnBnClickedRadioSV4000EChannel1();
afx_msg void OnBnClickedRadioSV4000EChannel2();
afx_msg void OnBnClickedRadioSV4000EChannel3();
afx_msg void OnBnClickedRadioSV4000EChannel4();
afx_msg void OnBnClickedRadioSv4000eChannelAll();
afx_msg void OnEnKillfocusEditSv4000eDenoise();
};
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h
+5 -2
View File
@@ -329,8 +329,10 @@
#define IDC_RADIO_SELECT_X 1262
#define IDC_RADIO_SELECT_Y 1263
#define IDC_RADIO_SELECT_Z 1264
#define IDC_BUTTON_RESET_WORKTABLE_RIGHT2 1265
#define IDC_BUTTON_SO7_GET_SEQ_NUMBER 1265
#define IDC_BUTTON_SO7_SET_SEQ_NUMBER 1266
#define IDC_BUTTON_SO7_SET_SEQ_NUMBER2 1267
#define IDC_BUTTON_SO7_SET_VER_NUMBER 1267
#define IDC_BUTTON_SET_OUT_PORT 1269
#define IDC_EDIT_SET_VER_NO 1271
#define IDC_EDIT_X_SCALE_COEFFICIENT 1272
@@ -926,6 +928,7 @@
#define IDC_BTN_KEYENCE_LKG5000_ETHERNET_STOP_SCAN2 1834
#define IDC_RADIO_SO7_MOVE_SPEED_GEAR4 1834
#define IDC_RADIO_SO7_MOVE_SPEED_GEAR5 1835
#define IDC_EDIT_SV4000E_DENOISE 1836
#define IDC_BUTTON_DIY_EXIT_BUTTON 32740
#define ID_EDIT_SO7_CONFIG_MOTION 32741
@@ -935,7 +938,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 191
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 1836
#define _APS_NEXT_CONTROL_VALUE 1837
#define _APS_NEXT_SYMED_VALUE 104
#endif
#endif
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo
BIN
View File
Binary file not shown.