更新代码

third/qcustomplotdemo/frmcustom/iconhelper.cpp

@@ -2,6 +2,7 @@
 
 IconHelper *IconHelper::iconFontAliBaBa = 0;
 IconHelper *IconHelper::iconFontAwesome = 0;
+IconHelper *IconHelper::iconFontAwesome6 = 0;
 IconHelper *IconHelper::iconFontWeather = 0;
 int IconHelper::iconFontIndex = -1;
 
@@ -16,12 +17,20 @@ void IconHelper::initFont()
         if (iconFontAwesome == 0) {
             iconFontAwesome = new IconHelper(":/font/fontawesome-webfont.ttf", "FontAwesome");
         }
+        if (iconFontAwesome6 == 0) {
+            iconFontAwesome6 = new IconHelper(":/font/fa-regular-400.ttf", "Font Awesome 6 Pro Regular");
+        }
         if (iconFontWeather == 0) {
             iconFontWeather = new IconHelper(":/font/pe-icon-set-weather.ttf", "pe-icon-set-weather");
         }
     }
 }
 
+void IconHelper::setIconFontIndex(int index)
+{
+    iconFontIndex = index;
+}
+
 QFont IconHelper::getIconFontAliBaBa()
 {
     initFont();
@@ -34,6 +43,12 @@ QFont IconHelper::getIconFontAwesome()
     return iconFontAwesome->getIconFont();
 }
 
+QFont IconHelper::getIconFontAwesome6()
+{
+    initFont();
+    return iconFontAwesome6->getIconFont();
+}
+
 QFont IconHelper::getIconFontWeather()
 {
     initFont();
@@ -48,6 +63,7 @@ IconHelper *IconHelper::getIconHelper(int icon)
     //没指定则自动根据不同的字体的值选择对应的类
     //由于部分值范围冲突所以可以指定索引来取
     //fontawesome   0xf000-0xf2e0
+    //fontawesome6  0xe000-0xe33d 0xf000-0xf8ff
     //iconfont      0xe501-0xe793 0xe8d5-0xea5d
     //weather       0xe900-0xe9cf
 
@@ -61,6 +77,8 @@ IconHelper *IconHelper::getIconHelper(int icon)
     } else if (iconFontIndex == 1) {
         iconHelper = iconFontAwesome;
     } else if (iconFontIndex == 2) {
+        iconHelper = iconFontAwesome6;
+    } else if (iconFontIndex == 3) {
         iconHelper = iconFontWeather;
     }
 
@@ -115,7 +133,7 @@ IconHelper::IconHelper(const QString &fontFile, const QString &fontName, QObject
 {
     //判断图形字体是否存在,不存在则加入
     QFontDatabase fontDb;
-    if (!fontDb.families().contains(fontName)) {
+    if (!fontDb.families().contains(fontName) && QFile(fontFile).exists()) {
         int fontId = fontDb.addApplicationFont(fontFile);
         QStringList listName = fontDb.applicationFontFamilies(fontId);
         if (listName.count() == 0) {