1. Adjust Birthday creator detail: label position, eng word position, star style position.
This commit is contained in:
parent
fc685d47ce
commit
db15997b79
@ -13,7 +13,7 @@
|
|||||||
#define MAX_LABEL_IN_PAPER 10
|
#define MAX_LABEL_IN_PAPER 10
|
||||||
#define FONT_PIXEL_SIZE 120
|
#define FONT_PIXEL_SIZE 120
|
||||||
|
|
||||||
static QPoint LABEL_POS_START = QPoint(163, 115);
|
static QPoint LABEL_POS_START = QPoint(163, 70);
|
||||||
static QPoint NAME_OFFSET_START = QPoint(82, 712);
|
static QPoint NAME_OFFSET_START = QPoint(82, 712);
|
||||||
static QPoint NAME_OFFSET_REVERSE_START = QPoint(214, 1745);
|
static QPoint NAME_OFFSET_REVERSE_START = QPoint(214, 1745);
|
||||||
|
|
||||||
@ -135,7 +135,7 @@ void BirthdayCreater::generaImageFromCSV(Name_Type_e type, const QString& filena
|
|||||||
|
|
||||||
int chrismas_y_offset = 0;
|
int chrismas_y_offset = 0;
|
||||||
if (name_info.name2.compare("co") == 0 || name_info.name2.compare("ol") == 0 ||
|
if (name_info.name2.compare("co") == 0 || name_info.name2.compare("ol") == 0 ||
|
||||||
name_info.name2.compare("st") == 0 || name_info.name2.compare("sn") == 0) {
|
/*name_info.name2.compare("st") == 0 ||*/ name_info.name2.compare("sn") == 0) {
|
||||||
chrismas_y_offset = 30;
|
chrismas_y_offset = 30;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -191,7 +191,7 @@ void BirthdayCreater::generaImageFromCSV(Name_Type_e type, const QString& filena
|
|||||||
|
|
||||||
int chrismas_y_offset = 0;
|
int chrismas_y_offset = 0;
|
||||||
if (name_info.name2.compare("co") == 0 || name_info.name2.compare("ol") == 0 ||
|
if (name_info.name2.compare("co") == 0 || name_info.name2.compare("ol") == 0 ||
|
||||||
name_info.name2.compare("st") == 0 || name_info.name2.compare("sn") == 0) {
|
/*name_info.name2.compare("st") == 0 ||*/ name_info.name2.compare("sn") == 0) {
|
||||||
chrismas_y_offset = 30;
|
chrismas_y_offset = 30;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -203,20 +203,20 @@ void BirthdayCreater::generaImageFromCSV(Name_Type_e type, const QString& filena
|
|||||||
|
|
||||||
for(int i = 0; i < 2; i++){
|
for(int i = 0; i < 2; i++){
|
||||||
qreal dir = (i == 0) ? -1.0:1.0;
|
qreal dir = (i == 0) ? -1.0:1.0;
|
||||||
qreal x_offset = (i == 0) ? 290.0 : 170.0;
|
qreal x_offset = (i == 0) ? 280.0 : 170.0;
|
||||||
qreal y_offset = (i == 0) ? 890.0 : 1550.0;
|
qreal y_offset = (i == 0) ? 890.0 : 1550.0;
|
||||||
int sp_y_offset = (i == 0)? 1.0*chrismas_y_offset:-1.0*chrismas_y_offset;
|
int sp_y_offset = (i == 0)? 1.0*chrismas_y_offset:-1.0*chrismas_y_offset;
|
||||||
//add English world
|
//add English world
|
||||||
QGraphicsTextItem* eng_word_item = new QGraphicsTextItem(name_info.name_eng);
|
QGraphicsTextItem* eng_word_item = new QGraphicsTextItem(name_info.name_eng,label_item);
|
||||||
eng_word_item->setFont(_new_font);
|
eng_word_item->setFont(_new_font);
|
||||||
QRectF rect = eng_word_item->boundingRect();
|
QRectF rect = eng_word_item->boundingRect();
|
||||||
eng_word_item->setDefaultTextColor(font_color);
|
eng_word_item->setDefaultTextColor(font_color);
|
||||||
|
|
||||||
eng_word_item->setRotation(i == 0 ? 90 : -90);
|
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 + sp_y_offset + (rect.width()/2*dir));
|
eng_word_item->setPos(x_offset - rect.height()/2.0, y_offset + sp_y_offset + (rect.width()/2*dir));
|
||||||
|
|
||||||
|
|
||||||
scene.addItem(eng_word_item);
|
//scene.addItem(eng_word_item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -253,7 +253,7 @@ void BirthdayCreater::generaImageFromCSV(Name_Type_e type, const QString& filena
|
|||||||
|
|
||||||
int chrismas_y_offset = 0;
|
int chrismas_y_offset = 0;
|
||||||
if (name_info.name2.compare("co") == 0 || name_info.name2.compare("ol") == 0 ||
|
if (name_info.name2.compare("co") == 0 || name_info.name2.compare("ol") == 0 ||
|
||||||
name_info.name2.compare("st") == 0 || name_info.name2.compare("sn") == 0) {
|
/*name_info.name2.compare("st") == 0 ||*/ name_info.name2.compare("sn") == 0) {
|
||||||
chrismas_y_offset = 30;
|
chrismas_y_offset = 30;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#ifndef DEF_H
|
#ifndef DEF_H
|
||||||
#define DEF_H
|
#define DEF_H
|
||||||
|
|
||||||
#define VERSION "v2.10.2"
|
#define VERSION "v2.10.3"
|
||||||
|
|
||||||
|
|
||||||
#endif // DEF_H
|
#endif // DEF_H
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user