diff --git a/NameCreater/FiveToSingle.cpp b/NameCreater/FiveToSingle.cpp index dbe2b9c..e11c278 100644 --- a/NameCreater/FiveToSingle.cpp +++ b/NameCreater/FiveToSingle.cpp @@ -171,7 +171,7 @@ void FiveToSingle::generaImageFromCSV(Name_Type_e type, const QString& filename, qreal xscale, yscale; xscale = yscale = (j == 1) ? -1 : 1; - QPointF pos = name_info.is_number_bg ? NAME_POS_NUMBER[pos_idx] : NAME_POS[pos_idx]; + QPointF pos = name_info.is_number_bg ? NAME_POS_NUMBER[pos_idx] : NAME_POS_NUMBER[pos_idx]; qreal y_offset[2] = { 0 }; if (name_len == 2) { if (!rot) { @@ -281,7 +281,7 @@ void FiveToSingle::generaImageFromCSV(Name_Type_e type, const QString& filename, int name_len = name.length(); for (int j = 0; j < 2; j++) { int pos_idx = idx * 2 + j; - QPointF pos = name_info.is_number_bg ? NAME_POS_NUMBER[pos_idx] : NAME_POS[pos_idx]; + QPointF pos = name_info.is_number_bg ? NAME_POS_NUMBER[pos_idx] : NAME_POS_NUMBER[pos_idx]; if (j == 0) { qreal xscale, yscale; xscale = yscale = 1; @@ -362,18 +362,18 @@ void FiveToSingle::generaImageFromCSV(Name_Type_e type, const QString& filename, if (!rot) { eng_word_item->setRotation(-90); - eng_word_item->setPos(pos.x() + 20 - rect.height(), (pos.y() - 200) + rect.width() / 2); + eng_word_item->setPos(pos.x() + 30 - rect.height(), (pos.y() - 200) + rect.width() / 2); scene.addItem(eng_word_item); } else { - eng_word_item->setRotation(0); + eng_word_item->setRotation(180); // 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); + eng_word_item->setPos(pos.x()+10 , pos.y()+rect.height()-25); scene.addItem(eng_word_item); } diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user index 28a3d66..1d96ec5 100644 --- a/NameCreater/NameCreater.pro.user +++ b/NameCreater/NameCreater.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/NameCreater/def.h b/NameCreater/def.h index 494d1a4..5c6a869 100644 --- a/NameCreater/def.h +++ b/NameCreater/def.h @@ -1,6 +1,6 @@ #ifndef DEF_H #define DEF_H -#define VERSION "v2.4.3" +#define VERSION "v2.4.5" #endif // DEF_H