From 4c92f00cb21a3a7fe2961eb16ae0df1be94db0e2 Mon Sep 17 00:00:00 2001
From: shouchih_chen <asd921150@gmail.com>
Date: Sat, 14 Sep 2024 16:55:57 +0800
Subject: [PATCH] 1. change app save path coding.

---
 NameCreater/INameCreater.h  |  5 ++++-
 NameCreater/customlogo2.cpp | 17 ++++++++---------
 NameCreater/def.h           |  7 +++++++
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/NameCreater/INameCreater.h b/NameCreater/INameCreater.h
index e9b4e7d..440bd6c 100644
--- a/NameCreater/INameCreater.h
+++ b/NameCreater/INameCreater.h
@@ -3,10 +3,13 @@
 #include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QGraphicsRectItem>
+#include <QCoreApplication>
 
 #define BG_WIDTH	3508
 #define BG_HEIGHT	2481
 
+
+
 struct NameInfo_t {
 	QString name1;
 	QString name2;
@@ -46,4 +49,4 @@ private:
 	
 	QFont eng_Font;
 
-};
\ No newline at end of file
+};
diff --git a/NameCreater/customlogo2.cpp b/NameCreater/customlogo2.cpp
index 1d48796..e194e00 100644
--- a/NameCreater/customlogo2.cpp
+++ b/NameCreater/customlogo2.cpp
@@ -1,7 +1,6 @@
 #include "customlogo2.h"
 #include "ui_customlogo2.h"
-
-#include "QFileDialog"
+#include "def.h"
 
 #include <QMessageBox>
 #include <QDateTime>
@@ -248,16 +247,16 @@ void customlogo2::saveToImage(const QString& filename, QGraphicsScene* scene)
     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();
+#ifdef Q_OS_DARWIN
+    QString APP_PATH = QCoreApplication::applicationDirPath() + "/../../../";
 #else
-    QString folder_name = QCoreApplication::applicationDirPath() + "/export_" + QDateTime::currentDateTime().toString("yyyyMMdd");
+    static QString APP_PATH = "";
 #endif
 
-    image.save(folder_name.append(filename), "JPEG");
+    QString save_path = APP_PATH.append(filename);
+    qDebug()<<"save path: "<< save_path;
+
+    image.save(save_path, "JPEG");
 
     QByteArray imageData;
     QBuffer buffer(&imageData);
diff --git a/NameCreater/def.h b/NameCreater/def.h
index bfa4290..037fcd1 100644
--- a/NameCreater/def.h
+++ b/NameCreater/def.h
@@ -1,6 +1,13 @@
 #ifndef DEF_H
 #define DEF_H
 
+#include <QCoreApplication>
+
 #define VERSION "v2.8.0"
 
+
+
+
+
+
 #endif // DEF_H