huahaiyan/PunchHMI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、修改参数分类显示；

Browse Source 
2、合并任晴的代码
This commit is contained in:
华海艳 2024-03-01 14:00:47 +08:00
parent b9438b59c4
commit 97a0fd7afc
7 changed files with 2248 additions and 2292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
chinese.qm
View File

Binary file not shown.

2245
chinese.ts
View File

File diff suppressed because it is too large Load Diff

18
datafile/datafiledsr.cpp
View File

@ -233,6 +233,7 @@ void DataFileDsr::convertDataToEmbAbs()
} }
//画笔与冲孔之间的转换线需要转换为偏移 //画笔与冲孔之间的转换线需要转换为偏移
int insertFlag = 0;
if(ctrl == DSR_PUNCH) if(ctrl == DSR_PUNCH)
{ {
if(dsrDataPtr != dsrDataBeg) if(dsrDataPtr != dsrDataBeg)
@ -242,6 +243,7 @@ void DataFileDsr::convertDataToEmbAbs()
{ {
ctrl = DSR_OFFSET; ctrl = DSR_OFFSET;
runflag = 1; runflag = 1;
insertFlag = 1;
} }
dsrDataPtr++; dsrDataPtr++;
} }
@ -328,6 +330,21 @@ void DataFileDsr::convertDataToEmbAbs()
absData.append((char*)(&absItem), sizeof(DsAbsItem)); absData.append((char*)(&absItem), sizeof(DsAbsItem));
//插入空针
if(insertFlag == 1)
{
absItem.ctrl = dsrDataPtr->ctrl;
absItem.attr = 0;
absItem.action = 0;
absItem.ax = ax * xfactor;
absItem.ay = ay * yfactor;
absItem.ar = ar * rfactor;
absData.append((char*)(&absItem), sizeof(DsAbsItem));
stepidx++;
}
#if(0)
//插入空针，原地冲个孔 //插入空针，原地冲个孔
if(ctrl == DSR_OFFSET) if(ctrl == DSR_OFFSET)
{ {
@ -353,6 +370,7 @@ void DataFileDsr::convertDataToEmbAbs()
} }
} }
} }
#endif
stepidx++; stepidx++;
dsrDataPtr++; dsrDataPtr++;

10
datafile/embdata.cpp
View File

@ -2009,11 +2009,11 @@ int EmbData::createDs16FromAbs()
//大针步转换为跳针 //大针步转换为跳针
if(ctrlByte == DATA_PUNCH || ctrlByte == DATA_DRAWING)//功能码等于冲孔数据或画笔数据 if(ctrlByte == DATA_PUNCH || ctrlByte == DATA_DRAWING)//功能码等于冲孔数据或画笔数据
{ {
// if(m == stepNum - 1) // if(m == stepNum - 1)
// { // {
// ds16Item.ctrl = ctrlByte; // ds16Item.ctrl = ctrlByte;
// } // }
// else // else
{ {
ds16Item.ctrl = DATA_JUMP;//跳针 ds16Item.ctrl = DATA_JUMP;//跳针
} }

2259
english.ts
View File

File diff suppressed because it is too large Load Diff

4
machine/comm/protocol.h
View File

@ -1119,7 +1119,7 @@ typedef struct
#define OT_FOLLOW_EN 0x0002 // 随动允许 #define OT_FOLLOW_EN 0x0002 // 随动允许
#define OT_UCUT_THREAD 0x0003 // 压脚 //上剪刀剪线 #define OT_UCUT_THREAD 0x0003 // 压脚 //上剪刀剪线
#define OT_DCUT_THREAD 0x0004 // 下剪刀剪线 #define OT_DCUT_THREAD 0x0004 // 下剪刀剪线
#define OT_CLIP_UPLINE 0x0005 // 夹面线 #define OT_FRAME 0x0005 // 气框
#define OT_OIL 0x0006 // 加油 #define OT_OIL 0x0006 // 加油
#define OT_LIGHT 0x0007 // 照明灯 #define OT_LIGHT 0x0007 // 照明灯
#define OT_CUT_UP 0x0008 // 上剪线 #define OT_CUT_UP 0x0008 // 上剪线
@ -1147,7 +1147,7 @@ typedef struct
#define OT_HEAD_R_LOOSE_UTRD2 0x001D // 右机头松紧线2 #define OT_HEAD_R_LOOSE_UTRD2 0x001D // 右机头松紧线2
#define OT_CUTTER_LIFT 0x001E // 切刀机头 #define OT_CUTTER_LIFT 0x001E // 切刀机头
#define OT_PRESS_KNOT 0x001F // 压枣控制 #define OT_PRESS_KNOT 0x001F // 压枣控制
#define OT_FRAME 0x0020// 气框开合 //#define OT_FRAME 0x0020// 气框开合
#define OT_FRAME_TEN 0x0021 // 气框拉伸 #define OT_FRAME_TEN 0x0021 // 气框拉伸
#define OT_FRAME_PRE 0x0022 // 气框压紧 #define OT_FRAME_PRE 0x0022 // 气框压紧
#define OT_CLIP_EXTEND 0x0024 // 勾线动作 伸缩 #define OT_CLIP_EXTEND 0x0024 // 勾线动作 伸缩

4
mctype/patternsingleboard/mainUI/mainwidget.cpp
View File

@ -4440,7 +4440,7 @@ void MainWidget::onFiveSecondTimer()
} }
else else
{ {
g_pMachine->setTcpConnectState(1);//将连接状态置为1 //g_pMachine->setTcpConnectState(1);//将连接状态置为1
} }
m_conFlag = -1; m_conFlag = -1;
} }
@ -4568,7 +4568,7 @@ void MainWidget::on_buttonParaSet_clicked()
m_pParameterSetDlg->setMainTitle(tr("Parameter setting")); m_pParameterSetDlg->setMainTitle(tr("Parameter setting"));
m_pParameterSetDlg->setSubTitle(tr("Parameter setting > Parameter setting")); m_pParameterSetDlg->setSubTitle(tr("Parameter setting > Parameter setting"));
//机器参数和工作参数 //机器参数和工作参数
m_pParameterSetDlg->setItemList(operate,PARA_TYPE_MACH|PARA_TYPE_WORK,MC_SORT_SETTING|MC_SORT_POSITION|MC_SORT_SPEED|MC_SORT_DETECT|MC_SORT_ACTION); m_pParameterSetDlg->setItemList(operate,PARA_TYPE_MACH|PARA_TYPE_WORK,MC_SORT_SPEED|MC_SORT_ACTION|MC_SORT_DETECT|MC_SORT_POSITION|MC_SORT_SETTING|MC_SORT_WORK);
m_pParameterSetDlg->exec(); m_pParameterSetDlg->exec();
} }
} }