Merge pull request #38 from Rolisteam/fix-color-display

Add color management for every dice.

1 files changed, 9 insertions, 3 deletions

diff --git a/cli/displaytoolbox.h b/cli/displaytoolbox.h
index 34859e9..30b7ba3 100644
--- a/cli/displaytoolbox.h
+++ b/cli/displaytoolbox.h
@@ -9,16 +9,22 @@
 class DisplayToolBox
 {
 public:
+    enum class Output
+    {
+        Svg,
+        Terminal,
+        Json,
+        Image
+    };
     DisplayToolBox();
 #ifdef PAINTER_OP
-    static QString makeImage(QString scalarText, QString resultStr, QJsonArray array, bool withColor, QString cmd,
-        QString comment, bool allSameFaceCount, bool allSameColor);
+    static QString makeImage(QByteArray svgCode);
 #endif
     static QString colorToTermCode(QString str);
     static QString diceToText(QJsonArray array, bool withColor, bool allSameFaceCount, bool allSameColor);
     static QJsonArray diceToJson(QList<ExportedDiceResult>& diceList, bool& allSameFaceCount, bool& allSameColor);
     static QString diceToSvg(QJsonArray array, bool withColor, bool allSameColor, bool allSameFaceCount);
-    static QString diceResultToString(QJsonObject val);
+    static QString diceResultToString(QJsonObject val, Output type, bool hasColor);
 };
 
 #endif // GENERATEIMAGE_H