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

增加CNC的文件保存和打开。

Browse Source
This commit is contained in:
TAO Cheng
2013-08-08 09:33:19 +08:00
parent 5a8e27e70d
commit a7ccbac4d6
11 changed files with 303 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log
+61
View File
@@ -2037,3 +2037,64 @@ Exit: Exit_SO7Usb
Destruct Cso7_Proto.
Construct Cso7_Proto.
Destruct Cso7_Proto.
Construct Cso7_Proto.
Destruct Cso7_Proto.
Construct Cso7_Proto.
Destruct Cso7_Proto.
Construct Cso7_Proto.
Destruct Cso7_Proto.
Construct Cso7_Proto.
Destruct Cso7_Proto.
Construct Cso7_Proto.
Construct Cso7_Proto.
Destruct Cso7_Proto.
Construct Cso7_Proto.
Destruct Cso7_Proto.
Construct Cso7_Proto.
Destruct Cso7_Proto.
Construct Cso7_Proto.
Destruct Cso7_Proto.
Construct Cso7_Proto.
Destruct Cso7_Proto.
Construct Cso7_Proto.
Destruct Cso7_Proto.
Construct Cso7_Proto.
Destruct Cso7_Proto.
Construct Cso7_Proto.
Destruct Cso7_Proto.
Construct Cso7_Proto.
Destruct Cso7_Proto.
Construct Cso7_Proto.
Destruct Cso7_Proto.
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/Utility_Config.ini
+24 -24
View File
@@ -3,31 +3,31 @@ SPEED_BASE_X1=5
SPEED_MAX_X1=168
SPEED_START_X1=28
SPEED_FRESH_X1=10
SPEED_SLOW_X1=0.510
SPEED_SLOW_X1=0.509
;
SPEED_BASE_X2=3
SPEED_MAX_X2=50
SPEED_START_X2=10
SPEED_FRESH_X2=10
SPEED_SLOW_X2=0.110
SPEED_SLOW_X2=0.109
;
SPEED_BASE_X3=2
SPEED_MAX_X3=5
SPEED_START_X3=5
SPEED_FRESH_X3=10
SPEED_FRESH_X3=100
SPEED_SLOW_X3=0.001
;
SPEED_BASE_X4=2
SPEED_MAX_X4=0
SPEED_START_X4=50
SPEED_FRESH_X4=10
SPEED_FRESH_X4=100
SPEED_SLOW_X4=0.001
;
SPEED_BASE_X5=5
SPEED_BASE_X5=2
SPEED_MAX_X5=0
SPEED_START_X5=80
SPEED_FRESH_X5=10
SPEED_SLOW_X5=0.001
SPEED_FRESH_X5=100
SPEED_SLOW_X5=0.000
;
SPEED_BASE_Y1=5
SPEED_MAX_Y1=168
@@ -43,59 +43,59 @@ SPEED_SLOW_Y2=0.200
;
SPEED_BASE_Y3=2
SPEED_MAX_Y3=5
SPEED_START_Y3=3
SPEED_FRESH_Y3=10
SPEED_START_Y3=5
SPEED_FRESH_Y3=100
SPEED_SLOW_Y3=0.001
;
SPEED_BASE_Y4=2
SPEED_MAX_Y4=0
SPEED_START_Y4=50
SPEED_FRESH_Y4=10
SPEED_FRESH_Y4=100
SPEED_SLOW_Y4=0.001
;
SPEED_BASE_Y5=5
SPEED_BASE_Y5=2
SPEED_MAX_Y5=0
SPEED_START_Y5=80
SPEED_FRESH_Y5=10
SPEED_SLOW_Y5=0.001
SPEED_FRESH_Y5=100
SPEED_SLOW_Y5=0.000
;
SPEED_BASE_Z1=5
SPEED_MAX_Z1=130
SPEED_START_Z1=28
SPEED_FRESH_Z1=10
SPEED_SLOW_Z1=0.510
SPEED_SLOW_Z1=0.509
;
SPEED_BASE_Z2=3
SPEED_MAX_Z2=60
SPEED_START_Z2=10
SPEED_FRESH_Z2=10
SPEED_SLOW_Z2=0.110
SPEED_SLOW_Z2=0.109
;
SPEED_BASE_Z3=2
SPEED_MAX_Z3=5
SPEED_START_Z3=5
SPEED_FRESH_Z3=10
SPEED_FRESH_Z3=100
SPEED_SLOW_Z3=0.001
;
SPEED_BASE_Z4=2
SPEED_MAX_Z4=0
SPEED_START_Z4=50
SPEED_FRESH_Z4=10
SPEED_FRESH_Z4=100
SPEED_SLOW_Z4=0.001
;
SPEED_BASE_Z5=5
SPEED_BASE_Z5=2
SPEED_MAX_Z5=0
SPEED_START_Z5=80
SPEED_FRESH_Z5=10
SPEED_SLOW_Z5=0.001
SPEED_FRESH_Z5=100
SPEED_SLOW_Z5=0.000
;
X_MOTOR_PRECISION=0.010
Y_MOTOR_PRECISION=0.010
X_MOTOR_PRECISION=0.009
Y_MOTOR_PRECISION=0.009
Z_MOTOR_PRECISION=0.100
;
X_MOTOR_WHEELBASE=19.990
Y_MOTOR_WHEELBASE=20.000
Z_MOTOR_WHEELBASE=3.000
Y_MOTOR_WHEELBASE=31.556
Z_MOTOR_WHEELBASE=2.999
;
MOTOR_PULSE_NUM=10000
;
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc
+13 -9
View File
@@ -746,7 +746,7 @@ END
IDD_SO7_UTIL_PROGRAM DIALOGEX 0, 0, 590, 386
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Dialog"
CAPTION "CNC Program"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
PUSHBUTTON "Exit",IDCANCEL,533,365,50,14
@@ -1091,7 +1091,7 @@ BEGIN
0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49,
0x6761, 0x5465, 0x7079, 0x3e65, 0x3031, 0x2f3c, 0x464d, 0x4243, 0x7475,
0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x5465, 0x7079, 0x3e65, 0x4d3c, 0x4346,
0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567, 0x4449, 0x313e, 0x3438,
0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567, 0x4449, 0x313e, 0x3434,
0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x4965,
0x3e44, 0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567,
0x493e, 0x4244, 0x425f, 0x5449, 0x414d, 0x5f50, 0x5f58, 0x454c, 0x5446,
@@ -1118,7 +1118,7 @@ BEGIN
0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49,
0x6761, 0x5465, 0x7079, 0x3e65, 0x3031, 0x2f3c, 0x464d, 0x4243, 0x7475,
0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x5465, 0x7079, 0x3e65, 0x4d3c, 0x4346,
0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567, 0x4449, 0x313e, 0x3738,
0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567, 0x4449, 0x313e, 0x3534,
0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x4965,
0x3e44, 0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567,
0x493e, 0x4244, 0x425f, 0x5449, 0x414d, 0x5f50, 0x5f58, 0x4952, 0x4847,
@@ -1145,7 +1145,7 @@ BEGIN
0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49,
0x6761, 0x5465, 0x7079, 0x3e65, 0x3031, 0x2f3c, 0x464d, 0x4243, 0x7475,
0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x5465, 0x7079, 0x3e65, 0x4d3c, 0x4346,
0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567, 0x4449, 0x313e, 0x3138,
0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567, 0x4449, 0x313e, 0x3134,
0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x4965,
0x3e44, 0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567,
0x493e, 0x4244, 0x425f, 0x5449, 0x414d, 0x5f50, 0x5f59, 0x5246, 0x4e4f,
@@ -1173,7 +1173,7 @@ BEGIN
0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49,
0x6761, 0x5465, 0x7079, 0x3e65, 0x3031, 0x2f3c, 0x464d, 0x4243, 0x7475,
0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x5465, 0x7079, 0x3e65, 0x4d3c, 0x4346,
0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567, 0x4449, 0x313e, 0x3038,
0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567, 0x4449, 0x313e, 0x3034,
0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x4965,
0x3e44, 0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567,
0x493e, 0x4244, 0x425f, 0x5449, 0x414d, 0x5f50, 0x5f59, 0x4142, 0x4b43,
@@ -1201,7 +1201,7 @@ BEGIN
0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49,
0x6761, 0x5465, 0x7079, 0x3e65, 0x3031, 0x2f3c, 0x464d, 0x4243, 0x7475,
0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x5465, 0x7079, 0x3e65, 0x4d3c, 0x4346,
0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567, 0x4449, 0x313e, 0x3338,
0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567, 0x4449, 0x313e, 0x3334,
0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x4965,
0x3e44, 0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567,
0x493e, 0x4244, 0x425f, 0x5449, 0x414d, 0x5f50, 0x5f5a, 0x5055, 0x2f3c,
@@ -1228,7 +1228,7 @@ BEGIN
0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49,
0x6761, 0x5465, 0x7079, 0x3e65, 0x3031, 0x2f3c, 0x464d, 0x4243, 0x7475,
0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x5465, 0x7079, 0x3e65, 0x4d3c, 0x4346,
0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567, 0x4449, 0x313e, 0x3238,
0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567, 0x4449, 0x313e, 0x3234,
0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x4965,
0x3e44, 0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567,
0x493e, 0x4244, 0x425f, 0x5449, 0x414d, 0x5f50, 0x5f5a, 0x4f44, 0x4e57,
@@ -1277,7 +1277,7 @@ BEGIN
0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49,
0x6761, 0x5465, 0x7079, 0x3e65, 0x3031, 0x2f3c, 0x464d, 0x4243, 0x7475,
0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x5465, 0x7079, 0x3e65, 0x4d3c, 0x4346,
0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567, 0x4449, 0x313e, 0x3737,
0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567, 0x4449, 0x313e, 0x3933,
0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x4965,
0x3e44, 0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567,
0x493e, 0x4244, 0x425f, 0x5449, 0x414d, 0x5f50, 0x4c50, 0x5355, 0x535f,
@@ -1305,7 +1305,7 @@ BEGIN
0x7954, 0x6570, 0x3c3e, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49,
0x6761, 0x5465, 0x7079, 0x3e65, 0x3031, 0x2f3c, 0x464d, 0x4243, 0x7475,
0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x5465, 0x7079, 0x3e65, 0x4d3c, 0x4346,
0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567, 0x4449, 0x313e, 0x3637,
0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567, 0x4449, 0x313e, 0x3833,
0x2f3c, 0x464d, 0x4243, 0x7475, 0x6f74, 0x5f6e, 0x6d49, 0x6761, 0x4965,
0x3e44, 0x4d3c, 0x4346, 0x7542, 0x7474, 0x6e6f, 0x495f, 0x616d, 0x6567,
0x493e, 0x4244, 0x425f, 0x5449, 0x414d, 0x5f50, 0x494d, 0x554e, 0x5f53,
@@ -2314,6 +2314,10 @@ END
STRINGTABLE
BEGIN
IDS_ABOUTBOX "&About Mv_Util..."
END
STRINGTABLE
BEGIN
IDS_SO7_ABOUTBOX "&About Utility for SO7..."
END
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_Program.cpp
+42 -2
View File
@@ -366,16 +366,56 @@ void CSo7_Util_Program::OnBnClickedButtonSo7ProgramAddCncProgram()
void CSo7_Util_Program::OnBnClickedButtonSo7ProgramNewCnc()
{
m_pSo7_CNC_Program->RemoveAll();
OutputWithScroll(_T("Remove all cnc program."),m_edMSG);
}
//===================================================
void CSo7_Util_Program::OnBnClickedButtonSo7ProgramOpenCnc()
{
AfxMessageBox(_T("Not supported!"));
CString m_csFile = _T("CNCFILE");
CString szFilter=_T("Utility CNC Files(*.Prog)|*.Prog|ALL Files(*.*)|*.*||");
CFileDialog fileDialog(TRUE, _T("*.Prog"),(LPCTSTR) m_csFile, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, szFilter, this);
if ( fileDialog.DoModal ()==IDOK )
{
m_pSo7_CNC_Program->RemoveAll();
OutputWithScroll(_T("Remove all cnc program."),m_edMSG);
m_pSo7_CNC_Program->m_CncProgFileName = fileDialog.GetPathName();
m_pSo7_CNC_Program->open();
for (int i=0;i<m_pSo7_CNC_Program->m_Program_Number;i++)
{
int iType=m_pSo7_CNC_Program->m_CNC_element[i]->get_type();
CPoint3 m_pnt;
m_pSo7_CNC_Program->m_CNC_element[i]->GetPoint(0,0,0,NULL,m_pnt);
CString csType=m_pSo7_CNC_Program->GetEntityName(iType);
m_OutMessage.Format(_T("[No.%d] X:%3.4f,Y:%3.4f,Z:%3.4f"),
m_pSo7_CNC_Program->m_CNC_element[i]->m_ID,
m_pnt.x, m_pnt.y, m_pnt.z
);
m_OutMessage=_T("Add ")+csType+m_OutMessage;
OutputWithScroll(m_OutMessage,m_edMSG);
}
}
delete fileDialog;
}
//===================================================
void CSo7_Util_Program::OnBnClickedButtonSo7ProgramSaveCncFile()
{
AfxMessageBox(_T("Not supported!"));
CString PathName;
PathName=_T("CNCFILE");
CString szFilter=_T("Utility CNC Files(*.Prog)|*.Prog|ALL Files(*.*)|*.*||");
CFileDialog fdlg(FALSE,_T("Prog"),PathName,OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,szFilter);
if( fdlg.DoModal()==IDOK)
{
m_pSo7_CNC_Program->m_CncProgFileName=fdlg.GetPathName();
m_pSo7_CNC_Program->Save();
m_OutMessage=_T("CNC Program has been saved to[")+m_pSo7_CNC_Program->m_CncProgFileName+_T("].");
OutputWithScroll(m_OutMessage,m_edMSG);
}
delete fdlg;
}
//===================================================
void CSo7_Util_Program::OnEnKillfocusEditSo7ProgeamCncRuingTimes()
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo
BIN
View File
Binary file not shown.