1. update version 2.8.0. 2. change save path dir in customlogo2 in MAC setting.

1. only finish one side name.
2. only finish chinese name and three word name.

.gitignore

@@ -8,4 +8,3 @@
 /buildwed
 /NameCreater/*.aps
 /buildweb/
-/NameCreater/build/*

NameCreater/BirthdayCreater.cpp

@@ -13,7 +13,7 @@
 #define MAX_LABEL_IN_PAPER		10
 #define FONT_PIXEL_SIZE			120
 
-static QPoint LABEL_POS_START = QPoint(163, 70);
+static QPoint LABEL_POS_START = QPoint(163, 115);
 static QPoint NAME_OFFSET_START = QPoint(82, 712);
 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;
 			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;
 			}
 
@@ -191,7 +191,7 @@ void BirthdayCreater::generaImageFromCSV(Name_Type_e type, const QString& filena
 
             int chrismas_y_offset = 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;
             }
 
@@ -203,20 +203,20 @@ void BirthdayCreater::generaImageFromCSV(Name_Type_e type, const QString& filena
 
             for(int i = 0; i < 2; i++){
                 qreal dir = (i == 0) ? -1.0:1.0;
-                qreal x_offset = (i == 0) ? 280.0 : 170.0;
+                qreal x_offset = (i == 0) ? 290.0 : 170.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;
                 //add English world
-                QGraphicsTextItem* eng_word_item = new QGraphicsTextItem(name_info.name_eng,label_item);
+                QGraphicsTextItem* eng_word_item = new QGraphicsTextItem(name_info.name_eng);
                 eng_word_item->setFont(_new_font);
                 QRectF rect = eng_word_item->boundingRect();
                 eng_word_item->setDefaultTextColor(font_color);
 
                 eng_word_item->setRotation(i == 0 ? 90 : -90);
-                eng_word_item->setPos(x_offset - rect.height()/2.0, y_offset + sp_y_offset + (rect.width()/2*dir));
+                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));
 
 
-                //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;
 			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;
 			}
 

NameCreater/INameCreater.cpp

@@ -23,42 +23,33 @@ INameCreater::~INameCreater()
 
 void INameCreater::saveToImage(const QString& filename, QGraphicsScene* scene)
 {
-    scene->clearSelection();                                                  // Selections would also render to the file
-    scene->setSceneRect(scene->itemsBoundingRect());                          // Re-shrink the scene to it's bounding contents
-    QImage image(scene->sceneRect().size().toSize(), QImage::Format_ARGB32);  // Create the image with the exact size of the shrunk scene
-    image.fill(Qt::transparent);                                              // Start all pixels transparent
-    int dpm = 300 / 0.0254; // ~300 DPI
-    image.setDotsPerMeterX(dpm);
-    image.setDotsPerMeterY(dpm);
-
-
-    QPainter painter(&image);
-    scene->render(&painter);
+	scene->clearSelection();                                                  // Selections would also render to the file
+	scene->setSceneRect(scene->itemsBoundingRect());                          // Re-shrink the scene to it's bounding contents
+	QImage image(scene->sceneRect().size().toSize(), QImage::Format_ARGB32);  // Create the image with the exact size of the shrunk scene
+	image.fill(Qt::transparent);                                              // Start all pixels transparent
+	int dpm = 300 / 0.0254; // ~300 DPI
+	image.setDotsPerMeterX(dpm);
+	image.setDotsPerMeterY(dpm);
 
 
+	QPainter painter(&image);
+	scene->render(&painter);
 
 #ifdef Q_OS_MAC
-    QString folder_name = QCoreApplication::applicationDirPath() + "/../../../export_" + QDateTime::currentDateTime().toString("yyyyMMdd");
-    qDebug() << "app director path" <<QCoreApplication::applicationDirPath();
+	QString folder_name = QCoreApplication::applicationDirPath() + "/../../../export_" + QDateTime::currentDateTime().toString("yyyyMMdd");
 #else
-    QString folder_name = "./";//QCoreApplication::applicationDirPath() + "/export_" + QDateTime::currentDateTime().toString("yyyyMMdd");
+	QString folder_name = QCoreApplication::applicationDirPath() + "/export_" + QDateTime::currentDateTime().toString("yyyyMMdd");
 #endif
 
-    QString savePath = folder_name.append(filename);
+	image.save(filename, "JPEG");
 
-#ifdef Q_OS_WASM
-    QByteArray imageData;
-    QBuffer buffer(&imageData);
-    buffer.open(QIODevice::WriteOnly);
-    QPixmap pixmap = QPixmap::fromImage(image);
-    pixmap.save(&buffer, "JPEG", 100); // You can also use other formats like "JPEG" or "BMP"
+	QByteArray imageData;
+	QBuffer buffer(&imageData);
+	buffer.open(QIODevice::WriteOnly);
+	QPixmap pixmap = QPixmap::fromImage(image);
+	pixmap.save(&buffer, "JPEG", 100); // You can also use other formats like "JPEG" or "BMP"
 
-    QFileDialog::saveFileContent(imageData, savePath);
-#else
-
-    qDebug()<<"image save path:" << savePath;
-    image.save(savePath, "JPEG");
-#endif
+    QFileDialog::saveFileContent(imageData, filename);
 
 }
 
@@ -177,5 +168,3 @@ int INameCreater::getFontSizebyStr(const QFont& font, int max_font_size,int max_
 
 	return font_size;
 }
-
-

NameCreater/INameCreater.h

@@ -3,13 +3,10 @@
 #include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QGraphicsRectItem>
-#include <QCoreApplication>
 
 #define BG_WIDTH	3508
 #define BG_HEIGHT	2481
 
-
-
 struct NameInfo_t {
 	QString name1;
 	QString name2;
@@ -37,9 +34,9 @@ public:
 	QFont EnglisthFont() const {
 		return eng_Font;
 	}
-    void saveToImage(const QString& filename, QGraphicsScene* scene);
-protected:
 
+protected:
+	void saveToImage(const QString& filename, QGraphicsScene* scene);
 	QList<NameInfo_t> getNameByFile(Name_Type_e type, const QString& filename);
 	QList<NameInfo_t> getNameByFileContent(Name_Type_e type, const QByteArray& conetent);
 

NameCreater/NameCreater.cpp

@@ -11,11 +11,6 @@
 #include <QDateTime>
 #include <QBuffer>
 #include <QRegularExpression>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QComboBox>
-
 
 #include "FiveToSingle.h"
 #include "BirthdayCreater.h"
@@ -23,7 +18,6 @@
 #include "NewFiveCreater.h"
 #include "HKHolderCreater.h"
 #include "customlogo.h"
-#include "customlogo2.h"
 
 
 #define TOWEL_FONT_PATH  ":/NameCreater/_exp/W1.ttc"
@@ -31,292 +25,174 @@
 
 #define FONT_SIZE 120
 
-//#define FONT_CHT_URL "https://bazaar1688.ddns.net/font/TaiwanPearl-SemiBold.ttf"
-
-#define FONT_JSON_URL "https://namecreater.bazaar1688.duckdns.org/font/fonts.json"
+#define FONT_CHT_URL "https://bazaar1688.ddns.net/font/TaiwanPearl-SemiBold.ttf"
 
 //#define FONT_CHT_URL "http://45.32.51.135/font/TaiwanPearl-SemiBold.ttf"
 
-static CustomLogo* s_custom_logo_widget = nullptr;
-
-NameCreater::NameCreater(QWidget* parent)
-	: QMainWindow(parent)
+NameCreater::NameCreater(QWidget *parent)
+    : QMainWindow(parent),custom2(NULL)
 {
-	ui.setupUi(this);
+    ui.setupUi(this);
+    connect(ui.fivesingle_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
+    //connect(ui.fiveold_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
+    connect(ui.birthday_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
+    connect(ui.towel_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
+    connect(ui.fivenew_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
+    connect(ui.birthday_zh_eng_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
+    connect(ui.birthday_eng_eng_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
+    connect(ui.handkerchief_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
+    connect(ui.fivesingle_zh_eng_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
+    connect(ui.customlogo_btn, &QPushButton::released, this , &NameCreater::OnClickedCustomLogoBtn);
+    connect(ui.customlogo2_btn, &QPushButton::released, this, &NameCreater::OnClickedCustomLogo2Btn);
 
+    //qDebug()<<"QSslSocket="<<QSslSocket::sslLibraryBuildVersionString();
 
-	ui.scrollAreaWidgetContents->setMinimumSize(ui.frame->size());
+    connect(&network_mgr, &QNetworkAccessManager::finished, this, &NameCreater::onFontDownloadFinished);
+    network_mgr.get(QNetworkRequest(QUrl(FONT_CHT_URL)));
 
-	connect(ui.fivesingle_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
-	//connect(ui.fiveold_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
-	connect(ui.birthday_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
-	connect(ui.towel_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
-	connect(ui.fivenew_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
-	connect(ui.birthday_zh_eng_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
-	connect(ui.birthday_eng_eng_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
-	connect(ui.handkerchief_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
-	connect(ui.fivesingle_zh_eng_btn, &QPushButton::released, this, &NameCreater::OnClickedReadBtn);
-	connect(ui.customlogo_btn, &QPushButton::released, this, &NameCreater::OnClickedCustomLogoBtn);
-	connect(ui.customlogo2_btn, &QPushButton::released, this, &NameCreater::OnClickedCustomLogo2Btn);
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-	connect(ui.font_comboBox, &QComboBox::currentTextChanged, this, &NameCreater::OnFontComboBoxTextChanged);
-#else
-	connect(ui.font_comboBox, &QComboBox::currentIndexChanged, this, &NameCreater::OnFontComboBoxIndexChanged);
-#endif
-	//qDebug()<<"QSslSocket="<<QSslSocket::sslLibraryBuildVersionString();
-
-	connect(&network_mgr, &QNetworkAccessManager::finished, this, &NameCreater::onFontDownloadFinished);
-
-	query_type = 10;
-	query(QUrl(FONT_JSON_URL), 10);
+    ;
 
 }
 
-NameCreater::~NameCreater()
-{
+void NameCreater::loadFont(const QByteArray& fontdata){
 
-}
+    int id = QFontDatabase::addApplicationFontFromData(fontdata);
+    QStringList family_list = QFontDatabase::applicationFontFamilies(id);
+    qDebug()<<"font family list:" <<family_list;
+    QString cht_fontname = family_list.at(0);
 
-void NameCreater::parseFontJson(const QByteArray& data)
-{
-	QJsonDocument jsonDoc = QJsonDocument::fromJson(data);
+    font = QFont(cht_fontname);
+    font.setPixelSize(FONT_SIZE);
 
-	if (jsonDoc.isNull()) {
-		qDebug() << "Failed to create JSON doc.";
-		return;
-	}
+    QString font_path = QString(TOWEL_FONT_PATH);
+    QFile font_res_towel(font_path);
+    if (!font_res_towel.open(QIODevice::ReadOnly)) {
+        QMessageBox msgBox;
+        msgBox.setText("Can not load font file!" + font_path);
+        msgBox.exec();
+        font_res_towel.close();
+    }
 
-	if (jsonDoc.isObject()) {
-		QJsonObject jsonObj = jsonDoc.object();
-		// Process the JSON object
-		qDebug() << "JSON Object:" << jsonObj;
-	}
-	else if (jsonDoc.isArray()) {
-		ui.font_comboBox->clear();
-		QJsonArray jsonArray = jsonDoc.array();
-
-		foreach(auto val, jsonArray) {
-			auto obj = val.toObject();
-			QString n = obj["font_name"].toString();
-			QString u = obj["font_url"].toString();
-			ui.font_comboBox->addItem(n, u);
-		}
-
-		// Process the JSON array
-		qDebug() << "JSON Array:" << jsonArray;
+    id = QFontDatabase::addApplicationFontFromData(font_res_towel.readAll());
+    font_towel = QFont(QFontDatabase::applicationFontFamilies(id).at(0));
+    font_towel.setPixelSize(240);
+    font_towel.setLetterSpacing(QFont::PercentageSpacing, 42);
 
 
+    font_path = QString(ENGLISH_FONT_PATH);
+    QFile font_res_eng(font_path);
+    if (!font_res_eng.open(QIODevice::ReadOnly)) {
+        QMessageBox msgBox;
+        msgBox.setText("Can not load font file!" + font_path);
+        msgBox.exec();
+        font_res_eng.close();
+    }
+
+    id = QFontDatabase::addApplicationFontFromData(font_res_eng.readAll());
+    font_english = QFont(QFontDatabase::applicationFontFamilies(id).at(0));
 
 
-	}
+    font_color = QColor(0, 0, 0);
 
+    QFont tital_font = QFont(font);
+    tital_font.setPixelSize(20);
 
-}
+    QFont version_font = QFont(font);
+    version_font.setPixelSize(12);
 
-void NameCreater::query(const QUrl& url, int type)
-{
-	QNetworkRequest req(url);
-	req.setAttribute(QNetworkRequest::User, QVariant(type));
-	network_mgr.get(req);
+    //ui.tital_label->setFont(tital_font);
 
+    char c_font_name[64] = {0};
+    sprintf(c_font_name,"%s", cht_fontname.toStdString().c_str());
+    ui.font_name_label->setFont(version_font);
+    ui.font_name_label->setText(QString::fromLocal8Bit(c_font_name));
 
-}
+    ui.version_label->setFont(version_font);
+    ui.version_label->setText(VERSION);
 
-void NameCreater::loadFont(const QByteArray& fontdata) {
-
-	int id = QFontDatabase::addApplicationFontFromData(fontdata);
-	QStringList family_list = QFontDatabase::applicationFontFamilies(id);
-	qDebug() << "font family list:" << family_list;
-	QString cht_fontname = family_list.at(0);
-
-	font = QFont(cht_fontname);
-	font.setPixelSize(FONT_SIZE);
-
-	QString font_path = QString(TOWEL_FONT_PATH);
-	QFile font_res_towel(font_path);
-	if (!font_res_towel.open(QIODevice::ReadOnly)) {
-		QMessageBox msgBox;
-		msgBox.setText("Can not load font file!" + font_path);
-		msgBox.exec();
-		font_res_towel.close();
-	}
-
-	id = QFontDatabase::addApplicationFontFromData(font_res_towel.readAll());
-	font_towel = QFont(QFontDatabase::applicationFontFamilies(id).at(0));
-	font_towel.setPixelSize(240);
-	font_towel.setLetterSpacing(QFont::PercentageSpacing, 42);
-
-
-	font_path = QString(ENGLISH_FONT_PATH);
-	QFile font_res_eng(font_path);
-	if (!font_res_eng.open(QIODevice::ReadOnly)) {
-		QMessageBox msgBox;
-		msgBox.setText("Can not load font file!" + font_path);
-		msgBox.exec();
-		font_res_eng.close();
-	}
-
-	id = QFontDatabase::addApplicationFontFromData(font_res_eng.readAll());
-	font_english = QFont(QFontDatabase::applicationFontFamilies(id).at(0));
-
-
-	font_color = QColor(0, 0, 0);
-
-	QFont tital_font = QFont(font);
-	tital_font.setPixelSize(20);
-
-	QFont version_font = QFont(font);
-	version_font.setPixelSize(12);
-
-	//ui.tital_label->setFont(tital_font);
-
-	char c_font_name[64] = { 0 };
-	sprintf(c_font_name, "%s", cht_fontname.toStdString().c_str());
-	ui.font_name_label->setFont(version_font);
-	ui.font_name_label->setText(QString::fromLocal8Bit(c_font_name));
-
-	ui.version_label->setFont(version_font);
-	ui.version_label->setText(VERSION);
-	ui.font_comboBox->setFont(version_font);
-
-	QList<QLabel*> titals = findChildren<QLabel*>(QRegularExpression("tital_label"));
-	foreach(auto tital, titals) {
-		tital->setFont(tital_font);
-	}
-
-	qDebug() << "Load Font Succeed!";
+    QList<QLabel*> titals =  findChildren<QLabel*>(QRegularExpression("tital_label"));
+    foreach(auto tital, titals) {
+        tital->setFont(tital_font);
+    }
 
 }
 
 
 void NameCreater::OnClickedReadBtn() {
-	auto sender = (QPushButton*)QObject::sender();
+    auto sender =(QPushButton*) QObject::sender();
 
-#ifdef Q_OS_WASM
+    auto fileContentReady = [this, sender](const QString &fileName, const QByteArray &fileContent) {
+        if (fileName.isEmpty()) {
+            // No file was selected
+        }
+        else {
+            // Use fileName and fileContent
+            if(sender == ui.fivesingle_btn) FiveToSingle().generaImageFromCSV(Name_Type_e::Name_zh,fileName, fileContent, this->font, this->font_color);
             
-	auto fileContentReady = [this, sender](const QString& fileName, const QByteArray& fileContent) {
-		if (!fileName.isEmpty()) {
-			this->execCreater(sender, fileName, fileContent);
-		}
+            if(sender == ui.birthday_btn) BirthdayCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font, this->font_color);
+            if(sender == ui.fivenew_btn) NewFiveCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font, this->font_color);
+            if(sender == ui.towel_btn) TowelCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font_towel, this->font_color);
+            if (sender == ui.birthday_zh_eng_btn) {
+                BirthdayCreater creater;
+                creater.setEnglishFont(font_english);
+                creater.generaImageFromCSV(Name_Type_e::Name_zh_eng, fileName, fileContent, this->font, this->font_color);
+            }
+            if (sender == ui.birthday_eng_eng_btn){
+                BirthdayCreater b;
+                b.setEnglishFont(font_english);
+                b.generaImageFromCSV(Name_Type_e::Name_eng, fileName,fileContent,this->font, this->font_color);
+            }
+            if (sender == ui.handkerchief_btn) {
+                QFont newFont(font);
+                newFont.setPixelSize(78);
+                QColor newColor(0,0,0);
+                HKHolderCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, newFont, newColor);
+            }
+            if (sender == ui.fivesingle_zh_eng_btn) {
+                FiveToSingle f;
+                f.setEnglishFont(this->font_english);
+                f.generaImageFromCSV(Name_Type_e::Name_zh_eng, fileName, fileContent, this->font, this->font_color);
+                return;
+            }
 
-		};
-	QFileDialog::getOpenFileContent("CSV (*.csv)", fileContentReady);
-
-#else
-	QString filename = QFileDialog::getOpenFileName(nullptr, "Open Name File", QDir::currentPath(), "CSV file(*.csv)");
-	if (!filename.isEmpty()) {
-		QFile _f(filename);
-		if (_f.open(QIODevice::ReadOnly)) {
-			execCreater(sender, filename, _f.readAll());
-		}
-	}
-#endif
+        }
+    };
+    QFileDialog::getOpenFileContent("CSV (*.csv)", fileContentReady);
 }
 
-void NameCreater::execCreater(QObject* sender, const QString& fileName, const QByteArray& fileContent) {
-
-
-	// Use fileName and fileContent
-	if (sender == ui.fivesingle_btn) FiveToSingle().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font, this->font_color);
-
-	if (sender == ui.birthday_btn) BirthdayCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font, this->font_color);
-	if (sender == ui.fivenew_btn) NewFiveCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font, this->font_color);
-	if (sender == ui.towel_btn) TowelCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, this->font_towel, this->font_color);
-	if (sender == ui.birthday_zh_eng_btn) {
-		BirthdayCreater creater;
-		creater.setEnglishFont(font_english);
-		creater.generaImageFromCSV(Name_Type_e::Name_zh_eng, fileName, fileContent, this->font, this->font_color);
-	}
-	if (sender == ui.birthday_eng_eng_btn) {
-		BirthdayCreater b;
-		b.setEnglishFont(font_english);
-		b.generaImageFromCSV(Name_Type_e::Name_eng, fileName, fileContent, this->font, this->font_color);
-	}
-	if (sender == ui.handkerchief_btn) {
-		QFont newFont(font);
-		newFont.setPixelSize(78);
-		QColor newColor(0, 0, 0);
-		HKHolderCreater().generaImageFromCSV(Name_Type_e::Name_zh, fileName, fileContent, newFont, newColor);
-	}
-	if (sender == ui.fivesingle_zh_eng_btn) {
-		FiveToSingle f;
-		f.setEnglishFont(this->font_english);
-		f.generaImageFromCSV(Name_Type_e::Name_zh_eng, fileName, fileContent, this->font, this->font_color);
-		return;
-	}
-
-}
-
-
-
 void NameCreater::OnClickedCustomLogoBtn() {
-	//QEventLoop loop;
-	if (s_custom_logo_widget == nullptr) {
-		s_custom_logo_widget = new CustomLogo(&this->font);
-	}
-	s_custom_logo_widget->show();
-
-	//connect(&widget, &CustomLogo::finished, &loop, &QEventLoop::quit);
-	//loop.exec();
+    QEventLoop loop;
+    CustomLogo widget(&this->font);
+    widget.show();
+    connect(&widget, &CustomLogo::finished, &loop, &QEventLoop::quit);
+    loop.exec();
+    qDebug()<<"exit event loop";
 
 }
 
-void NameCreater::OnClickedCustomLogo2Btn() {
-	QEventLoop loop;
-	customlogo2 widget(&this->font);
-	connect(&widget, &CustomLogo::finished, &loop, &QEventLoop::quit);
-	widget.show();
-	loop.exec();
+void NameCreater::OnClickedCustomLogo2Btn(){
+    if (custom2 == NULL){
+        custom2 = new customlogo2(&this->font);
+    }
+    custom2->show();
 }
 
-void NameCreater::onFontDownloadFinished(QNetworkReply* reply) {
+void NameCreater::onFontDownloadFinished(QNetworkReply *reply){
 
-	if (reply->error() == QNetworkReply::NoError) {
-		QString url = reply->request().url().toString();
-		int attri = reply->request().attribute(QNetworkRequest::User).toInt();
+    if(reply->error() == QNetworkReply::NoError){
+        //do somthine
+        loadFont(reply->readAll());
+        qDebug()<<"Load Font Succeed!";
 
-		qDebug() << "req url:" << url << "attribi:" << QString::number(attri);
+    }else{
 
-		if (url.contains("fonts.json") || attri == 10 || query_type == 10) {
-			qDebug() << "query fonts json succeed";
-			parseFontJson(reply->readAll());
-
-		}else if (url.contains(".ttf") || url.contains(".otf") || attri == 20 || query_type == 20) {
-			qDebug() << "query font family succeed";
-			loadFont(reply->readAll());
-		}
-
-	}
-	else {
-
-		QMessageBox msgBox;
-		msgBox.setText("Can not load font file!" + reply->errorString());
-		msgBox.exec();
-		reply->deleteLater();
+        QMessageBox msgBox;
+        msgBox.setText("Can not load font file!" + reply->errorString());
+        msgBox.exec();
+        reply->deleteLater();
 
 
-		return;
-	}
+        return ;
+    }
 
 }
-
-void NameCreater::OnFontComboBoxTextChanged(const QString& str)
-{
-	QComboBox* sender = (QComboBox*)QObject::sender();
-	QString u = sender->currentData().toString();
-	query_type = 20;
-	query(QUrl(u),20);
-}
-
-void NameCreater::OnFontComboBoxIndexChanged(int idx)
-{
-	QComboBox* sender = (QComboBox*)QObject::sender();
-	QString u = sender->currentData().toString();
-	query_type = 20;
-	query(QUrl(u),20);
-}
-
-
-
-

NameCreater/NameCreater.h

@@ -7,9 +7,7 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 
-
-
-
+#include "customlogo2.h"
 
 class NameCreater : public QMainWindow
 {
@@ -17,33 +15,21 @@ class NameCreater : public QMainWindow
 
 public:
     NameCreater(QWidget *parent = Q_NULLPTR);
-    ~NameCreater();
 
 private:
     Ui::NameCreaterClass ui;
-   
-  
 	QFont font, font_towel, font_english;
 
-
 	QColor font_color;
 
+    customlogo2 *custom2;
+
     QNetworkAccessManager network_mgr;
-    int query_type;
-
-    void query(const QUrl& url, int type = -1);
-
     void loadFont(const QByteArray& fontdata);
-    void execCreater(QObject*sender, const QString&fileName, const QByteArray &fileContent);
-    void parseFontJson(const QByteArray& data);
 
 	private Q_SLOTS:
 	void OnClickedReadBtn();
     void OnClickedCustomLogoBtn();
     void OnClickedCustomLogo2Btn();
     void onFontDownloadFinished(QNetworkReply *reply);
-
-    void OnFontComboBoxTextChanged(const QString& str);
-    void OnFontComboBoxIndexChanged(int idx);
-
 };

NameCreater/NameCreater.pro

@@ -21,7 +21,6 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 
 wasm-emscripten{
     QMAKE_LFLAGS+= -s TOTAL_MEMORY=67108864
-    QMAKE_LFLAGS += -s ALLOW_MEMORY_GROWTH=1
 }
-
+#QMAKE_LFLAGS += -s ALLOW_MEMORY_GROWTH=1
 

NameCreater/NameCreater.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>902</width>
-    <height>780</height>
+    <width>946</width>
+    <height>694</height>
    </rect>
   </property>
   <property name="font">
@@ -25,519 +25,475 @@
 	background-color: rgb(0, 0, 0);
 }</string>
    </property>
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <item>
-     <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,10">
-      <property name="spacing">
-       <number>100</number>
-      </property>
-      <property name="sizeConstraint">
-       <enum>QLayout::SetDefaultConstraint</enum>
-      </property>
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="version_label">
-        <property name="font">
-         <font>
-          <family>Yu Gothic UI</family>
-          <pointsize>10</pointsize>
-          <weight>50</weight>
-          <italic>false</italic>
-          <bold>false</bold>
-         </font>
-        </property>
-        <property name="styleSheet">
-         <string notr="true">color: rgb(255, 255, 255);
+   <widget class="QLabel" name="version_label">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>10</y>
+      <width>171</width>
+      <height>16</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Yu Gothic UI</family>
+      <pointsize>10</pointsize>
+      <weight>50</weight>
+      <italic>false</italic>
+      <bold>false</bold>
+     </font>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">color: rgb(255, 255, 255);
 </string>
-        </property>
-        <property name="text">
-         <string>v1.0.0</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="font_name_label">
-        <property name="font">
-         <font>
-          <family>Yu Gothic UI</family>
-          <pointsize>10</pointsize>
-          <weight>50</weight>
-          <italic>false</italic>
-          <bold>false</bold>
-         </font>
-        </property>
-        <property name="styleSheet">
-         <string notr="true">color: rgb(255, 255, 255);
-</string>
-        </property>
-        <property name="text">
-         <string>font_name</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="font_comboBox">
-        <property name="minimumSize">
-         <size>
-          <width>200</width>
-          <height>0</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </item>
-    <item>
-     <widget class="QScrollArea" name="scrollArea">
-      <property name="styleSheet">
-       <string notr="true"/>
-      </property>
-      <property name="frameShape">
-       <enum>QFrame::NoFrame</enum>
-      </property>
-      <property name="sizeAdjustPolicy">
-       <enum>QAbstractScrollArea::AdjustToContents</enum>
-      </property>
-      <property name="widgetResizable">
-       <bool>true</bool>
-      </property>
-      <widget class="QWidget" name="scrollAreaWidgetContents">
-       <property name="geometry">
-        <rect>
-         <x>0</x>
-         <y>0</y>
-         <width>884</width>
-         <height>734</height>
-        </rect>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">QWidget#scrollAreaWidgetContents{
-	background-color: rgb(0, 0, 0);
-}</string>
-       </property>
-       <widget class="QFrame" name="frame">
-        <property name="geometry">
-         <rect>
-          <x>0</x>
-          <y>0</y>
-          <width>861</width>
-          <height>681</height>
-         </rect>
-        </property>
-        <property name="styleSheet">
-         <string notr="true">QFrame#frame{
+    </property>
+    <property name="text">
+     <string>v1.0.0</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+    </property>
+   </widget>
+   <widget class="QFrame" name="frame">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>40</y>
+      <width>851</width>
+      <height>681</height>
+     </rect>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">QFrame#frame{
 border: 3px solid #FFFFFF;
 border-color: rgb(255, 255, 255);
 
 }</string>
-        </property>
-        <property name="frameShape">
-         <enum>QFrame::StyledPanel</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-        <layout class="QGridLayout" name="gridLayout">
-         <item row="7" column="0">
-          <widget class="QLabel" name="tital_label_7">
-           <property name="font">
-            <font>
-             <family>Yu Gothic UI</family>
-             <pointsize>20</pointsize>
-             <weight>50</weight>
-             <italic>false</italic>
-             <bold>false</bold>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">
+    </property>
+    <property name="frameShape">
+     <enum>QFrame::StyledPanel</enum>
+    </property>
+    <property name="frameShadow">
+     <enum>QFrame::Raised</enum>
+    </property>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="4" column="0">
+      <widget class="QPushButton" name="birthday_btn">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>76</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Open File</string>
+       </property>
+      </widget>
+     </item>
+     <item row="9" column="0">
+      <widget class="QLabel" name="tital_label_9">
+       <property name="font">
+        <font>
+         <family>Yu Gothic UI</family>
+         <pointsize>20</pointsize>
+         <weight>50</weight>
+         <italic>false</italic>
+         <bold>false</bold>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">
 color: rgb(255, 255, 255);
 </string>
-           </property>
-           <property name="text">
-            <string>生日禮產生器(英/英)</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="0">
-          <widget class="QPushButton" name="birthday_zh_eng_btn">
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>76</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Open File</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="0">
-          <widget class="QLabel" name="tital_label_4">
-           <property name="font">
-            <font>
-             <family>Yu Gothic UI</family>
-             <pointsize>20</pointsize>
-             <weight>50</weight>
-             <italic>false</italic>
-             <bold>false</bold>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">
+       </property>
+       <property name="text">
+        <string>客製底圖產生器</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="0">
+      <widget class="QLabel" name="tital_label_7">
+       <property name="font">
+        <font>
+         <family>Yu Gothic UI</family>
+         <pointsize>20</pointsize>
+         <weight>50</weight>
+         <italic>false</italic>
+         <bold>false</bold>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">
 color: rgb(255, 255, 255);
 </string>
-           </property>
-           <property name="text">
-            <string>生日禮產生器</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="1">
-          <widget class="QPushButton" name="fivesingle_zh_eng_btn">
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>76</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Open File</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="tital_label_3">
-           <property name="font">
-            <font>
-             <family>Yu Gothic UI</family>
-             <pointsize>20</pointsize>
-             <weight>50</weight>
-             <italic>false</italic>
-             <bold>false</bold>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">color: rgb(255, 255, 255);
-</string>
-           </property>
-           <property name="text">
-            <string>五入組產生器</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="9" column="0">
-          <widget class="QLabel" name="tital_label_9">
-           <property name="font">
-            <font>
-             <family>Yu Gothic UI</family>
-             <pointsize>20</pointsize>
-             <weight>50</weight>
-             <italic>false</italic>
-             <bold>false</bold>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">
+       </property>
+       <property name="text">
+        <string>生日禮產生器(英/英)</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="tital_label_6">
+       <property name="font">
+        <font>
+         <family>Yu Gothic UI</family>
+         <pointsize>20</pointsize>
+         <weight>50</weight>
+         <italic>false</italic>
+         <bold>false</bold>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">
 color: rgb(255, 255, 255);
 </string>
-           </property>
-           <property name="text">
-            <string>客製底圖產生器</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="8" column="0">
-          <widget class="QPushButton" name="birthday_eng_eng_btn">
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>76</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Open File</string>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="1">
-          <widget class="QLabel" name="tital_label_5">
-           <property name="font">
-            <font>
-             <family>Yu Gothic UI</family>
-             <pointsize>20</pointsize>
-             <weight>50</weight>
-             <italic>false</italic>
-             <bold>false</bold>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">color: rgb(255, 255, 255);
-</string>
-           </property>
-           <property name="text">
-            <string>小方巾產生器</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="0">
-          <widget class="QLabel" name="tital_label_6">
-           <property name="font">
-            <font>
-             <family>Yu Gothic UI</family>
-             <pointsize>20</pointsize>
-             <weight>50</weight>
-             <italic>false</italic>
-             <bold>false</bold>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">
+       </property>
+       <property name="text">
+        <string>生日禮產生器(中/英)</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QPushButton" name="fivesingle_btn">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>76</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Open File</string>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="0">
+      <widget class="QPushButton" name="birthday_eng_eng_btn">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>76</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Open File</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QPushButton" name="fivenew_btn">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>76</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Open File</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QPushButton" name="fivesingle_zh_eng_btn">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>76</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Open File</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="tital_label_4">
+       <property name="font">
+        <font>
+         <family>Yu Gothic UI</family>
+         <pointsize>20</pointsize>
+         <weight>50</weight>
+         <italic>false</italic>
+         <bold>false</bold>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">
 color: rgb(255, 255, 255);
 </string>
-           </property>
-           <property name="text">
-            <string>生日禮產生器(中/英)</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="0">
-          <widget class="QPushButton" name="birthday_btn">
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>76</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Open File</string>
-           </property>
-          </widget>
-         </item>
-         <item row="8" column="1">
-          <widget class="QPushButton" name="handkerchief_btn">
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>76</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Open File</string>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="1">
-          <widget class="QPushButton" name="towel_btn">
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>76</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Open File</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1">
-          <widget class="QPushButton" name="fivesingle_btn">
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>76</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Open File</string>
-           </property>
-          </widget>
-         </item>
-         <item row="10" column="0">
-          <widget class="QPushButton" name="customlogo_btn">
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>76</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Open Dialog</string>
-           </property>
-          </widget>
-         </item>
-         <item row="10" column="1">
-          <widget class="QPushButton" name="customlogo2_btn">
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>76</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Open Dialog</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QLabel" name="tital_label">
-           <property name="font">
-            <font>
-             <family>Yu Gothic UI</family>
-             <pointsize>20</pointsize>
-             <weight>50</weight>
-             <italic>false</italic>
-             <bold>false</bold>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">color: rgb(255, 255, 255);
+       </property>
+       <property name="text">
+        <string>生日禮產生器</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLabel" name="tital_label">
+       <property name="font">
+        <font>
+         <family>Yu Gothic UI</family>
+         <pointsize>20</pointsize>
+         <weight>50</weight>
+         <italic>false</italic>
+         <bold>false</bold>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">color: rgb(255, 255, 255);
 </string>
-           </property>
-           <property name="text">
-            <string>五入組拆成單入產生器</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="0">
-          <widget class="QPushButton" name="fivenew_btn">
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>76</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Open File</string>
-           </property>
-          </widget>
-         </item>
-         <item row="9" column="1">
-          <widget class="QLabel" name="tital_label_10">
-           <property name="font">
-            <font>
-             <family>Yu Gothic UI</family>
-             <pointsize>20</pointsize>
-             <weight>50</weight>
-             <italic>false</italic>
-             <bold>false</bold>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">
-color: rgb(255, 255, 255);
+       </property>
+       <property name="text">
+        <string>五入組拆成單入產生器</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="0">
+      <widget class="QPushButton" name="birthday_zh_eng_btn">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>76</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Open File</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QLabel" name="tital_label_2">
+       <property name="font">
+        <font>
+         <family>Yu Gothic UI</family>
+         <pointsize>20</pointsize>
+         <weight>50</weight>
+         <italic>false</italic>
+         <bold>false</bold>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">color: rgb(255, 255, 255);
 </string>
-           </property>
-           <property name="text">
-            <string>扶輪社</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="1">
-          <widget class="QLabel" name="tital_label_2">
-           <property name="font">
-            <font>
-             <family>Yu Gothic UI</family>
-             <pointsize>20</pointsize>
-             <weight>50</weight>
-             <italic>false</italic>
-             <bold>false</bold>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">color: rgb(255, 255, 255);
+       </property>
+       <property name="text">
+        <string>五入組拆成單入產生器(中/英)</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="QPushButton" name="towel_btn">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>76</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Open File</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="tital_label_3">
+       <property name="font">
+        <font>
+         <family>Yu Gothic UI</family>
+         <pointsize>20</pointsize>
+         <weight>50</weight>
+         <italic>false</italic>
+         <bold>false</bold>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">color: rgb(255, 255, 255);
 </string>
-           </property>
-           <property name="text">
-            <string>五入組拆成單入產生器(中/英)</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="7" column="1">
-          <widget class="QLabel" name="tital_label_8">
-           <property name="font">
-            <font>
-             <family>Yu Gothic UI</family>
-             <pointsize>20</pointsize>
-             <weight>50</weight>
-             <italic>false</italic>
-             <bold>false</bold>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">
+       </property>
+       <property name="text">
+        <string>五入組產生器</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="QLabel" name="tital_label_5">
+       <property name="font">
+        <font>
+         <family>Yu Gothic UI</family>
+         <pointsize>20</pointsize>
+         <weight>50</weight>
+         <italic>false</italic>
+         <bold>false</bold>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">color: rgb(255, 255, 255);
+</string>
+       </property>
+       <property name="text">
+        <string>小方巾產生器</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="1">
+      <widget class="QPushButton" name="handkerchief_btn">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>76</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Open File</string>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="1">
+      <widget class="QLabel" name="tital_label_8">
+       <property name="font">
+        <font>
+         <family>Yu Gothic UI</family>
+         <pointsize>20</pointsize>
+         <weight>50</weight>
+         <italic>false</italic>
+         <bold>false</bold>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">
 color: rgb(250, 250, 250);
 </string>
-           </property>
-           <property name="text">
-            <string>手帕夾產生器</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
+       </property>
+       <property name="text">
+        <string>手帕夾產生器</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
       </widget>
-     </widget>
-    </item>
-   </layout>
+     </item>
+     <item row="10" column="0">
+      <widget class="QPushButton" name="customlogo_btn">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>76</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Open Dialog</string>
+       </property>
+      </widget>
+     </item>
+     <item row="10" column="1">
+      <widget class="QPushButton" name="customlogo2_btn">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>76</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Open Dialog</string>
+       </property>
+      </widget>
+     </item>
+     <item row="9" column="1">
+      <widget class="QLabel" name="tital_label_10">
+       <property name="font">
+        <font>
+         <family>Yu Gothic UI</family>
+         <pointsize>20</pointsize>
+         <weight>50</weight>
+         <italic>false</italic>
+         <bold>false</bold>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">
+color: rgb(255, 255, 255);
+</string>
+       </property>
+       <property name="text">
+        <string>扶輪社</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+   <widget class="QLabel" name="font_name_label">
+    <property name="geometry">
+     <rect>
+      <x>230</x>
+      <y>10</y>
+      <width>171</width>
+      <height>16</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Yu Gothic UI</family>
+      <pointsize>10</pointsize>
+      <weight>50</weight>
+      <italic>false</italic>
+      <bold>false</bold>
+     </font>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">color: rgb(255, 255, 255);
+</string>
+    </property>
+    <property name="text">
+     <string>font_name</string>
+    </property>
+    <property name="alignment">
+     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+    </property>
+   </widget>
   </widget>
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>946</width>
+     <height>24</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QToolBar" name="mainToolBar">
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
+  <widget class="QStatusBar" name="statusBar"/>
   <action name="actionOpen_File">
    <property name="text">
     <string>Open File</string>

NameCreater/NameCreater.vcxproj

@@ -21,30 +21,28 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B66B108B-6DA8-408D-936D-988FF8B6B722}</ProjectGuid>
     <Keyword>QtVS_v304</Keyword>
-    <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Debug|Win32'">10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Debug|Win32'">10.0.16299.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">10.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Release|Win32'">10.0.16299.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)'=='Release|x64'">10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)'=='Release|x64'">10.0.19041.0</WindowsTargetPlatformVersion>
     <QtMsBuild Condition="'$(QtMsBuild)'=='' OR !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
@@ -52,11 +50,11 @@
   </ImportGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|Win32'" Label="QtSettings">
     <QtInstall>5.15.2_msvc2019_64</QtInstall>
-    <QtModules>core;gui;widgets;network</QtModules>
+    <QtModules>core;gui;widgets</QtModules>
     <QtBuildConfig>debug</QtBuildConfig>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="QtSettings">
-    <QtInstall>$(DefaultQtVersion)</QtInstall>
+    <QtInstall>5.15.2_msvc2019_64</QtInstall>
     <QtModules>core;gui;widgets;network</QtModules>
     <QtBuildConfig>debug</QtBuildConfig>
   </PropertyGroup>
@@ -67,7 +65,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="QtSettings">
     <QtInstall>$(DefaultQtVersion)</QtInstall>
-    <QtModules>core;gui;widgets;network;core5compat</QtModules>
+    <QtModules>core;gui;widgets;network</QtModules>
     <QtBuildConfig>release</QtBuildConfig>
   </PropertyGroup>
   <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
@@ -188,14 +186,12 @@
   <ItemGroup>
     <ClCompile Include="BirthdayCreater.cpp" />
     <ClCompile Include="customlogo.cpp" />
-    <ClCompile Include="customlogo2.cpp" />
     <ClCompile Include="HKHolderCreater.cpp" />
     <ClCompile Include="NewFiveCreater.cpp" />
     <ClCompile Include="OldFiveCreater.cpp" />
     <ClCompile Include="TowelCreater.cpp" />
     <QtRcc Include="NameCreater.qrc" />
     <QtUic Include="customlogo.ui" />
-    <QtUic Include="customlogo2.ui" />
     <QtUic Include="NameCreater.ui" />
     <QtMoc Include="NameCreater.h" />
     <ClCompile Include="FiveToSingle.cpp" />
@@ -206,8 +202,6 @@
   <ItemGroup>
     <ClInclude Include="BirthdayCreater.h" />
     <QtMoc Include="customlogo.h" />
-    <QtMoc Include="customlogo2.h" />
-    <ClInclude Include="def.h" />
     <ClInclude Include="FiveToSingle.h" />
     <ClInclude Include="HKHolderCreater.h" />
     <ClInclude Include="INameCreater.h" />

NameCreater/NameCreater.vcxproj.filters

@@ -67,9 +67,6 @@
     <ClCompile Include="customlogo.cpp">
       <Filter>Creaters</Filter>
     </ClCompile>
-    <ClCompile Include="customlogo2.cpp">
-      <Filter>Creaters</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">
@@ -96,9 +93,6 @@
     <ClInclude Include="HKHolderCreater.h">
       <Filter>Creaters</Filter>
     </ClInclude>
-    <ClInclude Include="def.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="NameCreater.rc">
@@ -109,16 +103,10 @@
     <QtUic Include="customlogo.ui">
       <Filter>Form Files</Filter>
     </QtUic>
-    <QtUic Include="customlogo2.ui">
-      <Filter>Form Files</Filter>
-    </QtUic>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="customlogo.h">
       <Filter>Creaters</Filter>
     </QtMoc>
-    <QtMoc Include="customlogo2.h">
-      <Filter>Creaters</Filter>
-    </QtMoc>
   </ItemGroup>
 </Project>

NameCreater/NewFiveCreater.h

@@ -12,5 +12,8 @@ protected:
 public:
     virtual void generaImageFromCSV(Name_Type_e type, const QString& filename, const QByteArray& filecontent, const QFont& font, const QColor& font_color);
 
+
+
+
 };
 

NameCreater/customlogo.cpp

@@ -2,218 +2,88 @@
 #include "ui_customlogo.h"
 #include "QFileDialog"
 
-
 #include <QMessageBox>
 #include <QDateTime>
 #include <QTextCodec>
 #include <QTextStream>
 #include <QBuffer>
 #include <QDebug>
-#include <QColorDialog>
 
 
-#define DEMO_BG_PATH ":/NameCreater/resource/custom_logo/bg_1.jpg"
-
-#define	KEY_DEMO_BG_ITEM 10
-#define KEY_WORD_ITEM 100
-#define KEY_WORD_ITEM_X_POS 101
-#define KEY_WORD_ITEM_Y_POS 102
-#define DEMO_WORD_UNICODE "\u92ea\u96dc\u5152"
-
-static QPointF BG_POS_START = QPointF(159, 61);
-static QPointF BG_POS_ROT_START = QPointF(900, 2094);
-static qreal BG_WIDTH_OFFSET = 320;
-static int NAME_COUNT_IN_PAGE = 12;
-
-
-static QPointF NAME_OFFSET_START = QPointF(79, 365);
-static qreal EACH_WORD_OFFSET = 142;
-static QColor FONT_COLOR = QColor(0, 0, 0);
-
-static QColorDialog* s_colorDialog = nullptr;
-
-
-
-class QGraphicsCloneTextItem : public QGraphicsTextItem {
-public:
-	QGraphicsCloneTextItem(const QString& text, QGraphicsItem* parent = nullptr) :
-		QGraphicsTextItem(text, parent) {
-
-	}
-
-	QGraphicsCloneTextItem* clone(QGraphicsItem* parent = nullptr) const {
-
-		QGraphicsCloneTextItem* newItem = new QGraphicsCloneTextItem(toPlainText(), parent);
-		newItem->setFont(font());
-		newItem->setPos(pos());
-		newItem->setDefaultTextColor(defaultTextColor());
-		return newItem;
-	}
-
+static QPointF BG_POS[] = {
+	QPointF(159, 61), QPointF(482, 61), QPointF(802, 61),
+	QPointF(1122, 61), QPointF(1449, 61), QPointF(1772, 61),
+	QPointF(2095, 61), QPointF(2414, 61), QPointF(2738, 61),
+	QPointF(3060, 61), QPointF(900, 2094), QPointF(900, 2420),
 };
 
+static int BG_POS_COUNT = sizeof(BG_POS) / sizeof(BG_POS[0]);
 
 
-CustomLogo::CustomLogo(QFont* font, QDialog* parent) :
-	QDialog(parent),
-	ui(new Ui::CustomLogo),
-	customFont(font),
-	fontColor(QColor(0, 0, 0))
+
+static QPointF NAME_OFFSET_START = QPointF(79, 377);
+static qreal EACH_WORD_OFFSET = 142;
+
+static QColor FONT_COLOR = QColor(0, 0, 0);
+
+CustomLogo::CustomLogo(QFont* font, QDialog* parent):
+    QDialog(parent),
+    ui(new Ui::CustomLogo),
+    customFont(font)
 {
-	ui->setupUi(this);
-	x_adjust_offset = y_adjust_offset = 0;
-	onSliderValueChanged(0);
-
-	connect(ui->load_bg_btn, &QPushButton::released, this, &CustomLogo::onClickedBtn);
-	connect(ui->load_list_btn, &QPushButton::released, this, &CustomLogo::onClickedBtn);
-	connect(ui->color_btn, &QPushButton::released, this, &CustomLogo::onClickedBtn);
-	connect(ui->reset_adjust_btn, &QPushButton::released, this, &CustomLogo::onClickedBtn);
-	connect(ui->double_checkbox, &QCheckBox::clicked, this, &CustomLogo::onCheckboxClicked);
-
-	connect(ui->x_adjust_slider, &QSlider::valueChanged, this, &CustomLogo::onSliderValueChanged);
-	connect(ui->y_adjust_slider, &QSlider::valueChanged, this, &CustomLogo::onSliderValueChanged);
+    ui->setupUi(this);
 	
 
-	QFont _f(*font);
-	_f.setPixelSize(20);
-
-
-	QPalette palette = ui->color_label->palette();
-	palette.setColor(QPalette::WindowText, fontColor);
-	ui->color_label->setPalette(palette);
-	ui->color_label->setFont(_f);
-	ui->color_btn->setFont(_f);
-	ui->double_checkbox->setFont(_f);
-	ui->hor_label->setFont(_f);
-	ui->vel_label->setFont(_f);
-
-
-
-
-	demo_scene.setBackgroundBrush(QBrush(QColor(255, 255, 255)));
-	ui->demo_graphicsView->setScene(&demo_scene);
-
-	QPixmap def_demo_bg(DEMO_BG_PATH);
-	createDemoGraphicItemBG(def_demo_bg);
-
+    connect(ui->load_bg_btn, &QPushButton::released,this, &CustomLogo::onClickedBtn);
+    connect(ui->load_list_btn, &QPushButton::released, this, &CustomLogo::onClickedBtn);
 }
 
 CustomLogo::~CustomLogo()
 {
-	delete ui;
+    delete ui;
 }
 
 void CustomLogo::loadBGFromFile()
 {
-	auto fileContentReady = [this](const QString& fileName, const QByteArray& fileContent) {
-		if (fileName.isEmpty()) {
-			// No file was selected
-		}
-		else {
-			QPixmap pix;
-			if (pix.loadFromData(fileContent, "JPG")) {
-				//ui->display_label->setPixmap(pix);
-				createDemoGraphicItemBG(pix);
-			}
-			else {
-				qDebug() << "Data content not image format";
-			}
-		}
-		};
+    auto fileContentReady = [this](const QString& fileName, const QByteArray& fileContent) {
+        if (fileName.isEmpty()) {
+            // No file was selected
+        }else{
+            QPixmap pix;
+            if(pix.loadFromData(fileContent,"JPG")) {
+                ui->display_label->setPixmap(pix);
+            }else{
+                qDebug()<<"Data content not image format";
+            }
 
-	QFileDialog::getOpenFileContent("Image (*.jpg)", fileContentReady);
-}
-
-void CustomLogo::createDemoGraphicItemBG(const QPixmap& img)
-{
-	demo_scene.clear();
-
-	bool isReverse = ui->double_checkbox->isChecked();
-
-	QGraphicsPixmapItem* name_bgItem = new QGraphicsPixmapItem(img);
-	name_bgItem->setData(KEY_DEMO_BG_ITEM, KEY_DEMO_BG_ITEM);
-	name_bgItem->setPos(10, 10);
-	demo_scene.addItem(name_bgItem);
-
-	QGraphicsRectItem* name_rectItem = NULL, * name_reverse_rectItem = NULL;
-
-	name_rectItem = new QGraphicsRectItem(QRectF(0, 0, name_bgItem->boundingRect().width(), name_bgItem->boundingRect().height() / 2), name_bgItem);
-	name_rectItem->setPen(QPen(QColor(0, 0, 0, 255)));
-
-	if (isReverse) {
-		name_reverse_rectItem = new QGraphicsRectItem(name_rectItem->rect(), name_bgItem);
-		name_reverse_rectItem->setPen(QPen(QColor(0, 0, 0, 0)));
-		name_reverse_rectItem->setPos(name_bgItem->boundingRect().width(), name_bgItem->boundingRect().height());
-		name_reverse_rectItem->setRotation(180);
-	}
+        }
 
 
+    };
 
-	QString name = QString(DEMO_WORD_UNICODE);
-	int name_len = name.length();
-	QPointF pos = NAME_OFFSET_START;
-	qreal y_offset = 0;
-	if (name_len == 2) {
-		pos.setY(pos.y() + 65.0);
-		y_offset = 55;
-	}
-
-
-
-	for (int k = 0; k < name_len; k++) {
-		QGraphicsCloneTextItem* textItem = new QGraphicsCloneTextItem(name.mid(k, 1), name_rectItem);
-		textItem->setFont(*customFont);
-		textItem->setDefaultTextColor(fontColor);
-		
-		qreal _posX = (name_rectItem->boundingRect().width() / 2 - textItem->boundingRect().width() / 2);
-		qreal _posY = (pos.y()) + k * (EACH_WORD_OFFSET + y_offset);
-		qDebug() << "Name num:" << QString::number(k) << "PosY:" << QString::number(_posY);
-		textItem->setData(KEY_WORD_ITEM, QVariant(KEY_WORD_ITEM));
-		textItem->setData(KEY_WORD_ITEM_X_POS, QVariant(_posX));
-		textItem->setData(KEY_WORD_ITEM_Y_POS, QVariant(_posY));
-		textItem->setPos(_posX+x_adjust_offset, _posY+y_adjust_offset);
-
-		if (name_reverse_rectItem) {
-			QGraphicsCloneTextItem* _ti = ((QGraphicsCloneTextItem*)textItem)->clone(name_reverse_rectItem);
-			_ti->setData(KEY_WORD_ITEM, QVariant(KEY_WORD_ITEM));
-			_ti->setData(KEY_WORD_ITEM_X_POS, QVariant(_posX));
-			_ti->setData(KEY_WORD_ITEM_Y_POS, QVariant(_posY));
-		}
-	}
-}
-
-void CustomLogo::updateDemoGraphicItemBG() {
-	foreach(QGraphicsItem * item, demo_scene.items()) {
-		QVariant v = item->data(KEY_WORD_ITEM);
-		if (v.toInt() == KEY_WORD_ITEM) {
-			((QGraphicsTextItem*)item)->setDefaultTextColor(fontColor);
-			qreal _ori_x = item->data(KEY_WORD_ITEM_X_POS).toReal();
-			qreal _ori_y = item->data(KEY_WORD_ITEM_Y_POS).toReal();
-			item->setPos(_ori_x + x_adjust_offset, _ori_y + y_adjust_offset);
-		}
-	}
+    QFileDialog::getOpenFileContent("Image (*.jpg)", fileContentReady);
 }
 
 void CustomLogo::loadListFromFile()
 {
-	auto fileContentReady = [this](const QString& fileName, const QByteArray& fileContent) {
-		if (fileName.isEmpty()) {
-			// No file was selected
-		}
-		else {
+    auto fileContentReady = [this](const QString& fileName, const QByteArray& fileContent) {
+        if (fileName.isEmpty()) {
+            // No file was selected
+        }
+        else {
 			QList<NameInfo_t> nameList = getNameByFileContent(Name_zh, fileContent);
 			if (!nameList.isEmpty()) {
-				qDebug() << "List size: " << QString::number(nameList.count());
+				qDebug() << "List size: "<< QString::number(nameList.count());
 				gerneraImageFromList(nameList, Name_zh);
 			}
 			else {
 				qDebug() << "List is empty!!";
 			}
-		}
+        }
 
-		};
+    };
 
-	QFileDialog::getOpenFileContent("CSV file (*.csv)", fileContentReady);
+    QFileDialog::getOpenFileContent("CSV file (*.csv)", fileContentReady);
 
 }
 
@@ -228,7 +98,7 @@ void CustomLogo::gerneraImageFromList(const QList<NameInfo_t>& nameList, Name_Ty
 	case Name_zh:
 	{
 		for (int n = 0; n < nameList.length(); n++) {
-			int idx = n % NAME_COUNT_IN_PAGE;
+			int idx = n % BG_POS_COUNT;
 			NameInfo_t name_info = nameList.at(n);
 	
 			if (idx == 0) {
@@ -239,24 +109,10 @@ void CustomLogo::gerneraImageFromList(const QList<NameInfo_t>& nameList, Name_Ty
 			}
 
 
-			QPixmap _bg;
-
-			foreach(QGraphicsItem * item, demo_scene.items()) {
-				QVariant v = item->data(KEY_DEMO_BG_ITEM);
-				if (v.toInt() == KEY_DEMO_BG_ITEM) {
-					_bg = ((QGraphicsPixmapItem*)item)->pixmap().copy();
-					break;
-				}
-
-			}
-
-
-			QGraphicsPixmapItem* name_bgItem = new QGraphicsPixmapItem(_bg);
+			QGraphicsPixmapItem* name_bgItem = new QGraphicsPixmapItem(*ui->display_label->pixmap());
 			bool rot = (idx == 10 || idx == 11);
 			name_bgItem->setRotation(rot ? -90 : 0);
-			qreal item_pos_x = rot ? BG_POS_ROT_START.x() : BG_POS_START.x() + idx * BG_WIDTH_OFFSET;
-			qreal item_pos_y = rot ? BG_POS_ROT_START.y() + (idx - 10) * BG_WIDTH_OFFSET : BG_POS_START.y();
-			name_bgItem->setPos(item_pos_x, item_pos_y);
+			name_bgItem->setPos(BG_POS[idx]);
 			scene.addItem(name_bgItem);
 
 
@@ -265,48 +121,40 @@ void CustomLogo::gerneraImageFromList(const QList<NameInfo_t>& nameList, Name_Ty
 				msgBox.setText(QString().asprintf("Name is Empty at %d", export_times + 1));
 				msgBox.exec();
 			}
-			QGraphicsRectItem* name_rectItem = new QGraphicsRectItem(QRectF(0, 0, name_bgItem->boundingRect().width(), name_bgItem->boundingRect().height() / 2), name_bgItem);
-			name_rectItem->setPen(QPen(QColor(0, 0, 0, 0)));
-
 			QString name = name_info.name1;
 			int name_len = name.length();
-			QPointF pos = NAME_OFFSET_START;
-			qreal y_offset = 0;
-			if (name_len == 2) {
-				pos.setY(pos.y() + 65.0);
-				y_offset = 55;
-			}
+			for (int j = 0; j < 1; j++) { // never reverse
+				int pos_idx = idx * 2 + j;
+				qreal xscale, yscale;
 
-			for (int k = 0; k < name_len; k++) {
-				QGraphicsCloneTextItem* textItem = new QGraphicsCloneTextItem(name.mid(k, 1), name_rectItem);
-				textItem->setFont(*customFont);
-				textItem->setDefaultTextColor(fontColor);
-				qreal _posX = name_rectItem->boundingRect().width() / 2 - textItem->boundingRect().width() / 2;
-				qreal _posY = pos.y() + k * (EACH_WORD_OFFSET + y_offset);
-				qDebug() << "Name num:" << QString::number(k) << "PosY:" << QString::number(_posY);
-				textItem->setPos(_posX+x_adjust_offset, _posY+y_adjust_offset);
+				xscale = yscale = (j == 1) ? -1 : 1;
+				QPointF pos = NAME_OFFSET_START;
+				qreal y_offset =  0;
+				if (name_len == 2) {
+					if (!rot) {
+						pos.setY(pos.y() + 82.0 * xscale);
+					}
+					else {
+						pos.setX(pos.x() + 82.0 * xscale);
 
-			}
-
-
-			if (ui->double_checkbox->isChecked()) {
-				QGraphicsRectItem* name_reverse_rectItem = new QGraphicsRectItem(name_rectItem->rect(), name_bgItem);
-				name_reverse_rectItem->setPen(QPen(QColor(0, 0, 0, 0)));
-				name_reverse_rectItem->setPos(name_bgItem->boundingRect().width(), name_bgItem->boundingRect().height());
-				foreach(auto item, name_rectItem->childItems()) {
-					QGraphicsCloneTextItem* _ti = ((QGraphicsCloneTextItem*)item)->clone(name_reverse_rectItem);
+					}
+					y_offset = 25;
+				}
+
+				for (int k = 0; k < name_len; k++) {
+					QGraphicsTextItem* textItem = new QGraphicsTextItem(name.mid(k, 1), name_bgItem);
+					textItem->setFont(*customFont);
+					textItem->setDefaultTextColor(FONT_COLOR);
+					textItem->setPos(pos.x(),pos.y() + k* EACH_WORD_OFFSET + y_offset);
+					textItem->setTransform(QTransform::fromScale(xscale, yscale));
+					scene.addItem(textItem);
 				}
-				name_reverse_rectItem->setRotation(180);
-				qDebug() << "name_rect item child count:" << name_rectItem->childItems().size();
 			}
-
-
-			bool is_export_page = ((idx + 1) % NAME_COUNT_IN_PAGE == 0);
+			bool is_export_page = ((idx + 1) % BG_POS_COUNT == 0);
 			if (is_export_page || n == nameList.count() - 1) {
 				QString date_str = QDateTime::currentDateTime().toString("MMddhhmm");
 				QString file_name = QString("Signal_%2_%1.jpg").arg(QString::number(export_times + 1), date_str);
-				//saveToImage(file_name, &scene);
-				INameCreater().saveToImage(file_name, &scene);
+				saveToImage(file_name, &scene);
 				export_times++;
 
 				scene.clear();
@@ -329,9 +177,7 @@ QList<NameInfo_t> CustomLogo::getNameByFileContent(Name_Type_e type, const QByte
 {
 	QList<NameInfo_t> nameList;
 
-	QString codec_text = ui->codec_comboBox->currentText();
-
-	QTextCodec* tc = QTextCodec::codecForName(codec_text.toStdString().c_str()); // can also using "Utf8" or "Big5" codec
+	QTextCodec* tc = QTextCodec::codecForName("Big5");
 	QString codec = tc->toUnicode(conetent.data());
 	QTextStream stream(&codec);
 
@@ -357,7 +203,7 @@ QList<NameInfo_t> CustomLogo::getNameByFileContent(Name_Type_e type, const QByte
 		qDebug() << "row :" << row << " " << name;
 
 		if (name.compare("name_1") == 0 || name.compare("name") == 0 ||
-			eng_name.compare("eng_name") == 0) {
+			eng_name.compare("eng_name") == 0  ) {
 			//pass first line
 			continue;
 		}
@@ -371,73 +217,48 @@ QList<NameInfo_t> CustomLogo::getNameByFileContent(Name_Type_e type, const QByte
 	return nameList;
 }
 
-void CustomLogo::onColorSelected(const QColor& color)
-{
-	qDebug() << "color accept: r:" << color.red() << ", g:" << color.green() <<", b:" << color.blue();
-	fontColor = QColor(color);
-
-	QPalette palette = ui->color_label->palette();
-	palette.setColor(QPalette::WindowText, fontColor);
-	ui->color_label->setPalette(palette);
-
-	updateDemoGraphicItemBG();
-}
-
-void CustomLogo::onSliderValueChanged(int value)
-{
-	auto slider = QObject::sender();
-
-	if (slider == ui->x_adjust_slider) {
-		x_adjust_offset = value;
-	}
-	else if (slider == ui->y_adjust_slider) {
-		y_adjust_offset = value;
-	
-	}
-
-	ui->x_adjust_label->setText(QString("X: %1").arg(QString::number(x_adjust_offset)));
-	ui->y_adjust_label->setText(QString("Y: %1").arg(QString::number(y_adjust_offset)));
-
-	updateDemoGraphicItemBG();
-}
-
-void CustomLogo::onCheckboxClicked(bool click)
-{
-    (void)click;
-	foreach(QGraphicsItem * item, demo_scene.items()) {
-		QVariant v = item->data(KEY_DEMO_BG_ITEM);
-		if (v.toInt() == KEY_DEMO_BG_ITEM) {
-			QPixmap _bg = ((QGraphicsPixmapItem*)item)->pixmap().copy();
-			createDemoGraphicItemBG(_bg);
-			break;
-		}
-
-	}
-}
-
 
 void CustomLogo::onClickedBtn() {
-	auto sender = (QPushButton*)QObject::sender();
+    auto sender = (QPushButton*)QObject::sender();
 
-	if (sender == ui->load_bg_btn) {
-		loadBGFromFile();
-	}
-	else if (sender == ui->load_list_btn) {
-		loadListFromFile();
-	}
-	else if (sender == ui->color_btn) {
-
-		if (s_colorDialog == nullptr) {
-			s_colorDialog = new QColorDialog(ui->color_label->palette().color(QPalette::WindowText), this);
-			connect(s_colorDialog, &QColorDialog::colorSelected, this, &CustomLogo::onColorSelected);
-		}
-		s_colorDialog->open();
-
-	}
-	else if (sender == ui->reset_adjust_btn) {
-		ui->x_adjust_slider->setValue(0);
-		ui->y_adjust_slider->setValue(0);
-	}
+    if (sender == ui->load_bg_btn) {
+        loadBGFromFile();
+    }
+    else if (sender == ui->load_list_btn) {
+        loadListFromFile();
+    }
 
 }
 
+
+void CustomLogo::saveToImage(const QString& filename, QGraphicsScene* scene)
+{
+	scene->clearSelection();                                                  // Selections would also render to the file
+	scene->setSceneRect(scene->itemsBoundingRect());                          // Re-shrink the scene to it's bounding contents
+	QImage image(scene->sceneRect().size().toSize(), QImage::Format_ARGB32);  // Create the image with the exact size of the shrunk scene
+	image.fill(Qt::transparent);                                              // Start all pixels transparent
+	int dpm = 300 / 0.0254; // ~300 DPI
+	image.setDotsPerMeterX(dpm);
+	image.setDotsPerMeterY(dpm);
+
+
+	QPainter painter(&image);
+	scene->render(&painter);
+
+#ifdef Q_OS_MAC
+	QString folder_name = QCoreApplication::applicationDirPath() + "/../../../export_" + QDateTime::currentDateTime().toString("yyyyMMdd");
+#else
+	QString folder_name = QCoreApplication::applicationDirPath() + "/export_" + QDateTime::currentDateTime().toString("yyyyMMdd");
+#endif
+
+	image.save(filename, "JPEG");
+
+	QByteArray imageData;
+	QBuffer buffer(&imageData);
+	buffer.open(QIODevice::WriteOnly);
+	QPixmap pixmap = QPixmap::fromImage(image);
+	pixmap.save(&buffer, "JPEG", 100); // You can also use other formats like "JPEG" or "BMP"
+
+	QFileDialog::saveFileContent(imageData, filename);
+
+}

NameCreater/customlogo.h

@@ -2,8 +2,8 @@
 #define CUSTOMLOGO_H
 
 #include <QDialog>
-#include "QFont"
 #include "INameCreater.h"
+#include "QFont"
 
 namespace Ui {
 class CustomLogo;
@@ -20,25 +20,17 @@ public:
 private:
     Ui::CustomLogo *ui;
     QFont* customFont;
-    QColor fontColor;
-    QGraphicsScene demo_scene;
-
-    qreal x_adjust_offset, y_adjust_offset;
 
     void loadBGFromFile();
-    void createDemoGraphicItemBG(const QPixmap& img);
-    void updateDemoGraphicItemBG();
     void loadListFromFile();
     void gerneraImageFromList(const QList<NameInfo_t>& nameList, Name_Type_e type);
+    void saveToImage(const QString& filename, QGraphicsScene* scene);
 
 protected:
     QList<NameInfo_t> getNameByFileContent(Name_Type_e type, const QByteArray& conetent);
 
 private Q_SLOTS:
     void onClickedBtn();
-    void onColorSelected(const QColor& color);
-    void onSliderValueChanged(int value);
-    void onCheckboxClicked(bool click);
 
 
 

NameCreater/customlogo.ui

@@ -7,12 +7,31 @@
     <x>0</x>
     <y>0</y>
     <width>545</width>
-    <height>653</height>
+    <height>1741</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
+  <widget class="QLabel" name="display_label">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>10</y>
+     <width>293</width>
+     <height>1715</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="NameCreater.qrc">:/NameCreater/resource/custom_logo/bg_1.jpg</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>false</bool>
+   </property>
+  </widget>
   <widget class="QPushButton" name="load_bg_btn">
    <property name="geometry">
     <rect>
@@ -39,200 +58,6 @@
     <string>Load List</string>
    </property>
   </widget>
-  <widget class="QCheckBox" name="double_checkbox">
-   <property name="geometry">
-    <rect>
-     <x>370</x>
-     <y>240</y>
-     <width>91</width>
-     <height>51</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>20</pointsize>
-    </font>
-   </property>
-   <property name="text">
-    <string>雙面</string>
-   </property>
-  </widget>
-  <widget class="QWidget" name="horizontalLayoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>340</x>
-     <y>310</y>
-     <width>160</width>
-     <height>80</height>
-    </rect>
-   </property>
-   <layout class="QHBoxLayout" name="horizontalLayout">
-    <item>
-     <widget class="QPushButton" name="color_btn">
-      <property name="text">
-       <string>選色</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QLabel" name="color_label">
-      <property name="font">
-       <font>
-        <pointsize>18</pointsize>
-        <weight>75</weight>
-        <bold>true</bold>
-       </font>
-      </property>
-      <property name="styleSheet">
-       <string notr="true"/>
-      </property>
-      <property name="text">
-       <string>顏色</string>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QGraphicsView" name="demo_graphicsView">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>50</y>
-     <width>311</width>
-     <height>561</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QFrame" name="frame">
-   <property name="geometry">
-    <rect>
-     <x>330</x>
-     <y>410</y>
-     <width>201</width>
-     <height>141</height>
-    </rect>
-   </property>
-   <property name="frameShape">
-    <enum>QFrame::StyledPanel</enum>
-   </property>
-   <property name="frameShadow">
-    <enum>QFrame::Raised</enum>
-   </property>
-   <layout class="QFormLayout" name="formLayout">
-    <item row="1" column="0">
-     <widget class="QLabel" name="hor_label">
-      <property name="text">
-       <string>水平</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="1">
-     <widget class="QSlider" name="x_adjust_slider">
-      <property name="minimum">
-       <number>-100</number>
-      </property>
-      <property name="maximum">
-       <number>100</number>
-      </property>
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="invertedAppearance">
-       <bool>false</bool>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="1">
-     <widget class="QSlider" name="y_adjust_slider">
-      <property name="minimum">
-       <number>-120</number>
-      </property>
-      <property name="maximum">
-       <number>120</number>
-      </property>
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="0">
-     <widget class="QLabel" name="vel_label">
-      <property name="text">
-       <string>垂直</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="1">
-     <widget class="QLabel" name="x_adjust_label">
-      <property name="text">
-       <string>X</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignCenter</set>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="1">
-     <widget class="QLabel" name="y_adjust_label">
-      <property name="text">
-       <string>Y</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignCenter</set>
-      </property>
-     </widget>
-    </item>
-    <item row="4" column="1">
-     <widget class="QPushButton" name="reset_adjust_btn">
-      <property name="text">
-       <string>Reset</string>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QWidget" name="horizontalLayoutWidget_2">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>10</y>
-     <width>311</width>
-     <height>41</height>
-    </rect>
-   </property>
-   <layout class="QHBoxLayout" name="horizontalLayout_2">
-    <item>
-     <widget class="QLabel" name="label">
-      <property name="maximumSize">
-       <size>
-        <width>80</width>
-        <height>16777215</height>
-       </size>
-      </property>
-      <property name="text">
-       <string>Codec:</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QComboBox" name="codec_comboBox">
-      <item>
-       <property name="text">
-        <string>Big5</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Utf8</string>
-       </property>
-      </item>
-     </widget>
-    </item>
-   </layout>
-  </widget>
  </widget>
  <resources>
   <include location="NameCreater.qrc"/>

NameCreater/customlogo2.cpp

@@ -1,6 +1,7 @@
 #include "customlogo2.h"
 #include "ui_customlogo2.h"
-#include "def.h"
+
+#include "QFileDialog"
 
 #include <QMessageBox>
 #include <QDateTime>
@@ -23,8 +24,8 @@ static int BG_POS_COUNT = 12;
 
 
 
-customlogo2::customlogo2(QFont *font, QDialog*parent)
-    : QDialog(parent)
+customlogo2::customlogo2(QFont *font, QWidget *parent)
+    : QWidget(parent)
     , ui(new Ui::customlogo2)
     , zhFont(font)
 {
@@ -200,18 +201,21 @@ void customlogo2::gerneraImageFromList(const QList<NameInfo_t>& nameList, Name_T
             textItem->setPos(20+(itemRect.width() - textItem->boundingRect().width())/2,42);
 
 
+            scene.addItem(textItem);
+
             QString name_en = name_info.name_eng;
             QGraphicsTextItem* textItem_en = new QGraphicsTextItem(name_en, name_bgItem);
             textItem_en->setFont(enFont);
             textItem_en->setDefaultTextColor(fontColor);
             textItem_en->setPos(20+(itemRect.width() - textItem_en->boundingRect().width())/2,170);
 
+            scene.addItem(textItem_en);
 
             bool is_export_page = ((idx + 1) % BG_POS_COUNT == 0);
             if (is_export_page || n == nameList.count() - 1) {
                 QString date_str = QDateTime::currentDateTime().toString("MMddhhmm");
                 QString file_name = QString("Signal_%2_%1.jpg").arg(QString::number(export_times + 1), date_str);
-                INameCreater().saveToImage(file_name, &scene);
+                saveToImage(file_name, &scene);
                 export_times++;
 
                 scene.clear();
@@ -229,3 +233,39 @@ void customlogo2::gerneraImageFromList(const QList<NameInfo_t>& nameList, Name_T
     msgBox.exec();
 
 }
+
+void customlogo2::saveToImage(const QString& filename, QGraphicsScene* scene)
+{
+    scene->clearSelection();                                                  // Selections would also render to the file
+    scene->setSceneRect(scene->itemsBoundingRect());                          // Re-shrink the scene to it's bounding contents
+    QImage image(scene->sceneRect().size().toSize(), QImage::Format_ARGB32);  // Create the image with the exact size of the shrunk scene
+    image.fill(Qt::transparent);                                              // Start all pixels transparent
+    int dpm = 300 / 0.0254; // ~300 DPI
+    image.setDotsPerMeterX(dpm);
+    image.setDotsPerMeterY(dpm);
+
+
+    QPainter painter(&image);
+    scene->render(&painter);
+
+
+
+#ifdef Q_OS_MAC
+    QString folder_name = QCoreApplication::applicationDirPath() + "/../../../export_" + QDateTime::currentDateTime().toString("yyyyMMdd");
+    qDebug() << "app director path" <<QCoreApplication::applicationDirPath();
+#else
+    QString folder_name = QCoreApplication::applicationDirPath() + "/export_" + QDateTime::currentDateTime().toString("yyyyMMdd");
+#endif
+
+    image.save(folder_name.append(filename), "JPEG");
+
+    QByteArray imageData;
+    QBuffer buffer(&imageData);
+    buffer.open(QIODevice::WriteOnly);
+    QPixmap pixmap = QPixmap::fromImage(image);
+    pixmap.save(&buffer, "JPEG", 100); // You can also use other formats like "JPEG" or "BMP"
+
+    QFileDialog::saveFileContent(imageData, filename);
+
+}
+

NameCreater/customlogo2.h

@@ -1,7 +1,7 @@
 #ifndef CUSTOMLOGO2_H
 #define CUSTOMLOGO2_H
 
-#include <QDialog>
+#include <QWidget>
 #include "INameCreater.h"
 #include "QFont"
 
@@ -9,12 +9,12 @@ namespace Ui {
 class customlogo2;
 }
 
-class customlogo2 : public QDialog
+class customlogo2 : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit customlogo2(QFont *font , QDialog*parent = nullptr);
+    explicit customlogo2(QFont *font ,QWidget *parent = nullptr);
     ~customlogo2();
 
 private:
@@ -24,7 +24,7 @@ private:
 
     void loadListFromFile();
     void gerneraImageFromList(const QList<NameInfo_t>& nameList, Name_Type_e type);
-
+    void saveToImage(const QString& filename, QGraphicsScene* scene);
 
 protected:
     QList<NameInfo_t> getNameByFileContent(Name_Type_e type, const QByteArray& conetent);

NameCreater/def.h

@@ -1,7 +1,6 @@
 #ifndef DEF_H
 #define DEF_H
 
-#define VERSION "v2.10.3"
-
+#define VERSION "v2.8.0"
 
 #endif // DEF_H