diff --git a/NameCreater/HKHolderCreater.cpp b/NameCreater/HKHolderCreater.cpp index 21d26db..d286334 100644 --- a/NameCreater/HKHolderCreater.cpp +++ b/NameCreater/HKHolderCreater.cpp @@ -6,32 +6,35 @@ #include #include -#define HK_BG_WIDTH 1722 -#define HK_BG_HEIGH 2435 +#define HK_BG_WIDTH 2482 +#define HK_BG_HEIGH 3509 #define MAX_COL_IN_ROW 7 #define MAX_LABEL_IN_PAPER 14 -#define NAME_TWO_WORD_OFFSET 60.0 -#define NAME_THREE_WORD_OFFSET 55.0 +#define NAME_TWO_WORD_OFFSET 100.0 +#define NAME_THREE_WORD_OFFSET 82.0 -#define NAME_TWO_EXT_Y 13.0 -#define NAME_TWO_EXT_REV_Y 22.0 +#define NAME_TWO_EXT_Y 20.0 +#define NAME_TWO_EXT_REV_Y 30.0 -static qreal row_x_gap = 220; -static qreal row_y_offset[] = { 30, 1065 }; +static qreal row_x_offset = 132; +static qreal row_x_gap = 320; +static qreal row_y_offset[] = { 105 , 1615 }; -static QPoint NAME_OFFSET_START = QPoint(65, 290); -static QPoint NAME_OFFSET_REVERSE_START = QPoint(125, 713); +static QPoint NAME_OFFSET_START = QPoint(92, 413); +static QPoint NAME_OFFSET_REVERSE_START = QPoint(179, 1020); HKHolderCreater::HKHolderCreater() : INameCreater() { - label_bg_map["b"] = ":/NameCreater/resource/hk_holder/b.jpg"; + label_bg_map["a"] = ":/NameCreater/resource/hk_holder/a.jpg"; + label_bg_map["b"] = ":/NameCreater/resource/hk_holder/b.jpg"; label_bg_map["m"] = ":/NameCreater/resource/hk_holder/m.jpg"; label_bg_map["g"] = ":/NameCreater/resource/hk_holder/g.jpg"; label_bg_map["st"] = ":/NameCreater/resource/hk_holder/st.jpg"; label_bg_map["w"] = ":/NameCreater/resource/hk_holder/w.jpg"; label_bg_map["p"] = ":/NameCreater/resource/hk_holder/p.jpg"; + label_bg_map["pg"] = ":/NameCreater/resource/hk_holder/pg.jpg"; label_bg_map["r"] = ":/NameCreater/resource/hk_holder/r.jpg"; label_bg_map["y"] = ":/NameCreater/resource/hk_holder/y.jpg"; @@ -135,7 +138,7 @@ void HKHolderCreater::generaImageFromCSV(Name_Type_e type, const QString& filena NameInfo_t name_info = nameList.at(idx); QString label_rel_path = label_bg_map[name_info.name2]; QGraphicsPixmapItem* label_item = new QGraphicsPixmapItem(QPixmap(label_rel_path)); - label_item->setPos(qreal(90 + col_idx* row_x_gap), row_y_offset[row_idx]); + label_item->setPos(qreal(row_x_offset + col_idx* row_x_gap), row_y_offset[row_idx]); label_item->setOpacity(1.0); scene.addItem(label_item); diff --git a/NameCreater/INameCreater.cpp b/NameCreater/INameCreater.cpp index 94b139e..3e3ec79 100644 --- a/NameCreater/INameCreater.cpp +++ b/NameCreater/INameCreater.cpp @@ -49,7 +49,7 @@ void INameCreater::saveToImage(const QString& filename, QGraphicsScene* scene) QPixmap pixmap = QPixmap::fromImage(image); pixmap.save(&buffer, "JPEG", 100); // You can also use other formats like "JPEG" or "BMP" - QFileDialog::saveFileContent(imageData, filename); + QFileDialog::saveFileContent(imageData, filename); } diff --git a/NameCreater/NameCreater.cpp b/NameCreater/NameCreater.cpp index c908e7b..000e00b 100644 --- a/NameCreater/NameCreater.cpp +++ b/NameCreater/NameCreater.cpp @@ -23,7 +23,7 @@ #define ENGLISH_FONT_PATH ":/NameCreater/_exp/FontsFree-Net-Acumin-Pro-Semibold.ttf" #define FONT_SIZE 120 -#define VERSION "v2.2.1" +#define VERSION "v2.3.0" NameCreater::NameCreater(QWidget *parent) @@ -132,8 +132,9 @@ void NameCreater::OnClickedReadBtn() { } if (sender == ui.handkerchief_btn) { QFont newFont(font); - newFont.setPixelSize(55); - HKHolderCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, newFont, this->font_color); + newFont.setPixelSize(78); + QColor newColor(0,0,0); + HKHolderCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, newFont, newColor); } diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user index 9dbaca1..780bb42 100644 --- a/NameCreater/NameCreater.pro.user +++ b/NameCreater/NameCreater.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -86,6 +86,466 @@ ProjectExplorer.Project.Target.0 + + WebAssemblyDeviceType + WebAssembly Qt 6.5.2 (single-threaded) + WebAssembly Qt 6.5.2 (single-threaded) + qt.qt6.652.wasm_singlethread_kit + 0 + -1 + 0 + + 0 + /Users/shouchih/dev/namecreater/build-NameCreater-WebAssembly_Qt_6_5_2_single_threaded-Debug + /Users/shouchih/dev/namecreater/build-NameCreater-WebAssembly_Qt_6_5_2_single_threaded-Debug + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + /Users/shouchih/dev/namecreater/build-NameCreater-WebAssembly_Qt_6_5_2_single_threaded-Release + /Users/shouchih/dev/namecreater/build-NameCreater-WebAssembly_Qt_6_5_2_single_threaded-Release + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + 0 + /Users/shouchih/dev/namecreater/build-NameCreater-WebAssembly_Qt_6_5_2_single_threaded-Profile + /Users/shouchih/dev/namecreater/build-NameCreater-WebAssembly_Qt_6_5_2_single_threaded-Profile + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + + 3 + 0 + + true + true + true + + NameCreater + WebAssembly.RunConfiguration.Emrun/Users/shouchih/dev/namecreater/NameCreater/NameCreater.pro + /Users/shouchih/dev/namecreater/NameCreater/NameCreater.pro + true + true + chrome + + 1 + + + + ProjectExplorer.Project.Target.1 + + WebAssemblyDeviceType + Qt 5.15.2 WebAssembly + Qt 5.15.2 WebAssembly + qt.qt5.5152.wasm_32_kit + 0 + -1 + 0 + + 0 + /Users/shouchih/dev/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Debug + /Users/shouchih/dev/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Debug + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + /Users/shouchih/dev/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Release + /Users/shouchih/dev/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Release + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + + + 0 + /Users/shouchih/dev/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Profile + /Users/shouchih/dev/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Profile + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + 0 + + true + true + true + + 2 + + false + ProjectExplorer.CustomExecutableRunConfiguration + + true + true + + 1 + + + + ProjectExplorer.Project.Target.2 + + Desktop + Qt 6.5.2 for macOS + Qt 6.5.2 for macOS + qt.qt6.652.clang_64_kit + 0 + 0 + 0 + + 0 + /Users/shouchih/dev/namecreater/build-NameCreater-Qt_6_5_2_for_macOS-Debug + /Users/shouchih/dev/namecreater/build-NameCreater-Qt_6_5_2_for_macOS-Debug + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + /Users/shouchih/dev/namecreater/build-NameCreater-Qt_6_5_2_for_macOS-Release + /Users/shouchih/dev/namecreater/build-NameCreater-Qt_6_5_2_for_macOS-Release + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + + + 0 + /Users/shouchih/dev/namecreater/build-NameCreater-Qt_6_5_2_for_macOS-Profile + /Users/shouchih/dev/namecreater/build-NameCreater-Qt_6_5_2_for_macOS-Profile + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + true + true + true + + 2 + + false + Qt4ProjectManager.Qt4RunConfiguration:/Users/shouchih/dev/namecreater/NameCreater/NameCreater.pro + /Users/shouchih/dev/namecreater/NameCreater/NameCreater.pro + true + true + true + + 1 + + + + ProjectExplorer.Project.Target.3 Desktop Desktop Qt 5.15.2 clang 64bit @@ -243,163 +703,13 @@ true true true - /Users/shouchih/dev/namecreater/build-NameCreater-Desktop_Qt_5_15_2_clang_64bit-Debug/NameCreater.app/Contents/MacOS - - 1 - - - - ProjectExplorer.Project.Target.1 - - WebAssemblyDeviceType - Qt 5.15.2 WebAssembly - Qt 5.15.2 WebAssembly - qt.qt5.5152.wasm_32_kit - 0 - -1 - 0 - - 0 - /Users/shouchih/dev/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Debug - /Users/shouchih/dev/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Debug - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - /Users/shouchih/dev/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Release - /Users/shouchih/dev/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Release - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - - - 0 - /Users/shouchih/dev/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Profile - /Users/shouchih/dev/namecreater/build-NameCreater-Qt_5_15_2_WebAssembly-Profile - - - true - QtProjectManager.QMakeBuildStep - false - - - - true - Qt4ProjectManager.MakeStep - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - clean - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - 3 - 0 - - true - true - true - - NameCreater - WebAssembly.RunConfiguration.Emrun/Users/shouchih/dev/namecreater/NameCreater/NameCreater.pro - /Users/shouchih/dev/namecreater/NameCreater/NameCreater.pro - true - true - chrome 1 ProjectExplorer.Project.TargetCount - 2 + 4 ProjectExplorer.Project.Updater.FileVersion diff --git a/NameCreater/NameCreater.qrc b/NameCreater/NameCreater.qrc index 2ad4266..a1dba47 100644 --- a/NameCreater/NameCreater.qrc +++ b/NameCreater/NameCreater.qrc @@ -76,5 +76,7 @@ resource/hk_holder/m.jpg resource/hk_holder/st.jpg resource/hk_holder/w.jpg + resource/hk_holder/a.jpg + resource/hk_holder/pg.jpg diff --git a/NameCreater/resource/hk_holder/a.jpg b/NameCreater/resource/hk_holder/a.jpg new file mode 100644 index 0000000..1d165a9 Binary files /dev/null and b/NameCreater/resource/hk_holder/a.jpg differ diff --git a/NameCreater/resource/hk_holder/b.jpg b/NameCreater/resource/hk_holder/b.jpg index daab4c8..ac8f8c7 100644 Binary files a/NameCreater/resource/hk_holder/b.jpg and b/NameCreater/resource/hk_holder/b.jpg differ diff --git a/NameCreater/resource/hk_holder/g.jpg b/NameCreater/resource/hk_holder/g.jpg index 459998c..540e6b1 100644 Binary files a/NameCreater/resource/hk_holder/g.jpg and b/NameCreater/resource/hk_holder/g.jpg differ diff --git a/NameCreater/resource/hk_holder/m.jpg b/NameCreater/resource/hk_holder/m.jpg index 5d20c52..3d78720 100644 Binary files a/NameCreater/resource/hk_holder/m.jpg and b/NameCreater/resource/hk_holder/m.jpg differ diff --git a/NameCreater/resource/hk_holder/p.jpg b/NameCreater/resource/hk_holder/p.jpg index e0b1311..32d365f 100644 Binary files a/NameCreater/resource/hk_holder/p.jpg and b/NameCreater/resource/hk_holder/p.jpg differ diff --git a/NameCreater/resource/hk_holder/pg.jpg b/NameCreater/resource/hk_holder/pg.jpg new file mode 100644 index 0000000..946236e Binary files /dev/null and b/NameCreater/resource/hk_holder/pg.jpg differ diff --git a/NameCreater/resource/hk_holder/r.jpg b/NameCreater/resource/hk_holder/r.jpg index 0a29e60..63cc222 100644 Binary files a/NameCreater/resource/hk_holder/r.jpg and b/NameCreater/resource/hk_holder/r.jpg differ diff --git a/NameCreater/resource/hk_holder/sample.jpg b/NameCreater/resource/hk_holder/sample.jpg index eb2012a..65c1dce 100644 Binary files a/NameCreater/resource/hk_holder/sample.jpg and b/NameCreater/resource/hk_holder/sample.jpg differ diff --git a/NameCreater/resource/hk_holder/st.jpg b/NameCreater/resource/hk_holder/st.jpg index 0db9473..85e28b1 100644 Binary files a/NameCreater/resource/hk_holder/st.jpg and b/NameCreater/resource/hk_holder/st.jpg differ diff --git a/NameCreater/resource/hk_holder/w.jpg b/NameCreater/resource/hk_holder/w.jpg index e84499e..b355241 100644 Binary files a/NameCreater/resource/hk_holder/w.jpg and b/NameCreater/resource/hk_holder/w.jpg differ diff --git a/NameCreater/resource/hk_holder/y.jpg b/NameCreater/resource/hk_holder/y.jpg index 1f8828c..e1a9e95 100644 Binary files a/NameCreater/resource/hk_holder/y.jpg and b/NameCreater/resource/hk_holder/y.jpg differ