diff --git a/NameCreater/FiveToSingle.cpp b/NameCreater/FiveToSingle.cpp index 09272a6..dbe2b9c 100644 --- a/NameCreater/FiveToSingle.cpp +++ b/NameCreater/FiveToSingle.cpp @@ -47,7 +47,7 @@ static QPointF NAME_POS_NUMBER[] = { QPointF(1228, 2334), QPointF(2280, 2202), }; -static int NAME_POS_COUNT = sizeof(NAME_POS) / sizeof(NAME_POS[0]); +//static int NAME_POS_COUNT = sizeof(NAME_POS) / sizeof(NAME_POS[0]); FiveToSingle::FiveToSingle() :INameCreater() { @@ -366,8 +366,14 @@ void FiveToSingle::generaImageFromCSV(Name_Type_e type, const QString& filename, scene.addItem(eng_word_item); } else { - eng_word_item->setRotation(0); - eng_word_item->setPos(pos.x() - 160 - rect.height(), pos.y()-20); + eng_word_item->setRotation(0); + // using window and webassembly complier that different y pos + + //widows complier + //eng_word_item->setPos(pos.x() - 160 - rect.height(), pos.y()- 15); + + //webassembly complier + eng_word_item->setPos(pos.x() - 160 - rect.height(), pos.y()+10); scene.addItem(eng_word_item); } diff --git a/NameCreater/NameCreater.cpp b/NameCreater/NameCreater.cpp index 881c85c..8705ca6 100644 --- a/NameCreater/NameCreater.cpp +++ b/NameCreater/NameCreater.cpp @@ -1,3 +1,4 @@ +#include "def.h" #include "NameCreater.h" #include #include @@ -23,7 +24,7 @@ #define ENGLISH_FONT_PATH ":/NameCreater/_exp/FontsFree-Net-Acumin-Pro-Semibold.ttf" #define FONT_SIZE 120 -#define VERSION "v2.4.0" + NameCreater::NameCreater(QWidget *parent) diff --git a/NameCreater/NameCreater.pri b/NameCreater/NameCreater.pri index 23138c7..181f912 100644 --- a/NameCreater/NameCreater.pri +++ b/NameCreater/NameCreater.pri @@ -8,6 +8,7 @@ message("You are running qmake on a generated .pro file. This may not work!") HEADERS += ./resource.h \ + $$PWD/def.h \ ./NameCreater.h \ ./BirthdayCreater.h \ ./FiveToSingle.h \ diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user index 80df516..c61c2ab 100644 --- a/NameCreater/NameCreater.pro.user +++ b/NameCreater/NameCreater.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -8,7 +8,7 @@ ProjectExplorer.Project.ActiveTarget - 1 + 0 ProjectExplorer.Project.EditorSettings @@ -89,6 +89,157 @@ ProjectExplorer.Project.Target.0 + + WebAssemblyDeviceType + Qt 5.15.2 WebAssembly + Qt 5.15.2 WebAssembly + qt.qt5.5152.wasm_32_kit + 0 + -1 + 0 + + 0 + D:\_develop\_project\NameCreater\build-NameCreater-Qt_5_15_2_WebAssembly-Debug + D:/_develop/_project/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 + + + D:\_develop\_project\NameCreater\build-NameCreater-Qt_5_15_2_WebAssembly-Release + D:/_develop/_project/NameCreater/build-NameCreater-Qt_5_15_2_WebAssembly-Release + + + true + QtProjectManager.QMakeBuildStep + true + + + + 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-Qt_5_15_2_WebAssembly-Profile + D:/_develop/_project/NameCreater/build-NameCreater-Qt_5_15_2_WebAssembly-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + + + 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.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 @@ -247,158 +398,6 @@ true false true - D:/_develop/_project/NameCreater/build-NameCreater-Desktop_Qt_5_15_2_MSVC2019_64bit-Debug - - 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 - D:\_develop\_project\NameCreater\build-NameCreater-Qt_5_15_2_WebAssembly-Debug - D:/_develop/_project/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 - - - D:\_develop\_project\NameCreater\build-NameCreater-Qt_5_15_2_WebAssembly-Release - D:/_develop/_project/NameCreater/build-NameCreater-Qt_5_15_2_WebAssembly-Release - - - true - QtProjectManager.QMakeBuildStep - true - - - - 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-Qt_5_15_2_WebAssembly-Profile - D:/_develop/_project/NameCreater/build-NameCreater-Qt_5_15_2_WebAssembly-Profile - - - true - QtProjectManager.QMakeBuildStep - true - - - - 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.EmrunD:/_develop/_project/NameCreater/NameCreater/NameCreater.pro - D:/_develop/_project/NameCreater/NameCreater/NameCreater.pro - false - true - false - true - chrome 1 diff --git a/NameCreater/NameCreater.vcxproj.user b/NameCreater/NameCreater.vcxproj.user index 716ee7d..a96a6e9 100644 --- a/NameCreater/NameCreater.vcxproj.user +++ b/NameCreater/NameCreater.vcxproj.user @@ -17,15 +17,15 @@ WindowsLocalDebugger - 2023-10-04T01:50:11.5655668Z + 2024-03-08T00:24:36.2679670Z - 2023-10-04T01:50:11.7070780Z + 2024-03-08T00:24:36.4421487Z - 2023-10-04T01:50:11.8781219Z + 2024-03-08T00:24:36.6106971Z - 2023-10-04T01:50:12.0266361Z + 2024-03-08T00:24:36.7243928Z \ No newline at end of file diff --git a/NameCreater/def.h b/NameCreater/def.h new file mode 100644 index 0000000..c167c1e --- /dev/null +++ b/NameCreater/def.h @@ -0,0 +1,6 @@ +#ifndef DEF_H +#define DEF_H + +#define VERSION "v2.4.1" + +#endif // DEF_H