diff --git a/NameCreater/NameCreater.pro.user b/NameCreater/NameCreater.pro.user index 9f12b37..4b54f28 100644 --- a/NameCreater/NameCreater.pro.user +++ b/NameCreater/NameCreater.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/NameCreater/NameCreater.vcxproj b/NameCreater/NameCreater.vcxproj index acd4265..412cf7c 100644 --- a/NameCreater/NameCreater.vcxproj +++ b/NameCreater/NameCreater.vcxproj @@ -205,6 +205,7 @@ + diff --git a/NameCreater/NameCreater.vcxproj.filters b/NameCreater/NameCreater.vcxproj.filters index d9dc486..4ab36ec 100644 --- a/NameCreater/NameCreater.vcxproj.filters +++ b/NameCreater/NameCreater.vcxproj.filters @@ -96,6 +96,9 @@ Creaters + + Header Files + diff --git a/NameCreater/customlogo.cpp b/NameCreater/customlogo.cpp index d93bf7d..0ea066f 100644 --- a/NameCreater/customlogo.cpp +++ b/NameCreater/customlogo.cpp @@ -18,7 +18,7 @@ static qreal BG_WIDTH_OFFSET = 320; static int NAME_COUNT_IN_PAGE = 12; -static QPointF NAME_OFFSET_START = QPointF(79, 377); +static QPointF NAME_OFFSET_START = QPointF(79, 365); static qreal EACH_WORD_OFFSET = 142; static QColor FONT_COLOR = QColor(0, 0, 0); @@ -171,8 +171,8 @@ void CustomLogo::gerneraImageFromList(const QList& nameList, Name_Ty QPointF pos = NAME_OFFSET_START; qreal y_offset = 0; if (name_len == 2) { - pos.setY(pos.y() + 82.0); - y_offset = 25; + pos.setY(pos.y() + 65.0); + y_offset = 55; } for (int k = 0; k < name_len; k++) { @@ -180,7 +180,10 @@ void CustomLogo::gerneraImageFromList(const QList& nameList, Name_Ty textItem->setFont(*customFont); textItem->setDefaultTextColor(fontColor); qreal _posX = name_rectItem->boundingRect().width() / 2 - textItem->boundingRect().width() / 2; - textItem->setPos(_posX, pos.y() + k * EACH_WORD_OFFSET + y_offset); + qreal _posY = pos.y() + k * (EACH_WORD_OFFSET + y_offset); + qDebug() << "Name num:" << QString::number(k) << "PosY:" << QString::number(_posY); + textItem->setPos(_posX, _posY); + } diff --git a/NameCreater/def.h b/NameCreater/def.h index f7335d8..d77af5e 100644 --- a/NameCreater/def.h +++ b/NameCreater/def.h @@ -1,7 +1,7 @@ #ifndef DEF_H #define DEF_H -#define VERSION "v2.9.1" +#define VERSION "v2.9.2" #endif // DEF_H