diff --git a/src/tpMain/WheelCtrl.cpp b/src/tpMain/WheelCtrl.cpp
index 723541e..d354169 100644
--- a/src/tpMain/WheelCtrl.cpp
+++ b/src/tpMain/WheelCtrl.cpp
@@ -30,6 +30,7 @@ WheelCtrl::WheelCtrl(QString strPath, QMySplashScreen* pScreen)
QSaveResult *pSaveResult = new QSaveResult;
pSaveResult->moveToThread(saveResultThread);
pSaveResult->setAppRootPath(strPath);
+ pSaveResult->setDBPtr((DetectDataDB*)m_db, NULL);
connect(saveResultThread, &QThread::finished, pSaveResult, &QObject::deleteLater);
connect(this, SIGNAL(operate(Result2Ui*)), pSaveResult, SLOT(doWork(Result2Ui*)),Qt::QueuedConnection);
connect(pSaveResult, SIGNAL(resultReady(Result2Ui *)), this, SLOT(handleResult(Result2Ui *)));
diff --git a/tpvs17/lpReport/lpReport.ui b/tpvs17/lpReport/lpReport.ui
index 11471c7..9122dd9 100644
--- a/tpvs17/lpReport/lpReport.ui
+++ b/tpvs17/lpReport/lpReport.ui
@@ -302,7 +302,7 @@ background-color: rgb(170, 170, 127);
- 2
+ 0
diff --git a/tpvs17/lpReport/lpReport.vcxproj b/tpvs17/lpReport/lpReport.vcxproj
index fb53dee..db5ecf0 100644
--- a/tpvs17/lpReport/lpReport.vcxproj
+++ b/tpvs17/lpReport/lpReport.vcxproj
@@ -219,6 +219,9 @@
+
+
+
diff --git a/tpvs17/lpReport/lpReport.vcxproj.filters b/tpvs17/lpReport/lpReport.vcxproj.filters
index bac7b7f..8ff91c0 100644
--- a/tpvs17/lpReport/lpReport.vcxproj.filters
+++ b/tpvs17/lpReport/lpReport.vcxproj.filters
@@ -28,6 +28,11 @@
moc;h;cpp
False
+
+ {639EADAA-A684-42e4-A9AD-28FC9BCB8F7C}
+ ts
+ false
+
@@ -138,4 +143,9 @@
+
+
+ Translation Files
+
+
\ No newline at end of file
diff --git a/tpvs17/lpReport/lpReport.vcxproj.user b/tpvs17/lpReport/lpReport.vcxproj.user
deleted file mode 100644
index a18202b..0000000
--- a/tpvs17/lpReport/lpReport.vcxproj.user
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- C:\Qt\Qt5.9.4\5.9.4\msvc2017_64
- $(SolutionDir)..\runner17\$(ProjectName).exe
- $(SolutionDir)..\runner17\
- WindowsLocalDebugger
- PATH=$(QTDIR)\bin%3b$(PATH)
-
-
- C:\Qt\Qt5.9.4\5.9.4\msvc2017_64
- PATH=$(QTDIR)\bin%3b$(PATH)
-
-
\ No newline at end of file
diff --git a/tpvs17/lpReport/lpreport_en.ts b/tpvs17/lpReport/lpreport_en.ts
new file mode 100644
index 0000000..54eb548
--- /dev/null
+++ b/tpvs17/lpReport/lpreport_en.ts
@@ -0,0 +1,897 @@
+
+
+
+
+ QReportWidget
+
+
+
+ 型号
+ Model
+
+
+
+
+ 数量
+ Num
+
+
+
+ 编号
+ Index
+
+
+
+ 请选择对应时间并查询数据！
+ Please select the corresponding time and query data!
+
+
+
+ QTimeDlg
+
+
+ 时间设置
+ Time Setting
+
+
+
+
+ 0
+
+
+
+
+
+ 1
+
+
+
+
+
+ 2
+
+
+
+
+
+ 3
+
+
+
+
+
+ 4
+
+
+
+
+
+ 5
+
+
+
+
+
+ 6
+
+
+
+
+
+ 7
+
+
+
+
+
+ 8
+
+
+
+
+
+ 9
+
+
+
+
+
+ 10
+
+
+
+
+
+ 11
+
+
+
+
+
+ 12
+
+
+
+
+
+ 13
+
+
+
+
+
+ 14
+
+
+
+
+
+ 15
+
+
+
+
+
+ 16
+
+
+
+
+
+ 17
+
+
+
+
+
+ 18
+
+
+
+
+
+ 19
+
+
+
+
+
+ 20
+
+
+
+
+
+ 21
+
+
+
+
+
+ 22
+
+
+
+
+
+ 23
+
+
+
+
+ 24
+
+
+
+
+ 25
+
+
+
+
+ 26
+
+
+
+
+ 27
+
+
+
+
+ 28
+
+
+
+
+ 29
+
+
+
+
+ 30
+
+
+
+
+ 31
+
+
+
+
+ 32
+
+
+
+
+ 33
+
+
+
+
+ 34
+
+
+
+
+ 35
+
+
+
+
+ 36
+
+
+
+
+ 37
+
+
+
+
+ 38
+
+
+
+
+ 39
+
+
+
+
+ 40
+
+
+
+
+ 41
+
+
+
+
+ 42
+
+
+
+
+ 43
+
+
+
+
+ 44
+
+
+
+
+ 45
+
+
+
+
+ 46
+
+
+
+
+ 47
+
+
+
+
+ 48
+
+
+
+
+ 49
+
+
+
+
+ 50
+
+
+
+
+ 51
+
+
+
+
+ 52
+
+
+
+
+ 53
+
+
+
+
+ 54
+
+
+
+
+ 55
+
+
+
+
+ 56
+
+
+
+
+ 57
+
+
+
+
+ 58
+
+
+
+
+ 59
+
+
+
+
+ 小时
+ Hour
+
+
+
+ 分钟
+ M
+
+
+
+ 2017/00/00 00:00
+
+
+
+
+ 确定
+ OK
+
+
+
+ TestWidget
+
+
+ TestWidget
+
+
+
+
+ lpReport
+
+
+ 数据记录查看
+ Data record viewing
+
+
+
+
+
+
+
+
+
+ 共显示%1条记录
+ A total of %1 records are displayed
+
+
+
+
+
+
+
+
+
+
+
+
+ 第%1页 共%2页
+ Page %1 total pages %2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提示
+ Info
+
+
+
+
+ 您选择的班次时间是隔夜的，请您重新选择一下当前查询的日期，再查询
+ The time you selected is overnight,please reselect the query date, and then query.
+
+
+
+
+
+ 您选择的日期不合理，请您重新选择一下当前查询的日期，再查询
+ The date you selected is not reasonable, please select the current query date again
+
+
+
+ 查询了%1-%2的生产数据
+ Query production data for %1-%2
+
+
+
+
+ 起始时间:%1 到 结束时间:%2 的历史记录
+ Start time :%1 To end time :%2 History
+
+
+
+
+
+ 全部
+ All
+
+
+
+
+
+ 正在查询数据，请稍后
+ Querying data, please wait
+
+
+
+
+
+
+ 没有数据，请重新查询
+ No data, please query again
+
+
+
+
+
+ 请选择保存文件的路径
+ Select a path to save the file
+
+
+
+
+ 正在导出数据，请稍等
+ Please wait while exporting data
+
+
+
+ 导出了%1-%2的生产数据
+ The production data for %1-%2 is exported
+
+
+
+
+
+ 数据导出完成
+ Data export completed
+
+
+
+ 查询了%1-%2的日志数据
+ Query log data for %1-%2
+
+
+
+
+
+ 使用记录查询
+ Usage Record
+
+
+
+
+
+ 报警记录查询
+ Alarm record query
+
+
+
+
+
+ 运行状态查询
+ Running Status
+
+
+
+ 导出了%1-%2的日志数据
+ Export log data for %1-%2
+
+
+
+ 您选择的日期不合理，请您重新起始日期，再查询
+ The date you selected is not reasonable, please restart the date and check again
+
+
+
+ 查询了%1-%2的统计数据
+ Query statistics for %1-%2
+
+
+
+ 导出了%1-%2的统计数据
+ The statistics for %1-%2 are exported
+
+
+
+ 确认
+ OK
+
+
+
+ 取消
+ Cancel
+
+
+
+ 从%1到%2统计的数据如下
+ The statistics from %1 to %2 are as follows
+
+
+
+ 序号
+ Index
+
+
+
+ 型号
+ Model
+
+
+
+ 数量
+ Num
+
+
+
+
+ 总数
+ Sum
+
+
+
+ 时间:
+ Time:
+
+
+
+ 用户:
+ User:
+
+
+
+ 查询进度
+ Query the progress
+
+
+
+ 数据查询中,请稍后.....
+ Data query, please wait.....
+
+
+
+ 系统自动进行清理完成
+ The system automatically clears the data
+
+
+
+ 正在查询数据
+ Querying data
+
+
+
+ 起始时间:%1 到 结束时间:%2 的历史记录 共%3条
+ Start time :%1 To end time :%2 There are %3 historical records
+
+
+
+ 数据查询完成
+ Data query completed
+
+
+
+ 操作已生效
+ Operation has taken effect
+
+
+
+ 统计结果
+ The statistical results
+
+
+
+ 统计完成
+ Statistics to complete
+
+
+
+ 日期时间
+ Datetime
+
+
+
+ 匹配型号
+ Model
+
+
+
+ 相似度
+ Score
+
+
+
+ 消耗时间s
+ time
+
+
+
+ 直径mm
+ diameter
+
+
+
+ 厚度mm
+ thickness
+
+
+
+ 缩略图
+ Image
+
+
+
+ uid
+
+
+
+
+ 正在查询记录，请稍等
+ Please wait while records are being queried
+
+
+
+ 从%1 到 %2 的记录 共%3条
+ There are %3 records from %1 to %2
+
+
+
+ 时间
+ Time
+
+
+
+ 信息
+ Info
+
+
+
+
+
+
+ 全天
+ Hold Day
+
+
+
+ 生产数据查询
+ Production Data
+
+
+
+ NG
+
+
+
+
+ lpReportClass
+
+
+ lpReport
+
+
+
+
+
+ 生产数据查询
+ Production data
+
+
+
+ 生产数据统计
+ Statistics
+
+
+
+ 日志记录
+ Log Record
+
+
+
+
+ 显示数据数(条)
+ Show Num
+
+
+
+
+ 50
+
+
+
+
+
+ 上一页
+ Preview
+
+
+
+
+
+
+ TextLabel
+
+
+
+
+
+ 下一页
+ Next
+
+
+
+ 标题
+ Title
+
+
+
+ 双击单条记录显示图片
+ Double show Image
+
+
+
+
+ 开始日期时间：
+ Start Time:
+
+
+
+
+
+
+
+
+ 2017-11-11 11:11:11
+
+
+
+
+
+ 设置开始时间
+ SetTime
+
+
+
+
+
+ 结束日期时间：
+ End Time:
+
+
+
+
+
+ 设置结束时间
+ SetTime
+
+
+
+ 筛选型号
+ Type
+
+
+
+
+ 所有
+ All
+
+
+
+
+ 生产班次
+ classes
+
+
+
+ 全天
+ Hold Day
+
+
+
+ 查询数量
+ Num
+
+
+
+ 0
+
+
+
+
+
+
+ 查询
+ Query
+
+
+
+
+
+ 导出CSV
+ Export CSV
+
+
+
+ 数据类型查询
+ Data type query
+
+
+
+ 起始日期时间：
+ Start Time:
+
+
+
+ 设置起始时间
+ SetTime
+
+
+
+ 报警记录查询
+ Alarm record
+
+
+
diff --git a/tpvs17/tpMain/lpSystemConfigUI.cpp b/tpvs17/tpMain/lpSystemConfigUI.cpp
index 4267605..a1a82e0 100644
--- a/tpvs17/tpMain/lpSystemConfigUI.cpp
+++ b/tpvs17/tpMain/lpSystemConfigUI.cpp
@@ -95,4 +95,11 @@ void lpSystemConfigUI::timerEvent(QTimerEvent *event)
}
}
+void lpSystemConfigUI::changeEvent(QEvent *event)
+{
+ if (event->type() == QEvent::LanguageChange)
+ {
+ ui.retranslateUi(this);
+ }
+}
diff --git a/tpvs17/tpMain/lpSystemConfigUI.h b/tpvs17/tpMain/lpSystemConfigUI.h
index 6311f59..d7a6f39 100644
--- a/tpvs17/tpMain/lpSystemConfigUI.h
+++ b/tpvs17/tpMain/lpSystemConfigUI.h
@@ -18,6 +18,7 @@ protected:
Q_SLOT void onButtonClicked();
virtual void showEvent(QShowEvent *event);
virtual void timerEvent(QTimerEvent *event);
+ virtual void changeEvent(QEvent *event);
private:
Ui::lpSystemConfigUI ui;
int m_timerID{ 0 };