From d1e80ad04cf5f1b15f54c67a49a2f602335210d8 Mon Sep 17 00:00:00 2001 From: shouchih_chen Date: Wed, 13 Mar 2024 15:04:34 +0800 Subject: [PATCH] modify birthday eng to eng position. --- NameCreater/BirthdayCreater.cpp | 6 ++++-- NameCreater/def.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/NameCreater/BirthdayCreater.cpp b/NameCreater/BirthdayCreater.cpp index d5d0749..bd033ef 100644 --- a/NameCreater/BirthdayCreater.cpp +++ b/NameCreater/BirthdayCreater.cpp @@ -205,7 +205,7 @@ void BirthdayCreater::generaImageFromCSV(Name_Type_e type, const QString& filena qreal dir = (i == 0) ? -1.0:1.0; qreal x_offset = (i == 0) ? 290.0 : 170.0; qreal y_offset = (i == 0) ? 780.0 : 1580.0; - chrismas_y_offset = (i == 0)? 1.0*chrismas_y_offset:-1.0*chrismas_y_offset; + int sp_y_offset = chrismas_y_offset;//(i == 0)? 1.0*chrismas_y_offset:-1.0*chrismas_y_offset-30.0; //add English world QGraphicsTextItem* eng_word_item = new QGraphicsTextItem(name_info.name_eng); eng_word_item->setFont(_new_font); @@ -213,7 +213,9 @@ void BirthdayCreater::generaImageFromCSV(Name_Type_e type, const QString& filena eng_word_item->setDefaultTextColor(font_color); eng_word_item->setRotation(i == 0 ? 90 : -90); - eng_word_item->setPos(label_item->x() + x_offset - rect.height()/2.0, label_item->y() + y_offset + chrismas_y_offset + (rect.width()/2*dir)); + eng_word_item->setPos(label_item->x() + x_offset - rect.height()/2.0, label_item->y() + y_offset + sp_y_offset + (rect.width()/2*dir)); + + scene.addItem(eng_word_item); } diff --git a/NameCreater/def.h b/NameCreater/def.h index c167c1e..02af904 100644 --- a/NameCreater/def.h +++ b/NameCreater/def.h @@ -1,6 +1,6 @@ #ifndef DEF_H #define DEF_H -#define VERSION "v2.4.1" +#define VERSION "v2.4.2" #endif // DEF_H