From d3dd641a592f929b5662ff46e158c82c947ba62c Mon Sep 17 00:00:00 2001 From: shouchih_chen Date: Sun, 2 Jun 2024 17:36:42 +0800 Subject: [PATCH] adjust five to signal Cht_eng arrangement method and position. --- NameCreater/FiveToSingle.cpp | 99 ++++++++++-------------------------- NameCreater/def.h | 2 +- 2 files changed, 28 insertions(+), 73 deletions(-) diff --git a/NameCreater/FiveToSingle.cpp b/NameCreater/FiveToSingle.cpp index e11c278..8eba59a 100644 --- a/NameCreater/FiveToSingle.cpp +++ b/NameCreater/FiveToSingle.cpp @@ -47,6 +47,8 @@ static QPointF NAME_POS_NUMBER[] = { QPointF(1228, 2334), QPointF(2280, 2202), }; +static QPointF NEW_POS = QPoint(81, 320); + //static int NAME_POS_COUNT = sizeof(NAME_POS) / sizeof(NAME_POS[0]); FiveToSingle::FiveToSingle() :INameCreater() @@ -171,7 +173,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_NUMBER[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) { @@ -250,8 +252,8 @@ void FiveToSingle::generaImageFromCSV(Name_Type_e type, const QString& filename, break; case Name_zh_eng: { - QFont _new_font = QFont(this->EnglisthFont()); - _new_font.setWeight(QFont::ExtraLight); + QFont _new_font = QFont(this->EnglisthFont()); + _new_font.setWeight(QFont::ExtraLight); for (int n = 0; n < nameList.length(); n++) { int idx = n % BG_POS_COUNT; @@ -281,76 +283,43 @@ 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_NUMBER[pos_idx]; + QPointF pos = NEW_POS; if (j == 0) { qreal xscale, yscale; xscale = yscale = 1; - + qreal y_offset[2] = { 0 }; if (name_len == 2) { - if (!rot) { - pos.setY(pos.y() + 82.0 * xscale); - } - else { - pos.setX(pos.x() + 82.0 * xscale); - - } - + pos.setY(pos.y() + 82.0 * xscale); y_offset[0] = 25; } - QGraphicsTextItem* textItem1 = new QGraphicsTextItem(name.mid(0, 1)); - textItem1->setFont(font); + QGraphicsTextItem* textItem1 = new QGraphicsTextItem(name.mid(0, 1), name_bgItem); + textItem1->setFont(font); textItem1->setDefaultTextColor(font_color); - if (!rot) { - textItem1->setPos(pos); - textItem1->setTransform(QTransform::fromScale(xscale, yscale)); - } - else { - textItem1->setPos(pos); - textItem1->setRotation(-90); - textItem1->setTransform(QTransform::fromScale(xscale, yscale)); - } + textItem1->setPos(pos); + textItem1->setTransform(QTransform::fromScale(xscale, yscale)); - - scene.addItem(textItem1); - - QGraphicsTextItem* textItem2 = new QGraphicsTextItem(name.mid(1, 1)); + //scene.addItem(textItem1); + QGraphicsTextItem* textItem2 = new QGraphicsTextItem(name.mid(1, 1), name_bgItem); textItem2->setFont(font); textItem2->setDefaultTextColor(font_color); - if (!rot) { + textItem2->setPos(pos.x(), pos.y() + (145 + y_offset[0]) * xscale); + textItem2->setTransform(QTransform::fromScale(xscale, yscale)); - textItem2->setPos(pos.x(), pos.y() + (145 + y_offset[0]) * xscale); - textItem2->setTransform(QTransform::fromScale(xscale, yscale)); - } - else { - textItem2->setPos(pos.x() + (145 + y_offset[0]) * xscale, pos.y()); - textItem2->setRotation(-90); - textItem2->setTransform(QTransform::fromScale(xscale, yscale)); - } - - scene.addItem(textItem2); if (name_len > 2) { - QGraphicsTextItem* textItem3 = new QGraphicsTextItem(name.mid(2, 1)); + QGraphicsTextItem* textItem3 = new QGraphicsTextItem(name.mid(2, 1), name_bgItem); textItem3->setFont(font); textItem3->setDefaultTextColor(font_color); - if (!rot) { - textItem3->setPos(pos.x(), pos.y() + 290 * xscale); - textItem3->setTransform(QTransform::fromScale(xscale, yscale)); - } - else { - textItem3->setPos(pos.x() + 290 * xscale, pos.y()); - textItem3->setRotation(-90); - textItem3->setTransform(QTransform::fromScale(xscale, yscale)); - } + textItem3->setPos(pos.x(), pos.y() + 290 * xscale); + textItem3->setTransform(QTransform::fromScale(xscale, yscale)); - scene.addItem(textItem3); } } else if (j == 1) { //TODO: add English world - QGraphicsTextItem* eng_word_item = new QGraphicsTextItem(name_info.name_eng); + QGraphicsTextItem* eng_word_item = new QGraphicsTextItem(name_info.name_eng, name_bgItem); int _new_size = getFontSizebyStr(_new_font, 120, 480, name_info.name_eng); @@ -360,27 +329,13 @@ void FiveToSingle::generaImageFromCSV(Name_Type_e type, const QString& filename, QRectF rect = eng_word_item->boundingRect(); eng_word_item->setDefaultTextColor(font_color); - if (!rot) { - eng_word_item->setRotation(-90); - 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(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()+10 , pos.y()+rect.height()-25); - scene.addItem(eng_word_item); - } - } - + eng_word_item->setRotation(-90); + eng_word_item->setPos((name_bgItem->boundingRect().width()/2 - rect.height()/2)+10, 1230 + rect.width() / 2); + } + } bool is_export_page = ((idx + 1) % BG_POS_COUNT == 0); if (is_export_page || n == nameList.count() - 1) { @@ -392,12 +347,12 @@ void FiveToSingle::generaImageFromCSV(Name_Type_e type, const QString& filename, scene.clear(); } } - + } break; - default: - break; + default: + break; } diff --git a/NameCreater/def.h b/NameCreater/def.h index 45b1110..a863f28 100644 --- a/NameCreater/def.h +++ b/NameCreater/def.h @@ -1,6 +1,6 @@ #ifndef DEF_H #define DEF_H -#define VERSION "v2.5.0" +#define VERSION "v2.5.1" #endif // DEF_H