Merge branch 'birthday' of https://gitlab.com/portfolio91/namecreater into birthday
# Conflicts: # NameCreater/main.cpp
This commit is contained in:
commit
56ea07365d
@ -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 6.0.2, 2022-02-16T21:45:54. -->
|
<!-- Written by QtCreator 6.0.2, 2022-02-20T11:42:40. -->
|
||||||
<qtcreator>
|
<qtcreator>
|
||||||
<data>
|
<data>
|
||||||
<variable>EnvironmentId</variable>
|
<variable>EnvironmentId</variable>
|
||||||
@ -92,7 +92,7 @@
|
|||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.15.2 clang 64bit</value>
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.15.2 clang 64bit</value>
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.2 clang 64bit</value>
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.2 clang 64bit</value>
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5152.clang_64_kit</value>
|
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5152.clang_64_kit</value>
|
||||||
<value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
|
<value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
|
||||||
<value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
|
<value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
|
||||||
<value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
|
<value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
|
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
|
||||||
@ -245,7 +245,7 @@
|
|||||||
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
|
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
|
||||||
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
|
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
|
||||||
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
|
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
|
||||||
<value type="QString" key="RunConfiguration.WorkingDirectory.default">/Users/shouchih_chen/Documents/namecreater/build-NameCreater-Desktop_Qt_5_15_2_clang_64bit-Debug/NameCreater.app/Contents/MacOS</value>
|
<value type="QString" key="RunConfiguration.WorkingDirectory.default">/Users/shouchih_chen/Documents/namecreater/build-NameCreater-Desktop_Qt_5_15_2_clang_64bit-Release/NameCreater.app/Contents/MacOS</value>
|
||||||
</valuemap>
|
</valuemap>
|
||||||
<value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
|
<value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
|
||||||
</valuemap>
|
</valuemap>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
name_1,bg_type
|
name_1,bg_type
|
||||||
¦ã¤p¨F,r
|
艾小沙,1
|
||||||
®L¤p,g
|
夏小,2
|
||||||
§dÐw,b
|
吳苡需,y
|
||||||
¤¨¤p,y
|
¤¨¤p,y
|
||||||
¦ã¤p,r
|
¦ã¤p,r
|
||||||
®L¤p,g
|
®L¤p,g
|
||||||
@ -10,4 +10,4 @@ name_1,bg_type
|
|||||||
¦ã¤p,r
|
¦ã¤p,r
|
||||||
®L¤p,g
|
®L¤p,g
|
||||||
¦ã¤p,2
|
¦ã¤p,2
|
||||||
®L¤p,1
|
夏小天,1
|
||||||
|
|||||||
|
@ -57,18 +57,18 @@ static QPointF NAME_POS[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static QPointF NAME_POS_NUMBER[] = {
|
static QPointF NAME_POS_NUMBER[] = {
|
||||||
QPointF(240, 410), QPointF(372, 1422),
|
QPointF(240, 370), QPointF(372, 1442),
|
||||||
QPointF(564, 410), QPointF(694, 1422),
|
QPointF(564, 370), QPointF(694, 1442),
|
||||||
QPointF(883, 410), QPointF(1014, 1422),
|
QPointF(883, 370), QPointF(1014, 1442),
|
||||||
QPointF(1205, 410), QPointF(1337, 1402),
|
QPointF(1205, 380), QPointF(1337, 1402),
|
||||||
QPointF(1532, 410), QPointF(1663, 1402),
|
QPointF(1532, 380), QPointF(1663, 1402),
|
||||||
QPointF(1854, 410), QPointF(1987, 1402),
|
QPointF(1854, 410), QPointF(1987, 1402),
|
||||||
QPointF(2176, 410), QPointF(2309, 1402),
|
QPointF(2176, 410), QPointF(2309, 1402),
|
||||||
QPointF(2498, 410), QPointF(2629, 1402),
|
QPointF(2498, 410), QPointF(2629, 1402),
|
||||||
QPointF(2821, 410), QPointF(2952, 1402),
|
QPointF(2821, 410), QPointF(2952, 1402),
|
||||||
QPointF(3145, 410), QPointF(3276, 1402),
|
QPointF(3145, 410), QPointF(3276, 1402),
|
||||||
QPointF(1268, 2012), QPointF(2240, 1880),
|
QPointF(1228, 2012), QPointF(2280, 1880),
|
||||||
QPointF(1268, 2334), QPointF(2240, 2202),
|
QPointF(1228, 2334), QPointF(2280, 2202),
|
||||||
};
|
};
|
||||||
|
|
||||||
static int NAME_POS_COUNT = sizeof(NAME_POS) / sizeof(NAME_POS[0]);
|
static int NAME_POS_COUNT = sizeof(NAME_POS) / sizeof(NAME_POS[0]);
|
||||||
@ -205,9 +205,9 @@ int main(int argc, char* argv[])
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
QImage image(BG_SAMPLE_PATH);
|
/*QImage image(BG_SAMPLE_PATH);
|
||||||
QGraphicsPixmapItem* bgItem = new QGraphicsPixmapItem(QPixmap::fromImage(image));
|
QGraphicsPixmapItem* bgItem = new QGraphicsPixmapItem(QPixmap::fromImage(image));
|
||||||
scene.addItem(bgItem);
|
scene.addItem(bgItem);*/
|
||||||
|
|
||||||
|
|
||||||
for (int n = 0; n < nameList.length(); n++) {
|
for (int n = 0; n < nameList.length(); n++) {
|
||||||
@ -215,9 +215,9 @@ int main(int argc, char* argv[])
|
|||||||
NameInfo_t name_info = nameList.at(n);
|
NameInfo_t name_info = nameList.at(n);
|
||||||
QImage name_image(name_info.bg_path);
|
QImage name_image(name_info.bg_path);
|
||||||
if (idx == 0) {
|
if (idx == 0) {
|
||||||
/*QGraphicsRectItem* bg_item = new QGraphicsRectItem(0, 0, 3508, 2482);
|
QGraphicsRectItem* bg_item = new QGraphicsRectItem(0, 0, 3508, 2482);
|
||||||
bg_item->setBrush(QBrush(QColor(255, 255, 255)));
|
bg_item->setBrush(QBrush(QColor(255, 255, 255)));
|
||||||
scene.addItem(bg_item);*/
|
scene.addItem(bg_item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -310,13 +310,12 @@ int main(int argc, char* argv[])
|
|||||||
QString file_name = QString("%1_.jpg").arg(QString::number(export_times + 1));
|
QString file_name = QString("%1_.jpg").arg(QString::number(export_times + 1));
|
||||||
saveToImage(file_name, &scene);
|
saveToImage(file_name, &scene);
|
||||||
export_times++;
|
export_times++;
|
||||||
view.show();
|
|
||||||
break;
|
scene.clear();
|
||||||
//scene.clear();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
QMessageBox msgBox;
|
QMessageBox msgBox;
|
||||||
msgBox.setText(QString().asprintf("Export Finshed. Count:%d", export_times));
|
msgBox.setText(QString().asprintf("Export Finshed. Count:%d", export_times));
|
||||||
@ -325,5 +324,5 @@ int main(int argc, char* argv[])
|
|||||||
|
|
||||||
|
|
||||||
font_res.close();
|
font_res.close();
|
||||||
return a.exec();
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user