diff --git a/NameCreater/BirthdayCreater.cpp b/NameCreater/BirthdayCreater.cpp index 5b9323d..3444a90 100644 --- a/NameCreater/BirthdayCreater.cpp +++ b/NameCreater/BirthdayCreater.cpp @@ -159,7 +159,7 @@ void BirthdayCreater::generaImageFromCSV(Name_Type_e type, const QString& filena if ((idx % MAX_LABEL_IN_PAPER) == (MAX_LABEL_IN_PAPER - 1) || idx == nameList.count() - 1) { QString date_str = QDateTime::currentDateTime().toString("MMddhhmm"); - QString file_name = QString("Birthday_%2_%1.jpg").arg(QString::number(export_times + 1), date_str); + QString file_name = QString(u8"生日禮_%2_%1.jpg").arg(QString::number(export_times + 1), date_str); saveToImage(file_name, &scene); export_times++; diff --git a/NameCreater/FiveToSingle.cpp b/NameCreater/FiveToSingle.cpp index ad5e127..2774236 100644 --- a/NameCreater/FiveToSingle.cpp +++ b/NameCreater/FiveToSingle.cpp @@ -175,7 +175,7 @@ void FiveToSingle::generaImageFromCSV(Name_Type_e type, const QString& filename, bool is_export_page = ((idx + 1) % BG_POS_COUNT == 0); if (is_export_page || n == nameList.count() - 1) { QString date_str = QDateTime::currentDateTime().toString("MMddhhmm"); - QString file_name = QString("signle_%2_%1.jpg").arg(QString::number(export_times + 1), date_str); + QString file_name = QString(u8"單入_%2_%1.jpg").arg(QString::number(export_times + 1), date_str); saveToImage(file_name, &scene); export_times++; diff --git a/NameCreater/HKHolderCreater.cpp b/NameCreater/HKHolderCreater.cpp index a5dcf06..5ef814c 100644 --- a/NameCreater/HKHolderCreater.cpp +++ b/NameCreater/HKHolderCreater.cpp @@ -117,9 +117,10 @@ void HKHolderCreater::generaImageFromCSV(Name_Type_e type, const QString& filena } - int row_idx, col_idx; - row_idx = idx / MAX_COL_IN_ROW; - col_idx = idx % MAX_COL_IN_ROW; + int re_idx, row_idx, col_idx; + re_idx = idx % MAX_LABEL_IN_PAPER; + row_idx = re_idx / MAX_COL_IN_ROW; + col_idx = re_idx % MAX_COL_IN_ROW; NameInfo_t name_info = nameList.at(idx); QString label_rel_path = label_bg_map[name_info.name2]; @@ -157,7 +158,7 @@ void HKHolderCreater::generaImageFromCSV(Name_Type_e type, const QString& filena if ((idx % MAX_LABEL_IN_PAPER) == (MAX_LABEL_IN_PAPER - 1) || idx == nameList.count() - 1) { QString date_str = QDateTime::currentDateTime().toString("MMddhhmm"); - QString file_name = QString("Birthday_%2_%1.jpg").arg(QString::number(export_times + 1), date_str); + QString file_name = QString(u8"手帕夾_%2_%1.jpg").arg(QString::number(export_times + 1), date_str); saveToImage(file_name, &scene); export_times++; diff --git a/NameCreater/NameCreater.cpp b/NameCreater/NameCreater.cpp index 368f64e..55bad57 100644 --- a/NameCreater/NameCreater.cpp +++ b/NameCreater/NameCreater.cpp @@ -15,6 +15,7 @@ #include "BirthdayCreater.h" #include "TowelCreater.h" #include "NewFiveCreater.h" +#include "HKHolderCreater.h" #define FONT_PATH ":/NameCreater/_exp/DFYuanStd-W8.otf" @@ -36,6 +37,7 @@ NameCreater::NameCreater(QWidget *parent) connect(ui.fivenew_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); connect(ui.birthday_zh_eng_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); connect(ui.birthday_eng_eng_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); + connect(ui.handkerchief_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn); QString font_path = FONT_PATH; QFile font_res(font_path); @@ -128,6 +130,9 @@ void NameCreater::OnClickedReadBtn() { b.setEnglishFont(font_english); b.generaImageFromCSV(Name_Type_e::Name_eng, fileName,fileContent,this->font, this->font_color); } + if (sender == ui.handkerchief_btn) { + HKHolderCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font, this->font_color); + } } diff --git a/NameCreater/NameCreater.pri b/NameCreater/NameCreater.pri index 69148df..23138c7 100644 --- a/NameCreater/NameCreater.pri +++ b/NameCreater/NameCreater.pri @@ -14,7 +14,8 @@ HEADERS += ./resource.h \ ./INameCreater.h \ ./OldFiveCreater.h \ ./TowelCreater.h \ - ./NewFiveCreater.h + ./NewFiveCreater.h \ + ./HKHolderCreater.h SOURCES += ./NameCreater.cpp \ ./main.cpp \ ./BirthdayCreater.cpp \ @@ -22,6 +23,7 @@ SOURCES += ./NameCreater.cpp \ ./FiveToSingle.cpp \ ./INameCreater.cpp \ ./TowelCreater.cpp \ - ./NewFiveCreater.cpp + ./NewFiveCreater.cpp \ + ./HKHolderCreater.cpp FORMS += ./NameCreater.ui RESOURCES += NameCreater.qrc diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user index 7731aa1..68510de 100644 --- a/NameCreater/NameCreater.pro.user +++ b/NameCreater/NameCreater.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/NameCreater/NameCreater.vcxproj.filters b/NameCreater/NameCreater.vcxproj.filters index 9b20b26..c1ef383 100644 --- a/NameCreater/NameCreater.vcxproj.filters +++ b/NameCreater/NameCreater.vcxproj.filters @@ -62,7 +62,7 @@ Creaters - Source Files + Creaters @@ -88,7 +88,7 @@ Creaters - Header Files + Creaters diff --git a/NameCreater/NewFiveCreater.cpp b/NameCreater/NewFiveCreater.cpp index fc5c75f..71fe57e 100644 --- a/NameCreater/NewFiveCreater.cpp +++ b/NameCreater/NewFiveCreater.cpp @@ -122,7 +122,7 @@ void NewFiveCreater::generaImageFromCSV(Name_Type_e type, const QString& filenam if ((idx % MAX_LABEL_IN_PAPER == MAX_LABEL_IN_PAPER - 1) || idx == nameList.count() * 5 - 1) { QString date_str = QDateTime::currentDateTime().toString("MMddhhmm"); - QString file_name = QString("Five_%2_%1.jpg").arg(QString::number(export_times + 1), date_str); + QString file_name = QString(u8"五入組_%2_%1.jpg").arg(QString::number(export_times + 1), date_str); saveToImage(file_name, &scene); export_times++; scene.clear(); diff --git a/NameCreater/TowelCreater.cpp b/NameCreater/TowelCreater.cpp index 2d67fe4..4524fc9 100644 --- a/NameCreater/TowelCreater.cpp +++ b/NameCreater/TowelCreater.cpp @@ -146,7 +146,7 @@ void TowelCreater::generaImageFromCSV(Name_Type_e type, const QString& filename, if ((idx % MAX_LABEL_IN_PAPER == MAX_LABEL_IN_PAPER - 1) || idx == nameList.count() - 1) { QString date_str = QDateTime::currentDateTime().toString("MMddhhmm"); - QString file_name = QString("Towel_%2_%1.jpg").arg(QString::number(export_times + 1), date_str); + QString file_name = QString(u8"小方巾_%2_%1.jpg").arg(QString::number(export_times + 1), date_str); saveToImage(file_name, &scene); export_times++;