From f6def4b9d105144db68d3f624075d6afc2de18bd Mon Sep 17 00:00:00 2001
From: jkriege2 <jan@jkrieger.de>
Date: Tue, 6 Sep 2022 11:57:58 +0200
Subject: [PATCH] add symbol JKQTPFilledCharacterSymbol

---
 doc/dox/whatsnew.dox                          |   2 +-
 doc/images/symbols/symbol_char_at.png         | Bin 457 -> 1135 bytes
 doc/images/symbols/symbol_char_club.png       | Bin 0 -> 610 bytes
 doc/images/symbols/symbol_filled_char_at.png  | Bin 0 -> 2090 bytes
 .../symbols/symbol_filled_char_club.png       | Bin 0 -> 1112 bytes
 lib/jkqtcommon/jkqtpdrawingtools.cpp          |  31 +++++++++++++--
 lib/jkqtcommon/jkqtpdrawingtools.h            |  36 +++++++++++++++---
 .../jkqtplotter_doc_imagegenerator.cpp        |  21 +++++++++-
 8 files changed, 78 insertions(+), 12 deletions(-)
 create mode 100644 doc/images/symbols/symbol_char_club.png
 create mode 100644 doc/images/symbols/symbol_filled_char_at.png
 create mode 100644 doc/images/symbols/symbol_filled_char_club.png

diff --git a/doc/dox/whatsnew.dox b/doc/dox/whatsnew.dox
index 3e4c7b0e99..f5738ea573 100644
--- a/doc/dox/whatsnew.dox
+++ b/doc/dox/whatsnew.dox
@@ -43,7 +43,7 @@ Changes, compared to  \ref page_whatsnew_V4_0_0 "v4.0.0" include:
     <li>NEW: made resize-timer status accessible from outside via JKQTPlotter::isResizeTimerRunning() </li>
     <li>NEW: made it's delay a global static variable that can be set and red with JKQTPlotter::setGlobalResizeDelay() and JKQTPlotter::getGlobalResizeDelay()</li>
     <li>NEW: Using JKQTMathText::useGuiFonts() for FONT rendering by default</li>
-    <li>NEW: added the option to draw a character from a font as symbol (<code>JKQTPCharacterSymbol+QChar('C').unicode()</code>)</li>
+    <li>NEW: added the option to draw a character from a font as symbol (<code>JKQTPCharacterSymbol+QChar('C').unicode()</code> and <code>JKQTPFilledCharacterSymbol+QChar('C').unicode()</code>)</li>
   </ul></li>
   
   <li>JKQTMathText:<ul>
diff --git a/doc/images/symbols/symbol_char_at.png b/doc/images/symbols/symbol_char_at.png
index 2fd12a2129321dcd85243a425c6ff877e6cb99ea..d5385f2d834fb18f78ebc2cf9f2632703e2ece38 100644
GIT binary patch
delta 1094
zcmV-M1iAak1MdisIDZ5oNkl<ZScSz`OGuPa6#iz&M`q>Z^Z+q?XhLFC5F|u~)TRtt
z)IwY&RETEOriD<;HWkvMf~=SbA&LkLEQ%UhwUDT35%%&?43qwjHW`*W%zQ0Q*Xuv`
zpT9{84_waS-t+kWd(S=h{2r3T9Flh~g9E_4OchBW6au=sfPY{Rh(rL(0=|C-d_KVM
z2g=HT9Xo)XJAul|j2*jEGD&uJk`)!Cz|h0vA?MFG=K-?1ntb#~?A^!}KqNwL->#h&
z6_F=SkWZhIU%rs>xaj@(L4Nu~-n~mUHIYk}Xq&n^^4qsr00@Q1;$m^KXc2k#Ecx@N
z``0KM8xwuCJAZ4}lKuUE0idTxf&ye|Df!_;W`R@b)hn{3MEsPOlhJ4f0Aevw2ISl=
zYj(jEef&uJeBy7{E;A<#00$3>^1_AWyLZk``})YXHuA_3^6+7@y<LuHaF7fH$lJH=
z`dwW*C+^>O0npP!dcC4}?V1^Qa#E5|>C7A(Hjp=OihsO*y=hxhBWsnFE&%H5^|`AI
zSCmMQ`}XO8wYB7xEAqu^*HqG0SDOGHJkYl9-#Y-9m>~1=MB(yf)4|1y+Cgipd6wtS
z>Gl2lP5be2GABpY+u9re1cTbaz<}L&WJGd8-D{`fGCodbXNyjAv$;-^Ter%3W22s%
zehZ#G6Mw#D4Ny{Iua+GhQgQ*HwH5Gq%!-<qr|p(5b*{QARtO&&(sR=QA`#)GrKaJ-
zhr+jQbFc9e6Yc<fKH;OI4gf4mxZiIYzJ4v-EqF2s3=WFCY?-r8G%7qd*8#xTnD7M)
zOvh@=ii^_&7#RWLago#QfZFAvA_o8k1;S%7(|^$WTPxj{0l<qFT6O{uj|08EB5&U8
z06-ZH51YYPtrB_W*`-n-pym90bG@@uKF;F-_U?56pn`-#Kq6r`R*4x5ItL#ZkVZuX
zR{5le1TI|?dC#7dTc++~cekzs-QD*4+tH!d9zV9PSr)l&9eLmYxoMN=oH=9HIeAj%
zvwyS6w{Puh(*P0)((f0=qetyZiG<X8fXvMmhqrE#=g-SqpOZtrd?^J8kUrqT1@g`v
zUETqCD^kh!7Mwbzk%q%|#c-Icsxlv;tStTdef~@?UvBE;=Q{@{Ne`*p@>mR5y;^u}
ztt5_jM&CR&1>Cp+Jbx~7c{xyDZ!ca$Lw~^a>%f~gKvtGyd|h4ot7-HDSFdX1r%yYh
z{+Hy~lC`vG5G^g{)BN87Oihu84rvfuwq({~&!pa78Gj;M4y4}Q_IBX-abR*%<~D8w
zcJBsiYJin1fx<#L=iy;Fd&`n{<K8{tfdJ6Zkml^u<v=Qh!{o7Jx|zsyEM6>K&_Aqq
zAeFv;m7d|r6RDQbsElM%GQ6-*UebyR*`=x~*_}U8#sK~o&H3N)FHo`3vjIRf*8l(j
M07*qoM6N<$f};Q){r~^~

delta 411
zcmV;M0c8H~2+0GGIDY|qNkl<ZScUDEO>V+45Jq2e7Er|^2QW8i)kRkvAw5A)z_JUo
z<_N4&I06S?fvV&#(?xJ_`~$>-qDuKBZ|vCfX2vs^OhkkyDu1T&5nu!u0saTT?h~>s
zJm#wh0<7k(k+%cX0umUD%?V}>O)7!7sznqcD3RJ*3`?sPNq^tE!BQW<7%zt(lnT)U
zC<l7(DrJ8MQ0uq{RoTzJ(&xF#`p%qDR{j}R0b=wezM&4t{XQXuEkJel%vQ+Do}n1<
zfHdR)%}-kqi+8I$8d$DDX?S%@X95L40TX9wriN8v4p1Ncg=PzTpm-T};BlV-a7nXi
zV6uS&pk|Rxfq%#(1B7Iv<7o$Lp!~S~tQ=r^^5j^b7bd6BZ?^uX?+t`fy;=eazPw9w
zLH4b7t02_fv})^ItNv{_6_eZvjWM_6%)A+0lQE@8q$dmoi1mU;tM^-A!Z@Ur-W9-x
z_^U|x?*Wl69allB^mo8z081qjc@NzuU75)E=k&Sy1r$AbA?YkYuW$eW002ovPDHLk
FV1o4~xa9x<

diff --git a/doc/images/symbols/symbol_char_club.png b/doc/images/symbols/symbol_char_club.png
new file mode 100644
index 0000000000000000000000000000000000000000..c911a4f1dca3a73be91580bd5f03d895fd23d3a2
GIT binary patch
literal 610
zcmV-o0-gPdP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<T6iGxuR9J<@m%UB`Q4odCA_9vRNQ{X#n9!n$@&H6)q0~NrPr(Bi
zo28(_C-4#M!NkOhgi<Y}QV5NSMumuaEG8tdcYp4#OE}3i!*J#cJG1v<kR%qU*dm*U
z0vL}0%K{1oV0l@hP>|es9D;xW^zc9yizMJ2#iG;%kv72B7rC?J-h2|fyHXoDfMxkN
zpM+)20U)2(2gv930SwZA4M!uuG=t67a0sMQ{&iYg5N5i+zxC?009IFlY*xQ{HVdq*
zL;%q30@W&TcqorSSEG@9r&<*cPdN?7&kxyXkm<Dk;JHOQO<r7xr}h@qYX5I+k6KL=
z;PH_(&FBG4Q@rg`W}se|6^dHJp?KS+0JPiDH}~>Z0N&r{2jJwb0Bmf`55UP=0XR6A
zAAqB`eJWpH$y_e_E!f^B-`+Ie1FaUBNJQ5>ksz<HHQxgh-QAI;l4_Ppkw-^r{`gov
zv*$}C^8Vhfi_dXP0-cV;#|N;r1(eIc)fI4hI$L{r2~;XTvkCNiav1IHNf?IvT*SSG
z#xQ{WeTiv3J*l<N&vFW$oOn5^3Uw`SHq~6K6~+nBx)DulFpx*_`#YPD$ANwySYHnY
z5cn53J5!qjasxU)59$Wz`+%EnZpc{7echIp$lKc>jvi}hSFcBAGX6WiwkEZ@^4x-H
wy}ZbgnoN4veSS*q=BA!+;314!3;%cg2UlDBSSyKb`2YX_07*qoM6N<$f)lC}KL7v#

literal 0
HcmV?d00001

diff --git a/doc/images/symbols/symbol_filled_char_at.png b/doc/images/symbols/symbol_filled_char_at.png
new file mode 100644
index 0000000000000000000000000000000000000000..2eed980b756f15caba211bf0850fa117d4d0a8c9
GIT binary patch
literal 2090
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
UV`^{JS^xk507*qoM6N<$f_Ap&mjD0&

literal 0
HcmV?d00001

diff --git a/doc/images/symbols/symbol_filled_char_club.png b/doc/images/symbols/symbol_filled_char_club.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f5491e2d1ef35a32a1725edcfde69c445a19d8e
GIT binary patch
literal 1112
zcmV-e1gHCnP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<V3Q0skR9J<@mtRa%XBftRr^U7kDab4clYdG=HWA9m29`1BBm_1>
zvdslujD~F&Gi-5iv5U>In~f`@SyI@NMIASr*+@2xON7AONF#%2pyi)1Ng>lBqClmz
z2-0sCb(7jsKS<4<yYqhUd7tMz-+AA2K1B#2_#Y9mmYe$f;rw~HcFlL4o(^SYuzmX)
ziiuUg?G~c?Bd<^tA+pk(Vqbw>>?^Q~tTd-k6yKW1vzm%RD6(7Na>33#FV4w(oIY$}
z&yI1w^|sywD!+b_m^dw${!|eaC1-$2)~VXh1fCfWy~oZ5kOS=5F;4HXv$&@{d|oU6
zT1h$3*9S(Up!w6*pybQZYD=J`u85u<h0M&y3y^Z4sR>f!+>a#(D9Rcq#o(r?Nv5)-
zfWZMlcJdv$ia>Vq9R>&Fwn0jORx3!@=#dtX80$f+mCFq|2ZR8d4LZA2tY3_m7GN2Q
zXWp)0wL(@FD9XyYD>`7c!gEG1Mk5RlLurmfT0m)zgP|cX8X-5wi_NxjZqP2MHw&t(
z;jNux)a}1QieXNgd^yG@Bl+ZqTz=|E;lv53`XJDX00EaTLw>&C<olO6^zz7>h#y7c
z@7s9y8xx(K3c0x<1S~B*uzk}gja8PgkpGK==0a>!DO~ARp;kYP`@I8QU0~}|QM=a~
zR&s#ay**faRdjXv$NdCYtq>En$kw>ounX80KTCAveXNf>o1Xxe3(_{bL$=LYp(wC5
zVGfrogaCs9CT4WuXMcc+865^g2mvM&IBsj{w#SB@yxSg&<F*!)$v+;@hOg`v+`T?S
z#}~h{PVEf~`Qnm_{G(+=Z;9r&i~jo?FbU1|3WGOdc&DL&={Zf%g0r4=QZaz(ISrK!
z1zf!mjk#W85CL>{LggVZQ@8H(-tHl?Q>REZ%yE5c13z}8amJED^U+p{vwh>axhIj5
zFN>%s7^A{uXG^S`(aA`xqp^H@F@sI<5uEx?MP6Q@z@Q(aygcZ!sW^UIL*uDusry-t
z5U^prVAo4Nz00>pt@6cO`XmmRlW}_#6a_NUm#F?&O-&7Gf}1J#N3^g2^YaiD1r7%!
zCBfCNejy|AE&%<1$B<c5&dr;?PI9?Gr(2nHIi&svG#b$BL8XEV7a)G)0_mF{4y%kr
zCr{}Yu~>XLdc7REw1DL}^SzfhUKst)c7O=A;PvOnIDK;UU9&0yZEf&JyTXU1g8^$t
zULByhMWMa@2?-b(fdg-QIr7>d&pho6SkFwJp{itv{S{v9c6kBP2a{ceUWWS@7;9)k
z6A|3%dy8t455Gx9riONl+_Ooa4TpvmCZ=^9G#7@<yXDlO{1xVd2|!B=oI591w7eXO
ei^DA7N#P&OvgEqi3;u}!0000<MNUMnLSTaKWd>^i

literal 0
HcmV?d00001

diff --git a/lib/jkqtcommon/jkqtpdrawingtools.cpp b/lib/jkqtcommon/jkqtpdrawingtools.cpp
index 33c350a2c0..6d9b6178d9 100644
--- a/lib/jkqtcommon/jkqtpdrawingtools.cpp
+++ b/lib/jkqtcommon/jkqtpdrawingtools.cpp
@@ -92,13 +92,19 @@ QString JKQTPGraphSymbols2String(JKQTPGraphSymbols pos) {
         case JKQTPCirclePeace: return "symbol_circle_peace";
         case JKQTPSymbolCount: JKQTPGraphSymbols2String(JKQTPMaxSymbolID);
         case JKQTPCharacterSymbol:
-        break;
+        case JKQTPFilledCharacterSymbol:
+            break;
     }
-    if (pos>=JKQTPCharacterSymbol && pos<=JKQTPCharacterSymbol+0xFF) {
+    if (pos>=JKQTPCharacterSymbol && pos<=JKQTPCharacterSymbol+0xFFFF) {
         QString s=QString::number(pos-JKQTPCharacterSymbol,16);
         while (s.size()<4) s="0"+s;
         return "symbol_char"+s;
     }
+    if (pos>=JKQTPFilledCharacterSymbol && pos<=JKQTPFilledCharacterSymbol+0xFFFF) {
+        QString s=QString::number(pos-JKQTPFilledCharacterSymbol,16);
+        while (s.size()<4) s="0"+s;
+        return "symbol_filled_char"+s;
+    }
     return "";
 }
 
@@ -169,11 +175,16 @@ QString JKQTPGraphSymbols2NameString(JKQTPGraphSymbols pos) {
         case JKQTPMale: return QObject::tr("male");
         case JKQTPCirclePeace: return QObject::tr("circled peace");
         case JKQTPSymbolCount: JKQTPGraphSymbols2NameString(JKQTPMaxSymbolID);
-        case JKQTPCharacterSymbol: break;
+        case JKQTPCharacterSymbol:
+        case JKQTPFilledCharacterSymbol:
+            break;
     }
-    if (pos>=JKQTPCharacterSymbol && pos<=JKQTPCharacterSymbol+0xFF) {
+    if (pos>=JKQTPCharacterSymbol && pos<=JKQTPCharacterSymbol+0xFFFF) {
         return QObject::tr("character")+" '"+QChar(static_cast<uint16_t>(pos-JKQTPCharacterSymbol))+"'";
     }
+    if (pos>=JKQTPFilledCharacterSymbol && pos<=JKQTPFilledCharacterSymbol+0xFFFF) {
+        return QObject::tr("filled character")+" '"+QChar(static_cast<uint16_t>(pos-JKQTPFilledCharacterSymbol))+"'";
+    }
     return "";
 }
 JKQTPGraphSymbols String2JKQTPGraphSymbols(const QString& pos)  {
@@ -256,6 +267,18 @@ JKQTPGraphSymbols String2JKQTPGraphSymbols(const QString& pos)  {
     if (posT.startsWith("symbol_char")) {
         return JKQTPCharacterSymbol+posT.mid(11).toUInt(nullptr,16);
     }
+    if (posT.startsWith("symbol_fillcharsym") && posT.size()>18) {
+        return JKQTPFilledCharacterSymbol+posT[18].unicode();
+    }
+    if (posT.startsWith("fillcharsym") && posT.size()>11) {
+        return JKQTPFilledCharacterSymbol+posT[11].unicode();
+    }
+    if (posT.startsWith("filled_char")) {
+        return JKQTPFilledCharacterSymbol+posT.mid(11).toUInt(nullptr,16);
+    }
+    if (posT.startsWith("symbol_filled_char")) {
+        return JKQTPFilledCharacterSymbol+posT.mid(18).toUInt(nullptr,16);
+    }
     return JKQTPNoSymbol;
 }
 
diff --git a/lib/jkqtcommon/jkqtpdrawingtools.h b/lib/jkqtcommon/jkqtpdrawingtools.h
index 2d75e8108f..804d6b132a 100644
--- a/lib/jkqtcommon/jkqtpdrawingtools.h
+++ b/lib/jkqtcommon/jkqtpdrawingtools.h
@@ -138,7 +138,13 @@ enum JKQTPGraphSymbols: uint64_t {
     JKQTPMaxSymbolID=JKQTPSymbolCount-1, /*!< \brief points to the last available symbol, can be used to iterate over all symbols: <code>for (int i=0; i<=static_cast<int>(JKQTPMaxSymbolID); i++) { JKQTPGraphSymbols s=static_cast<JKQTPGraphSymbols>(i); ... }</code> */
     JKQTPDefaultSymbol=JKQTPCross, /*!< \brief a default symbol used for plotting */
 
-    JKQTPCharacterSymbol=0x100, /*!< \brief you can use any character from a QFont by supplying \c JKQTPCharacterSymbol+QChar('').unicode() as JKQTPGraphSymbols  \image html symbols/symbol_char_at.png "generated by JKQTPCharacterSymbol+QChar('@').unicode()" */
+    JKQTPCharacterSymbol=0x100, /*!< \brief draw a font-character as symbol with defined fill-brush (taken from symbol-color), you can use any character from a QFont by supplying \c JKQTPCharacterSymbol+QChar('').unicode() as JKQTPGraphSymbols
+                                            \image html symbols/symbol_char_at.png "generated by JKQTPCharacterSymbol+QChar('@').unicode()"
+                                            \image html symbols/symbol_char_club.png "generated by JKQTPCharacterSymbol+QChar(0x2663).unicode()" */
+    JKQTPFilledCharacterSymbol=JKQTPCharacterSymbol+0xFFFF+0xF, /*!< \brief draw a font-character as symbol with defined outline-pen and fill-brush, you can use any character from a QFont by supplying \c JKQTPFilledCharacterSymbol+QChar('').unicode() as JKQTPGraphSymbols
+                                                             \image html symbols/symbol_filled_char_at.png "generated by JKQTPFilledCharacterSymbol+QChar('@').unicode()"
+                                                             \image html symbols/symbol_filled_char_club.png "generated by JKQTPFilledCharacterSymbol+QChar(0x2663).unicode()"
+                                                             */
 };
 
 inline JKQTPGraphSymbols operator+(JKQTPGraphSymbols a, uint8_t b) {
@@ -506,6 +512,8 @@ inline void JKQTPPlotSymbol(TPainter& painter, double x, double y, JKQTPGraphSym
     p.setCapStyle(Qt::FlatCap);
     QPen pDescaled=p;
     pDescaled.setWidthF(pDescaled.widthF()/symbolSize);
+    QFont fDescaled=symbolFont;
+    fDescaled.setPointSizeF(fDescaled.pointSizeF()/symbolSize);
     const QBrush b=QBrush(fillColor, Qt::SolidPattern);
 
 
@@ -864,6 +872,7 @@ inline void JKQTPPlotSymbol(TPainter& painter, double x, double y, JKQTPGraphSym
         case JKQTPNoSymbol:
         case JKQTPSymbolCount:
         case JKQTPCharacterSymbol:
+        case JKQTPFilledCharacterSymbol:
             break;
     }
     if (symbol>=JKQTPCharacterSymbol && symbol<=JKQTPCharacterSymbol+0xFFFF) {
@@ -883,12 +892,27 @@ inline void JKQTPPlotSymbol(TPainter& painter, double x, double y, JKQTPGraphSym
         //painter.setPen(QColor("red"));
         //painter.drawRect(tbr);
         //painter.drawEllipse(QPointF(0,0),2,2);
-        painter.setBrush(QColor(Qt::transparent));
-        painter.setPen(pDescaled.color());
-        painter.setFont(symbolFont);
-        painter.drawText(0.0,0.0,ch);
+        painter.setBrush(color);
+        painter.setPen(Qt::NoPen);
+        QPainterPath path;
+        path.addText(0,0,symbolFont, ch),
+        painter.drawPath(path);
+    }
+    if (symbol>=JKQTPFilledCharacterSymbol && symbol<=JKQTPFilledCharacterSymbol+0xFFFF) {
+        symbolFont.setStyleStrategy(QFont::PreferDefault);
+        const QChar ch(static_cast<uint16_t>(symbol-JKQTPFilledCharacterSymbol));
+        const QFontMetricsF fm(symbolFont);
+        const QRectF tbr=fm.tightBoundingRect(ch);
+        const double scale=symbolSize/qMax(tbr.width(), tbr.height());
+        painter.setPen(p);
+        painter.translate(QPointF(x,y));
+        painter.scale(scale,scale);
+        painter.translate(-tbr.center());//QPointF(-tbr.width()/2.0,-tbr.height()/2.0)+QPointF(tbr.x(),tbr.y()));
+        painter.setBrush(b);
+        QPainterPath path;
+        path.addText(0,0,symbolFont, ch),
+        painter.drawPath(path);
     }
-
 }
 
 template <class TPainter>
diff --git a/tools/jkqtplotter_doc_imagegenerator/jkqtplotter_doc_imagegenerator.cpp b/tools/jkqtplotter_doc_imagegenerator/jkqtplotter_doc_imagegenerator.cpp
index 48dd77bc3f..2b93774656 100644
--- a/tools/jkqtplotter_doc_imagegenerator/jkqtplotter_doc_imagegenerator.cpp
+++ b/tools/jkqtplotter_doc_imagegenerator/jkqtplotter_doc_imagegenerator.cpp
@@ -79,13 +79,32 @@ int main(int argc, char* argv[])
             JKQTPEnhancedPainter p;
             startPainting(img, p, iconsize, backgroundColor);
             JKQTPPlotSymbol(p, iconsize/2,iconsize/2,s,iconsize-4,2,QColor("blue"), QColor("salmon").lighter(120),QGuiApplication::font().family());
+            p.setPen(QPen(QColor("green"),0.5));
+            //p.drawRect(2,2,iconsize-4,iconsize-4);
             stopPaintingAndSave(img, p, outputDir.absoluteFilePath(JKQTPGraphSymbols2String(s)+".png"));
         }
         QImage  img;
         JKQTPEnhancedPainter p;
         startPainting(img, p, iconsize, backgroundColor);
-        JKQTPPlotSymbol(p, iconsize/2,iconsize/2,JKQTPCharacterSymbol+QChar('@').unicode(),iconsize-4,2,QColor("blue"), QColor("blue").lighter(),QGuiApplication::font().family());
+        JKQTPPlotSymbol(p, iconsize/2,iconsize/2,JKQTPCharacterSymbol+QChar('@').unicode(),iconsize-4,1,QColor("blue"), QColor("salmon").lighter(120),QGuiApplication::font().family());
+        p.setPen(QPen(QColor("green"),0.5));
+        //p.drawRect(2,2,iconsize-4,iconsize-4);
         stopPaintingAndSave(img, p, outputDir.absoluteFilePath("symbol_char_at.png"));
+        startPainting(img, p, iconsize, backgroundColor);
+        JKQTPPlotSymbol(p, iconsize/2,iconsize/2,JKQTPFilledCharacterSymbol+QChar('@').unicode(),iconsize-4,0.5,QColor("blue"), QColor("salmon").lighter(120),QGuiApplication::font().family());
+        p.setPen(QPen(QColor("green"),0.5));
+        //p.drawRect(2,2,iconsize-4,iconsize-4);
+        stopPaintingAndSave(img, p, outputDir.absoluteFilePath("symbol_filled_char_at.png"));
+        startPainting(img, p, iconsize, backgroundColor);
+        JKQTPPlotSymbol(p, iconsize/2,iconsize/2,JKQTPCharacterSymbol+QChar(0x2663).unicode(),iconsize-4,1,QColor("blue"), QColor("salmon").lighter(120),QGuiApplication::font().family());
+        p.setPen(QPen(QColor("green"),0.5));
+        //p.drawRect(2,2,iconsize-4,iconsize-4);
+        stopPaintingAndSave(img, p, outputDir.absoluteFilePath("symbol_char_club.png"));
+        startPainting(img, p, iconsize, backgroundColor);
+        JKQTPPlotSymbol(p, iconsize/2,iconsize/2,JKQTPFilledCharacterSymbol+QChar(0x2663).unicode(),iconsize-4,0.5,QColor("blue"), QColor("salmon").lighter(120),QGuiApplication::font().family());
+        p.setPen(QPen(QColor("green"),0.5));
+        //p.drawRect(2,2,iconsize-4,iconsize-4);
+        stopPaintingAndSave(img, p, outputDir.absoluteFilePath("symbol_filled_char_club.png"));
     }
 
     if (listlinedecorators) {