diff --git a/NameCreater/HKHolderCreater.cpp b/NameCreater/HKHolderCreater.cpp index d286334..944ab2f 100644 --- a/NameCreater/HKHolderCreater.cpp +++ b/NameCreater/HKHolderCreater.cpp @@ -12,18 +12,18 @@ #define MAX_COL_IN_ROW 7 #define MAX_LABEL_IN_PAPER 14 -#define NAME_TWO_WORD_OFFSET 100.0 +#define NAME_TWO_WORD_OFFSET 90.0 #define NAME_THREE_WORD_OFFSET 82.0 #define NAME_TWO_EXT_Y 20.0 -#define NAME_TWO_EXT_REV_Y 30.0 +#define NAME_TWO_EXT_REV_Y 23.0 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(92, 413); -static QPoint NAME_OFFSET_REVERSE_START = QPoint(179, 1020); +static QPoint NAME_OFFSET_REVERSE_START = QPoint(179, 1030); HKHolderCreater::HKHolderCreater() : INameCreater() { @@ -139,7 +139,7 @@ void HKHolderCreater::generaImageFromCSV(Name_Type_e type, const QString& filena QString label_rel_path = label_bg_map[name_info.name2]; QGraphicsPixmapItem* label_item = new QGraphicsPixmapItem(QPixmap(label_rel_path)); label_item->setPos(qreal(row_x_offset + col_idx* row_x_gap), row_y_offset[row_idx]); - label_item->setOpacity(1.0); + //label_item->setOpacity(0.5); scene.addItem(label_item); diff --git a/NameCreater/NameCreater.cpp b/NameCreater/NameCreater.cpp index 000e00b..a42aa75 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.3.0" +#define VERSION "v2.3.1" NameCreater::NameCreater(QWidget *parent) diff --git a/NameCreater/NameCreater.pro b/NameCreater/NameCreater.pro index cbb3649..a6f4882 100644 --- a/NameCreater/NameCreater.pro +++ b/NameCreater/NameCreater.pro @@ -18,6 +18,6 @@ qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -#QMAKE_LFLAGS+= -s TOTAL_MEMORY=67108864 +QMAKE_LFLAGS+= -s TOTAL_MEMORY=67108864 diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user index b02d2cd..549d722 100644 --- a/NameCreater/NameCreater.pro.user +++ b/NameCreater/NameCreater.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -221,6 +221,169 @@ 3 0 + + true + true + true + + NameCreater + WebAssembly.RunConfiguration.EmrunD:/_develop/_project/NameCreater/NameCreater/NameCreater.pro + D:/_develop/_project/NameCreater/NameCreater/NameCreater.pro + false + true + false + true + chrome + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop + Desktop Qt 5.15.2 MSVC2019 64bit + Desktop Qt 5.15.2 MSVC2019 64bit + qt.qt5.5152.win64_msvc2019_64_kit + 0 + 0 + 0 + + 0 + D:\_develop\_project\NameCreater\build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-Debug + D:/_develop/_project/NameCreater/build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-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 + + + D:\_develop\_project\NameCreater\build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-Release + D:/_develop/_project/NameCreater/build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-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 + D:\_develop\_project\NameCreater\build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-Profile + D:/_develop/_project/NameCreater/build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-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 @@ -243,21 +406,23 @@ 14 - NameCreater - WebAssembly.RunConfiguration.EmrunD:/_develop/_project/NameCreater/NameCreater/NameCreater.pro + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/_develop/_project/NameCreater/NameCreater/NameCreater.pro D:/_develop/_project/NameCreater/NameCreater/NameCreater.pro false true + true false true - chrome + D:/_develop/_project/NameCreater/build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-Debug 1 ProjectExplorer.Project.TargetCount - 1 + 2 ProjectExplorer.Project.Updater.FileVersion diff --git a/NameCreater/_exp/手帕夾範例.csv b/NameCreater/_exp/手帕夾範例.csv index 79e402a..c029406 100644 --- a/NameCreater/_exp/手帕夾範例.csv +++ b/NameCreater/_exp/手帕夾範例.csv @@ -4,7 +4,7 @@ name,bg_type Á¤_¹ä,g Á¤_¹ä,b Á¤_¹ä,w -¸â¨°ºÓ,p +²ÀÇ,r ¸â¨°ºÓ,pg ¸â¨°ºÓ,y ¸â¨°ºÓ,b diff --git a/NameCreater/resource/hk_holder/sample.jpg b/NameCreater/resource/hk_holder/sample.jpg index 65c1dce..00ba7fa 100644 Binary files a/NameCreater/resource/hk_holder/sample.jpg and b/NameCreater/resource/hk_holder/sample.jpg differ