TXD-LaserCut
/
TwoLaserHead-PushJig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

将gCommonFlowMgr->m_JigPrtOffset,直接绑定到界面控件

Browse Source
同兴达改信利
bestlqiang 3 years ago
parent 4d6a23ebbb
commit c28047df12
3 changed files with 25 additions and 50 deletions
Show Stats Download Patch File Download Diff File

25
LaiPuLaser/CommonFlowMgr.cpp
Unescape Escape View File

@ -727,8 +727,6 @@ void CCommonFlowMgr::WriteWorkFileExt(vector<CLab> &LabVec)
LabVec.push_back(CLab(LAB_SPECIAL_ONE_OBJ_CUT_TIMES, m_SpecialOneObjMarkCnt));
LabVec.push_back(CLab(LAB_ONE_AREA_CUT_TIMES, m_AreaCycleCnt));
LabVec.push_back(CLab(LAB_ONE_CUT_SPEED, m_CutSpeed));
LabVec.push_back(CLab(LAB_ADJUST_OFFSET_X, m_Jig1PrtOffset.x));
LabVec.push_back(CLab(LAB_ADJUST_OFFSET_Y, m_Jig1PrtOffset.y));
}
void CCommonFlowMgr::ReadWorkFile(CLabVecRang &LabVecRang)
{
@ -761,20 +759,6 @@ void CCommonFlowMgr::ReadWorkFile(CLabVecRang &LabVecRang)
m_CutSpeed = Lab.m_Int;
}
}
{
CLab Lab = WorkFileMgr.FindLab(LabVecRang, LAB_ADJUST_OFFSET_X);
if (Lab.m_ValType != _TYPE_NULL)
{
m_Jig1PrtOffset.x = Lab.m_Double;
}
}
{
CLab Lab = WorkFileMgr.FindLab(LabVecRang, LAB_ADJUST_OFFSET_Y);
if (Lab.m_ValType != _TYPE_NULL)
{
m_Jig1PrtOffset.y = Lab.m_Double;
}
}
}
#endif
@ -1779,14 +1763,17 @@ void CCommonFlowMgr::MoveSelObjToCamera(CProduct &Product)
#endif
void CCommonFlowMgr::SetAdjustOffsetAll(Dbxy Offset)
{
auto Jigoft = m_Jig1PrtOffset;
auto Jigoft = gCommonFlowMgr->m_Jig1PrtOffset;
if (gCurLockTrackType == _ETrackType_Track_2)
Jigoft = m_Jig3PrtOffset;
{
Jigoft = gCommonFlowMgr->m_Jig3PrtOffset;
}
m_AdjustOffsetAll = Offset + Jigoft;
}
void CCommonFlowMgr::ResetProductOffset()
{
m_Jig1PrtOffset.x = m_Jig1PrtOffset.y = 0;
}

40
LaiPuLaser/DlgSW_XL_Flow.cpp
Unescape Escape View File

@ -79,8 +79,8 @@ bool bTrack2ProductFlg = false;//
bool bSaveLockFlg = false;
CDlgSW_XL_Flow::CDlgSW_XL_Flow(CWnd* pParent /*=NULL*/)
: m_Jig3PrtOft_x(0)
, m_Jig3PrtOft_y(0)
//: m_Jig3PrtOft_x(0)
//, m_Jig3PrtOft_y(0)
{
m_LaserSpeed =800;
m_OneObjMarkCnt = 1;//切割次数
@ -131,11 +131,11 @@ void CDlgSW_XL_Flow::DoDataExchange(CDataExchange* pDX)
DDX_Text(pDX, IDC_CUT_CNT, m_OneObjMarkCnt);
DDX_Text(pDX, IDC_SPECIAL_CUT_CNT, m_SpecialOneObjMarkCnt);
DDX_Text(pDX, IDC_AREA_CUT_CNT, m_MarkAreaCutCount);
DDX_Text(pDX, IDC_CUT_OFFSET_X, m_Jig1PrtOft_x);
DDX_Text(pDX, IDC_CUT_OFFSET_Y, m_Jig1PrtOft_y);
DDX_Text(pDX, IDC_CUT_OFFSET_X, gCommonFlowMgr->m_Jig1PrtOffset.x);
DDX_Text(pDX, IDC_CUT_OFFSET_Y, gCommonFlowMgr->m_Jig1PrtOffset.y);
DDX_Control(pDX, IDC_BOOL_SEL_MARK2, m_SetMarkPosBtn);
DDX_Text(pDX, IDC_CUT_OFFSET_X2, m_Jig3PrtOft_x);
DDX_Text(pDX, IDC_CUT_OFFSET_Y2, m_Jig3PrtOft_y);
DDX_Text(pDX, IDC_CUT_OFFSET_X2, gCommonFlowMgr->m_Jig3PrtOffset.x);
DDX_Text(pDX, IDC_CUT_OFFSET_Y2, gCommonFlowMgr->m_Jig3PrtOffset.y);
}
BOOL CDlgSW_XL_Flow::OnInitDialog()
@ -520,20 +520,14 @@ void CDlgSW_XL_Flow::UpdateCutPar()
m_SpecialOneObjMarkCnt = gCommonFlowMgr->m_SpecialOneObjMarkCnt;//切割次数
m_MarkAreaCutCount = gCommonFlowMgr->GetAreaCycleCnt();//循环次数
m_Jig1PrtOft_x = gCommonFlowMgr->m_Jig1PrtOffset.x;//针对产品的切割偏移
m_Jig1PrtOft_y = gCommonFlowMgr->m_Jig1PrtOffset.y;//针对产品的切割偏移
{
CString path;
gProgram_SZ_XL->GetDxfParFilePath("pjo", path);
CSmartArchive ar(path, false);
ar + m_Jig1PrtOft_x;
ar + m_Jig1PrtOft_y;
ar + m_Jig3PrtOft_x;
ar + m_Jig3PrtOft_y;
gCommonFlowMgr->m_Jig1PrtOffset.x = m_Jig1PrtOft_x;
gCommonFlowMgr->m_Jig1PrtOffset.y = m_Jig1PrtOft_y;
gCommonFlowMgr->m_Jig3PrtOffset.x= m_Jig3PrtOft_x;
gCommonFlowMgr->m_Jig3PrtOffset.y = m_Jig3PrtOft_y;
ar + gCommonFlowMgr->m_Jig1PrtOffset.x;
ar + gCommonFlowMgr->m_Jig1PrtOffset.y;
ar + gCommonFlowMgr->m_Jig3PrtOffset.x;
ar + gCommonFlowMgr->m_Jig3PrtOffset.y;
}
UpdateData(FALSE);
@ -552,20 +546,14 @@ void CDlgSW_XL_Flow::OnBnClickedSavePar()
gCommonFlowMgr->m_SpecialOneObjMarkCnt = m_SpecialOneObjMarkCnt;//切割次数
gCommonFlowMgr->m_AreaCycleCnt = (m_MarkAreaCutCount);//区域循环次数
gCommonFlowMgr->m_Jig1PrtOffset.x = m_Jig1PrtOft_x;//针对产品的切割偏移
gCommonFlowMgr->m_Jig1PrtOffset.y = m_Jig1PrtOft_y;//针对产品的切割偏移
gCommonFlowMgr->m_Jig3PrtOffset.x = m_Jig3PrtOft_x;//针对产品的切割偏移
gCommonFlowMgr->m_Jig3PrtOffset.y = m_Jig3PrtOft_y;//针对产品的切割偏移
{
CString path;
gProgram_SZ_XL->GetDxfParFilePath("pjo", path);
CSmartArchive ar(path, true);
ar + m_Jig1PrtOft_x;
ar + m_Jig1PrtOft_y;
ar + m_Jig3PrtOft_x;
ar + m_Jig3PrtOft_y;
ar + gCommonFlowMgr->m_Jig1PrtOffset.x;
ar + gCommonFlowMgr->m_Jig1PrtOffset.y;
ar + gCommonFlowMgr->m_Jig3PrtOffset.x;
ar + gCommonFlowMgr->m_Jig3PrtOffset.y;
}

8
LaiPuLaser/DlgSW_XL_Flow.h
Unescape Escape View File

@ -65,12 +65,12 @@ private:
int m_OneObjMarkCnt;//切割次数
int m_SpecialOneObjMarkCnt;//特殊切割次数
//Dbxy m_ProductOffset;//针对产品的切割偏移
double m_Jig1PrtOft_x=0;//针对产品的切割偏移
double m_Jig1PrtOft_y=0;//针对产品的切割偏移
//double m_Jig1PrtOft_x=0;//撈야1끓틔튤盧x
//double m_Jig1PrtOft_y=0;//撈야1끓틔튤盧y
// 治具3产品偏移x
double m_Jig3PrtOft_x;
//double m_Jig3PrtOft_x;
// 治具3产品偏移y
double m_Jig3PrtOft_y;
//double m_Jig3PrtOft_y;
vector<CString> KnownFileNameVec;//已知的文件名集合
public:
afx_msg void OnBnClickedStartBtn1();

Write Preview
Loading…
Cancel
Save