CHANGED: updated default palette_MatlabLegacy_step.png

NEW: added more steps palettes

lib/jkqtcommon/jkqtpbasicimagetools.cpp

@@ -63,13 +63,13 @@ QMap<int, JKQTPImageTools::LUTData > JKQTPImageTools::getDefaultLUTs() {
         const QString palNT=QObject::tr("steps: JKQTPlotter Default");
         lutstore[palette]=JKQTPImageTools::LUTData(palN, palNT);
         JKQTPPaletteList lst;
-        lst<<jkqtp_qRgbOpaque(0xd50000);
-        lst<<jkqtp_qRgbOpaque(0x0039d6);
-        lst<<jkqtp_qRgbOpaque(0xffdd00);
-        lst<<jkqtp_qRgbOpaque(0x00bb40);
-        lst<<jkqtp_qRgbOpaque(0xa84ce4);
-        lst<<jkqtp_qRgbOpaque(0xfd8600);
-        lst<<jkqtp_qRgbOpaque(0x0b069c);
+        lst<<jkqtp_qRgbOpaque(0xBB0000);
+        lst<<jkqtp_qRgbOpaque(0x00C11D);
+        lst<<jkqtp_qRgbOpaque(0x0039D6);
+        lst<<jkqtp_qRgbOpaque(0xFFDD00);
+        lst<<jkqtp_qRgbOpaque(0xC05FFF);
+        lst<<jkqtp_qRgbOpaque(0xDE7704);
+        lst<<jkqtp_qRgbOpaque(0x03039A);
 
 
         lutstore[palette].lut=JKQTPBuildColorPaletteLUTColorsOnlySteps(lst);
@@ -2551,6 +2551,91 @@ QMap<int, JKQTPImageTools::LUTData > JKQTPImageTools::getDefaultLUTs() {
         lutstore[JKQTPMathImageOkabeItoDarker_STEP]=JKQTPImageTools::LUTData(JKQTPModifyLUT(lutstore[JKQTPMathImageOkabeIto_STEP].lut, [](QRgb c) { return QColor(c).darker().rgb(); }), "OkabeItoDarker_step", QObject::tr("steps: Okabe-Ito, darkened"));
         lutstore[JKQTPMathImageOkabeItoLighter_STEP]=JKQTPImageTools::LUTData(JKQTPModifyLUT(lutstore[JKQTPMathImageOkabeIto_STEP].lut, [](QRgb c) { return QColor(c).lighter().rgb(); }), "OkabeItoLighter_step", QObject::tr("steps: Okabe-Ito, lighter"));
 
+    }
+    {
+        JKQTPPaletteList lst;
+        lst<<jkqtp_qRgbOpaque(0xEE6677);
+        lst<<jkqtp_qRgbOpaque(0x228833);
+        lst<<jkqtp_qRgbOpaque(0x4477AA);
+        lst<<jkqtp_qRgbOpaque(0x009E73);
+        lst<<jkqtp_qRgbOpaque(0xCCBB44);
+        lst<<jkqtp_qRgbOpaque(0x66CCEE);
+        lst<<jkqtp_qRgbOpaque(0xAA3377);
+        lst<<jkqtp_qRgbOpaque(0xBBBBBB);
+
+        lutstore[JKQTPMathImageTol_STEP]=JKQTPImageTools::LUTData(JKQTPBuildColorPaletteLUTColorsOnlySteps(lst), "Tol_step", QObject::tr("steps: Tol"));
+
+    }
+    {
+        JKQTPPaletteList lst;
+        lst<<jkqtp_qRgbOpaque(0xBBCC33);
+        lst<<jkqtp_qRgbOpaque(0xAAAA00);
+        lst<<jkqtp_qRgbOpaque(0x77AADD);
+        lst<<jkqtp_qRgbOpaque(0xEE8866);
+        lst<<jkqtp_qRgbOpaque(0xEEDD88);
+        lst<<jkqtp_qRgbOpaque(0xFFAABB);
+        lst<<jkqtp_qRgbOpaque(0x99DDFF);
+        lst<<jkqtp_qRgbOpaque(0x44BB99);
+        lst<<jkqtp_qRgbOpaque(0xDDDDDD);
+
+        lutstore[JKQTPMathImageTolLight_STEP]=JKQTPImageTools::LUTData(JKQTPBuildColorPaletteLUTColorsOnlySteps(lst), "TolLight_step", QObject::tr("steps: Tol, Light"));
+
+    }
+    {
+        JKQTPPaletteList lst;
+        lst<<jkqtp_qRgbOpaque(0x88CCEE);
+        lst<<jkqtp_qRgbOpaque(0x44AA99);
+        lst<<jkqtp_qRgbOpaque(0x117733);
+        lst<<jkqtp_qRgbOpaque(0x332288);
+        lst<<jkqtp_qRgbOpaque(0xDDCC77);
+        lst<<jkqtp_qRgbOpaque(0x999933);
+        lst<<jkqtp_qRgbOpaque(0xCC6677);
+        lst<<jkqtp_qRgbOpaque(0x882255);
+        lst<<jkqtp_qRgbOpaque(0xAA4499);
+        lst<<jkqtp_qRgbOpaque(0xDDDDDD);
+
+        lutstore[JKQTPMathImageTolMuted_STEP]=JKQTPImageTools::LUTData(JKQTPBuildColorPaletteLUTColorsOnlySteps(lst), "TolMuted_step", QObject::tr("steps: Tol, Muted"));
+
+    }
+    {
+        JKQTPPaletteList lst;
+        lst<<QColor::fromRgbF(0.0000, 0.4470, 0.7410);
+        lst<<QColor::fromRgbF(0.8500, 0.3250, 0.0980);
+        lst<<QColor::fromRgbF(0.9290, 0.6940, 0.1250);
+        lst<<QColor::fromRgbF(0.4940, 0.1840, 0.5560);
+        lst<<QColor::fromRgbF(0.4660, 0.6740, 0.1880);
+        lst<<QColor::fromRgbF(0.3010, 0.7450, 0.9330);
+        lst<<QColor::fromRgbF(0.6350, 0.0780, 0.1840);
+
+        lutstore[JKQTPMathImageMatlab_STEP]=JKQTPImageTools::LUTData(JKQTPBuildColorPaletteLUTColorsOnlySteps(lst), "Matlab_step", QObject::tr("steps: Matlab"));
+
+    }
+    {
+        JKQTPPaletteList lst;
+        lst<<jkqtp_qRgbOpaque(0x1F77B4);
+        lst<<jkqtp_qRgbOpaque(0xFF7F0E);
+        lst<<jkqtp_qRgbOpaque(0x2CA02C);
+        lst<<jkqtp_qRgbOpaque(0xD62728);
+        lst<<jkqtp_qRgbOpaque(0x9467BD);
+        lst<<jkqtp_qRgbOpaque(0x8C564B);
+        lst<<jkqtp_qRgbOpaque(0xE377C2);
+        lst<<jkqtp_qRgbOpaque(0x7F7F7F);
+        lst<<jkqtp_qRgbOpaque(0xBCBD22);
+        lst<<jkqtp_qRgbOpaque(0x17BECF);
+        lutstore[JKQTPMathImageMatplotlib_STEP]=JKQTPImageTools::LUTData(JKQTPBuildColorPaletteLUTColorsOnlySteps(lst), "Matplotlib_step", QObject::tr("steps: Matplotlib"));
+    }
+    {
+        JKQTPPaletteList lst;
+        lst<<QColor::fromRgbF(0, 0, 1);
+        lst<<QColor::fromRgbF(0, 0.5, 0);
+        lst<<QColor::fromRgbF(1, 0, 0);
+        lst<<QColor::fromRgbF(0, 0.75, 0.75);
+        lst<<QColor::fromRgbF(0.75, 0, 0.75);
+        lst<<QColor::fromRgbF(0.75, 0.75, 0);
+        lst<<QColor::fromRgbF(0.25, 0.25, 0.25);
+
+        lutstore[JKQTPMathImageMatlabLegacy_STEP]=JKQTPImageTools::LUTData(JKQTPBuildColorPaletteLUTColorsOnlySteps(lst), "MatlabLegacy_step", QObject::tr("steps: Matlab, Legacy"));
+
     }
 
     lutstore[JKQTPMathImageCubeHelixClassic]=JKQTPImageTools::LUTData(JKQTPCreateGreensCubeHelixLUT(0.5, -1.5, 1.0, LUTSIZE, 0.0, 1.0, 1.2, 1.2), "CubeHelixClassic", QObject::tr("CubeHelix Classic"));
@@ -2561,7 +2646,8 @@ QMap<int, JKQTPImageTools::LUTData > JKQTPImageTools::getDefaultLUTs() {
     lutstore[JKQTPMathImageCubeHelix2_STEP]=JKQTPImageTools::LUTData(JKQTPCreateGreensCubeHelixLUT(2.0, -1.0, 1.0, JKQTPImageTools::NDEFAULTSTEPS, 0.0, 1.0, 1.5, 1.5), "CubeHelix2_step", QObject::tr("steps: CubeHelix 2"));
     lutstore[JKQTPMathImageCubeHelix3]=JKQTPImageTools::LUTData(JKQTPCreateGreensCubeHelixLUT(2.0, -1.0, 1.0, LUTSIZE, 0.0, 1.0, 1.5, 1.5), "CubeHelix3", QObject::tr("CubeHelix 3"));
     lutstore[JKQTPMathImageCubeHelix3_STEP]=JKQTPImageTools::LUTData(JKQTPCreateGreensCubeHelixLUT(2.0, 1.0, 1.0, JKQTPImageTools::NDEFAULTSTEPS, 0.0, 1.0, 3.0, 3.0), "CubeHelix3_step", QObject::tr("steps: CubeHelix 3"));
-
+    lutstore[JKQTPMathImageSeaborn_STEP]=JKQTPImageTools::LUTData("#4C72B0, #DD8452, #55A868, #C44E52, #8172B3, #937860, #DA8BC3, #8C8C8C, #CCB974, #64B5CD", "Seaborn_step", QObject::tr("steps: Seaborn"));
+    lutstore[JKQTPMathImageSeabornPastel_STEP]=JKQTPImageTools::LUTData("#A1C9F4, #FFB482, #8DE5A1, #FF9F9B, #D0BBFF, #DEBB9B, #FAB0E4, #CFCFCF, #FFFEA3, #B9F2F0", "SeabornPastel_step", QObject::tr("steps: Seaborn Pastel"));
 
 
     return lutstore;
@@ -3131,6 +3217,15 @@ JKQTPImageTools::LUTData::LUTData(const JKQTPImageTools::LUTType &_lut, const QS
 
 }
 
+JKQTPImageTools::LUTData::LUTData(const QString &_lut, const QString &_name, const QString &_nameT):
+    lut(), name(_name), nameT(_nameT)
+{
+    const auto lt=_lut.simplified().split(",");
+    for (const auto& l: lt) {
+        lut<<jkqtp_String2QColor(l).rgb();
+    }
+}
+
 JKQTPImageTools::LUTData::LUTData(const QString &_name, const QString &_nameT):
     lut(), name(_name), nameT(_nameT)
 {

lib/jkqtcommon/jkqtpbasicimagetools.h

@@ -154,22 +154,35 @@ enum JKQTPMathImageColorPalette {
     JKQTPMathImageINVERTED_Plasma_STEP, /*!< \image html palettes/palette_invplasma_step.png
                                 \see from https://github.com/BIDS/colormap/blob/master/colormaps.py */
     JKQTPMathImageIBMColorBlindSafe, /*!< \image html palettes/palette_IBMColorBlindSafe.png
-                                \note color-blind freindly!
+                                \note color-blind friendly!
                                 \see from https://lospec.com/palette-list/ibm-color-blind-safe */
     JKQTPMathImageIBMColorBlindSafe_STEP, /*!< \image html palettes/palette_IBMColorBlindSafe_step.png
-                                \note color-blind freindly!
+                                \note color-blind friendly!
                                 \see from https://lospec.com/palette-list/ibm-color-blind-safe */
     JKQTPMathImageOkabeIto_STEP, /*!< \image html palettes/palette_OkabeIto_step.png
-                                \note color-blind freindly!
+                                \note color-blind friendly!
                                 \see from https://yoshke.org/blog/colorblind-friendly-diagrams and M. Okabe and K. Ito, How to make figures and presentations that are friendly to color blind people, University of Tokyo, 2002. */
-    JKQTPMathImageOkabeItoDarker_STEP, /*!< darker version of JKQTPMathImageOkabeItoDarker_STEP \image html palettes/palette_OkabeItoDarker_step.png
-                                \note color-blind freindly!
-                                \see from https://yoshke.org/blog/colorblind-friendly-diagrams and M. Okabe and K. Ito, How to make figures and presentations that are friendly to color blind people, University of Tokyo, 2002. */
-    JKQTPMathImageOkabeItoLighter_STEP, /*!< lighter version of JKQTPMathImageOkabeItoDarker_STEP \image html palettes/palette_OkabeItoLighter_step.png
-                                \note color-blind freindly!
+    JKQTPMathImageTol_STEP, /*!< \image html palettes/palette_Tol_step.png
+                                  \note color-blind friendly!
+                                  \see https://thenode.biologists.com/data-visualization-with-flying-colors/research/*/
+    JKQTPMathImageTolBright_STEP=JKQTPMathImageTol_STEP,
+    JKQTPMathImageTolMuted_STEP, /*!< \image html palettes/palette_TolMuted_step.png
+                                        \note color-blind friendly!
+                                        \see from https://yoshke.org/blog/colorblind-friendly-diagrams and Tol, B. Points of view: Color blindness. Nat Methods 8, 441 (2011). https://doi.org/10.1038/nmeth.1618 */
+    JKQTPMathImageTolLight_STEP, /*!< \image html palettes/palette_TolLight_step.png
+                                         \note color-blind friendly!
+                                         \see https://davidmathlogic.com/colorblind/#%23000000-%23E69F00-%2356B4E9-%23009E73-%23F0E442-%230072B2-%23D55E00-%23CC79A7 and Tol, B. Points of view: Color blindness. Nat Methods 8, 441 (2011). https://doi.org/10.1038/nmeth.1618 */
+    JKQTPMathImageOkabeItoDarker_STEP, /*!< \image html palettes/palette_OkabeItoDarker_step.png
+                                            darker version of JKQTPMathImageOkabeIto_STEP
+                                            \note color-blind friendly!
                                             \see from https://yoshke.org/blog/colorblind-friendly-diagrams and M. Okabe and K. Ito, How to make figures and presentations that are friendly to color blind people, University of Tokyo, 2002. */
+    JKQTPMathImageOkabeItoLighter_STEP, /*!< \image html palettes/palette_OkabeItoLighter_step.png
+                                             lighter version of JKQTPMathImageOkabeIto_STEP
+                                             \note color-blind friendly!
+                                             \see https://davidmathlogic.com/colorblind/#%23000000-%23E69F00-%2356B4E9-%23009E73-%23F0E442-%230072B2-%23D55E00-%23CC79A7 and M. Okabe and K. Ito, How to make figures and presentations that are friendly to color blind people, University of Tokyo, 2002. */
     JKQTPMathImageDefault_STEP, /*!< \image html palettes/palette_jkqtplotterdefault_step.png
                                      This is the color cycle used to color graphs in JKQTPlotter's default style.
+                                     \see https://davidmathlogic.com/colorblind/#%23BB0000-%2300C11D-%230039D6-%23FFDD00-%23C05FFF-%23DE7704-%2303039A
                                  */
     JKQTPMathImageCubeHelixClassic, /*!< \image html palettes/palette_CubeHelixClassic.png
                                      This palette was created using Green's CubeHelix method with the parameters shown in the paper: start=0.5, rotation=-1.5, gamma=1.0, saturation=1.2.
@@ -203,6 +216,11 @@ enum JKQTPMathImageColorPalette {
                                      This palette was created using Green's CubeHelix method with the parameters shown in the paper: start=0.5, rotation=-1.5, gamma=1.0, saturation=1.2.
                                      \see JKQTPCreateGreensCubeHelixLUT()
                                  */
+    JKQTPMathImageMatlab_STEP, /*!< \image html palettes/palette_Matlab_step.png */
+    JKQTPMathImageMatlabLegacy_STEP, /*!< \image html palettes/palette_Matlab_step.png */
+    JKQTPMathImageMatplotlib_STEP, /*!< \image html palettes/palette_Matplotlib_step.png */
+    JKQTPMathImageSeaborn_STEP, /*!< \image html palettes/palette_Seaborn_step.png */
+    JKQTPMathImageSeabornPastel_STEP, /*!< \image html palettes/palette_SeabornPastel_step.png */
 
 
     JKQTPMathImageBLUEMAGENTAYELLOW, /*!< \image html palettes/palette_BlMaYe.png */
@@ -552,6 +570,7 @@ struct JKQTPImageTools {
         struct LUTData {
             LUTData();
             LUTData(const LUTType& _lut, const QString& _name, const QString& _nameT);
+            LUTData(const QString& _lut, const QString& _name, const QString& _nameT);
             LUTData(const QString& _name, const QString& _nameT);
             /** \brief the LUT itself */
             LUTType lut;
@@ -1107,6 +1126,17 @@ public:
         push_back(rgb);
         return *this;
     }
+    inline void push_back(QColor color) {
+        push_back(color.rgb());
+    }
+    inline void push_back(double pos, QColor color) {
+        push_back(ListType::value_type(pos, color.rgb()));
+    }
+    using ListType::operator<<;
+    inline JKQTPPaletteList& operator<<(QColor color) {
+        push_back(color);
+        return *this;
+    }
 
     /** \brief returns the minimum value of the double-component */
     inline double getMinPosition() const {

lib/jkqtplotter/jkqtpgraphsbasestyle.cpp

@@ -216,13 +216,12 @@ JKQTGraphsBaseStyle::JKQTGraphsBaseStyle(const JKQTBasePlotterStyle& parent):
 
 QVector<QColor> JKQTGraphsBaseStyle::getDefaultGraphColors()
 {
-    // color scale by Okabe & Ito:
-    // M. Okabe and K. Ito, “How to make figures and presentations that are friendly to color blind people,” University of Tokyo, 2002.
-    // see also: https://yoshke.org/blog/colorblind-friendly-diagrams
-    //defaultGraphColors<<QColor(0xD55E00).darker(150)<<QColor(0x0072B2).darker(150)<<QColor(0xF0E442).darker(150)<<QColor(0x009E73).darker(150)
-    //                   <<QColor(0x56B4E9).darker(150)<<QColor(0xE69F00).darker(150)<<QColor(0,0,0)<<QColor(0xCC79A7).darker(150);
-    // a bit brighter than above
-    return QVector<QColor>()<<QColor(0xD50000)<<QColor(0x0039D6)<<QColor(0xFFDD00)<<QColor(0x00BB40)<<QColor(0xA84CE4)<<QColor(0xFD8600)<<QColor(0x0B069C);
+    QVector<QColor> cols;
+    const auto& lut=JKQTPImageTools::getLUTforPalette(JKQTPMathImageDefault_STEP);
+    for (const auto& c: lut) {
+        cols.push_back(QColor(c));
+    }
+    return cols;
 }
 
 QVector<Qt::PenStyle> JKQTGraphsBaseStyle::getDefaultGraphPenStyles()
@@ -275,7 +274,7 @@ void JKQTGraphsBaseStyle::loadSettings(const QSettings &settings, const QString
         loadColors=false;
         defaultGraphColors=defaultStyle.defaultGraphColors;
     }
-    const QString ini_colors_fromm_palettes=settings.value("auto_styles/use_color_from_palette", "").toString();
+    const QString ini_colors_fromm_palettes=settings.value(group+"auto_styles/use_color_from_palette", "").toString();
     if (JKQTPImageTools::getPredefinedPalettesMachineReadable().contains(ini_colors_fromm_palettes)) {
         loadColors=false;
         const auto& lut=JKQTPImageTools::getLUTforPalette(JKQTPImageTools::String2JKQTPMathImageColorPalette(ini_colors_fromm_palettes));

lib/jkqtplotter/resources/styles/seaborn.ini

@@ -234,12 +234,7 @@ axis_colorbar_top\minor_grid\width=0.5
 axis_colorbar_top\minor_grid\style=dot
 graphs\antialiase=true
 graphs\palette=viridis
-graphs\auto_styles\color0=blue
-graphs\auto_styles\color1=green
-graphs\auto_styles\color2=firebrick
-graphs\auto_styles\color3=darkviolet
-graphs\auto_styles\color4=goldenrod
-graphs\auto_styles\color5=darkcyan
+graphs\auto_styles\use_color_from_palette=Seaborn_step
 graphs\auto_styles\line_style0=solid
 graphs\auto_styles\line_style1=dash
 graphs\auto_styles\line_style2=dot