adjust five to single word position.
This commit is contained in:
parent
2b51d7ddee
commit
91ca0f21a9
@ -171,7 +171,7 @@ void FiveToSingle::generaImageFromCSV(Name_Type_e type, const QString& filename,
|
|||||||
qreal xscale, yscale;
|
qreal xscale, yscale;
|
||||||
|
|
||||||
xscale = yscale = (j == 1) ? -1 : 1;
|
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 };
|
qreal y_offset[2] = { 0 };
|
||||||
if (name_len == 2) {
|
if (name_len == 2) {
|
||||||
if (!rot) {
|
if (!rot) {
|
||||||
@ -281,7 +281,7 @@ void FiveToSingle::generaImageFromCSV(Name_Type_e type, const QString& filename,
|
|||||||
int name_len = name.length();
|
int name_len = name.length();
|
||||||
for (int j = 0; j < 2; j++) {
|
for (int j = 0; j < 2; j++) {
|
||||||
int pos_idx = idx * 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) {
|
if (j == 0) {
|
||||||
qreal xscale, yscale;
|
qreal xscale, yscale;
|
||||||
xscale = yscale = 1;
|
xscale = yscale = 1;
|
||||||
@ -362,18 +362,18 @@ void FiveToSingle::generaImageFromCSV(Name_Type_e type, const QString& filename,
|
|||||||
|
|
||||||
if (!rot) {
|
if (!rot) {
|
||||||
eng_word_item->setRotation(-90);
|
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);
|
scene.addItem(eng_word_item);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
eng_word_item->setRotation(0);
|
eng_word_item->setRotation(180);
|
||||||
// using window and webassembly complier that different y pos
|
// using window and webassembly complier that different y pos
|
||||||
|
|
||||||
//widows complier
|
//widows complier
|
||||||
//eng_word_item->setPos(pos.x() - 160 - rect.height(), pos.y()- 15);
|
//eng_word_item->setPos(pos.x() - 160 - rect.height(), pos.y()- 15);
|
||||||
|
|
||||||
//webassembly complier
|
//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);
|
scene.addItem(eng_word_item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE QtCreatorProject>
|
<!DOCTYPE QtCreatorProject>
|
||||||
<!-- Written by QtCreator 7.0.2, 2024-03-14T15:02:41. -->
|
<!-- Written by QtCreator 7.0.2, 2024-03-15T14:08:56. -->
|
||||||
<qtcreator>
|
<qtcreator>
|
||||||
<data>
|
<data>
|
||||||
<variable>EnvironmentId</variable>
|
<variable>EnvironmentId</variable>
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
#ifndef DEF_H
|
#ifndef DEF_H
|
||||||
#define DEF_H
|
#define DEF_H
|
||||||
|
|
||||||
#define VERSION "v2.4.3"
|
#define VERSION "v2.4.5"
|
||||||
|
|
||||||
#endif // DEF_H
|
#endif // DEF_H
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user