From deffa3a40715b0b494d36bd33b2bdeb797c7e87a Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Tue, 26 Sep 2023 08:28:40 +0200 Subject: [PATCH] FIXED: reversed some palettes, so the names match the color order --- doc/images/palettes/palette_OrPu.png | Bin 355 -> 358 bytes doc/images/palettes/palette_PuOr.png | Bin 358 -> 355 bytes doc/images/palettes/palette_blueyellowred.png | Bin 285 -> 288 bytes doc/images/palettes/palette_redyellowblue.png | Bin 289 -> 289 bytes doc/images/palettes/palette_stepsPuOr.png | Bin 224 -> 225 bytes .../palettes/palette_stepsblueyellowred.png | Bin 203 -> 202 bytes .../palettes/palette_stepsredyellowblue.png | Bin 202 -> 203 bytes lib/jkqtcommon/jkqtpbasicimagetools.cpp | 12 ++++++------ 8 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/images/palettes/palette_OrPu.png b/doc/images/palettes/palette_OrPu.png index 5439031f95c16380c883192afe3aaa2710c20b40..797b0badef6cdce8cfcc5696a05574f6cdd6af3c 100644 GIT binary patch delta 310 zcmaFN^o(hOWxa%_i(^Q|oVQb=^Oy~Jm^E2nNLHVprypehC+59a?tW8dmPxLs{2Cg* zef>ExZPLsqX-4m_suWM=Kl}EP;pRI%^Ni)6wP1<>S&Gp+qSDiHT z-~V`D@twa9g0GuaRj>Tpkozos|I5qPW&amf|6Xy`=3Mczr)Pbo@74c#S+o232hUSe zj5c52YoBKR{_?qNuf=Pxc%&{{biHStt5((D$@!nx+KOTSjJKKKNw)6M0@BIqdQ*JAlw)_2s>fBnJGhyq$zmvv4FO#tp6mJI*^ delta 307 zcmaFH^q6UaWxc4Ui(^Q|oVQcFCmk{1aAvjiiO=9Ooo+U(^(~9_%a^ZAt3owD3${#s z^ZctfgMs-B=|3By-?ZCbS$1yy4}%~3o_}b+b>*j3a=7jFGrV@$)4sf0Y5%qEng7<; z_AAZGW+a~GeP;20;|sI1mEo73{QiIS=D$2cyD#4>YhL6>DKPZ$*E2qz)x3CGNi`o^ z&dtmB-tRoS?VsE3Br}Dy_p|@KSz2*%UG1hu!32{Dk9+rNKYw2`r#f#}uG-Ve@(F)c zgd7_T@2RHQ+h=;@{Mx5(Q8jzn@zrfCGENmdKI;Vst0J!d!4FCWD diff --git a/doc/images/palettes/palette_PuOr.png b/doc/images/palettes/palette_PuOr.png index 797b0badef6cdce8cfcc5696a05574f6cdd6af3c..5439031f95c16380c883192afe3aaa2710c20b40 100644 GIT binary patch delta 307 zcmaFH^q6UaWxc4Ui(^Q|oVQcFCmk{1aAvjiiO=9Ooo+U(^(~9_%a^ZAt3owD3${#s z^ZctfgMs-B=|3By-?ZCbS$1yy4}%~3o_}b+b>*j3a=7jFGrV@$)4sf0Y5%qEng7<; z_AAZGW+a~GeP;20;|sI1mEo73{QiIS=D$2cyD#4>YhL6>DKPZ$*E2qz)x3CGNi`o^ z&dtmB-tRoS?VsE3Br}Dy_p|@KSz2*%UG1hu!32{Dk9+rNKYw2`r#f#}uG-Ve@(F)c zgd7_T@2RHQ+h=;@{Mx5(Q8jzn@zrfCGENmdKI;Vst0J!d!4FCWD delta 310 zcmaFN^o(hOWxa%_i(^Q|oVQb=^Oy~Jm^E2nNLHVprypehC+59a?tW8dmPxLs{2Cg* zef>ExZPLsqX-4m_suWM=Kl}EP;pRI%^Ni)6wP1<>S&Gp+qSDiHT z-~V`D@twa9g0GuaRj>Tpkozos|I5qPW&amf|6Xy`=3Mczr)Pbo@74c#S+o232hUSe zj5c52YoBKR{_?qNuf=Pxc%&{{biHStt5((D$@!nx+KOTSjJKKKNw)6M0@BIqdQ*JAlw)_2s>fBnJGhyq$zmvv4FO#tp6mJI*^ diff --git a/doc/images/palettes/palette_blueyellowred.png b/doc/images/palettes/palette_blueyellowred.png index 32287cf667e6b5b1db3237121177c96b677e3a9e..6d85accd8fbe8711d5012cbdd6ebc32a0c886abe 100644 GIT binary patch delta 196 zcmV;#06YJk0-yqrIe*egL_t(|obA-X4uc>NgyGqJqh9)^eO>W@S_C}Ur13ESmo!qk zuoRPt*ZWf>DMHGWB0`x`h7=jwoRk^coRksu*^ZBAt&Mh%ZtuN*-1|jP~?pfNQueVG4COc7xh zX)@)hM@o`vQQ1CiT)T1m-mhuD)j#a{TyyW9`9IvZ=llKsw5JqhN)b|KDng2sGIE=f zB66FPBC|dF@$qbHv#&AK-q+8yuk?GbpXT;{Lyf-n$63dI$06KVzmwX_xy9WK=Uet$ vy^HRA)7@O^*S(9BssPv`003i=*e?}cFWW3C1AgEs00000NkvXXu0mjf1kq#J diff --git a/doc/images/palettes/palette_redyellowblue.png b/doc/images/palettes/palette_redyellowblue.png index 23b42afd6ef50ac4d4df85cd11ffd83d9f54c8e5..5f878224df0e588890c4e19b6bc6e46a06c06b9c 100644 GIT binary patch delta 189 zcmV;u07Czv0-*wsLVrsR!ypWV;US0V&3jF|3-Ta9R3)1%=KrKBl!8r(H07&LYAGt~ zr;e9qT)($#>Tk<2E)Vuh`<&OjyJ!3l@9p`2zt8p*Wl9lJW-3C8lrnOilOl4RlOnS| z+wuOaYqPD<)!x>RweR#h)(>-Azph4G`*ha6-#&NM@1pi}ZWwYm-T9{dX78do-*7j# r`Zez&B}rNYz!s6+E*dcc05J9g*CQ+{$UN@x00000NkvXXu0mjf&4*s2 delta 189 zcmV;u07Czv0-*wsLVw!|!ypiZ;n{to-t+3y;dT6 zmDU2!7B`aroCUt_o18Z1v6^j<>(<`>FtqlD-J-QuRkd2qTYIz5t+hA4F0H+)s`vfc z+Iu{|t-Y$MX?qd)8wLQu3;==|00c7t2xb5f%m5&m0YESVfRVZo8O#76*bhec4KVa{ RI>G<|002ovPDHLkV1m1jNL&B_ delta 138 zcmV;50CoT20pJ0UIcbtfL_t(|obA*h4uJs}$Km%AL{-wwrs_^0DDKH2B%4k8rkLOY zio`A6+5XRSfnWO#$HVkn&DN_~Yj3gHwf2VPzO`3X^_g#5dynV4wKra0t-Y$M%Xw_= s-A?z`URBkky$Jjb1At(WpePpX2O^;lB1PMo{r~^~07*qoM6N<$g2UTJr2qf` diff --git a/doc/images/palettes/palette_stepsblueyellowred.png b/doc/images/palettes/palette_stepsblueyellowred.png index d0db68b125a112d3c0686eaa1bfafd4beff3d2d1..93080ac3725b123061e56949adab2ac0b9284599 100644 GIT binary patch delta 116 zcmV-)0E_?20m=c8IZ=E`L_t(|obA-H5rO~^MA4HN0!txr2K%HI>_dAXH8j&M4#s`2 zft^kMWxlQ7`g8YXY~Gt%_m0@Se%`Hn`{UKRS5>ud&)&TQJ`U}Rz-b7Pnj4Xv5EVan W*9_`1+pv}Z0000_n%+00000NkvXXu0mjfDgic} diff --git a/doc/images/palettes/palette_stepsredyellowblue.png b/doc/images/palettes/palette_stepsredyellowblue.png index 2107030c795d176bbc53ed95fa54fdcef965e6ed..0513769858ce104d2e09ae7430d9256a238ee6ac 100644 GIT binary patch delta 117 zcmV-*0E++00m}i9IZ=H{L_t(|obA-H5yDUmL_tC1kdy|9Odockv;yT2*trSZgZ>P+ z+rUZ5yS(agRI~ds_wKFF-o57ks;a)zt#$AH+5UR(+}ztYyIn^g0E{D%jVKue0D}Dh XizEyi)PUEm00000NkvXXu0mjf JKQTPImageTools::getDefaultLUTs() { } { - JKQTPPaletteList lst { QColor(49,54,149), + JKQTPPaletteList lst { QColor(165,0,38), QColor(253,254,194), - QColor(165,0,38) + QColor(49,54,149) }; const auto& normLUT=lutstore[JKQTPMathImageREDYELLOWBLUE]=JKQTPImageTools::LUTData(JKQTPBuildColorPaletteLUTLinInterpolate(lst), "redyellowblue", QObject::tr("red-yellow-blue (diverging)")); const auto& normStepLUT=lutstore[JKQTPMathImageREDYELLOWBLUE_STEP]=JKQTPImageTools::LUTData(JKQTPBuildColorPaletteLUTLinInterpolate(lst,9), "stepsredyellowblue", QObject::tr("steps: red-yellow-blue (diverging)")); @@ -298,10 +298,10 @@ QMap JKQTPImageTools::getDefaultLUTs() { jkqtp_qRgbOpaque(0x8073AC), jkqtp_qRgbOpaque(0x542788) }; - const auto& normLUT=lutstore[JKQTPMathImagePU_OR]=JKQTPImageTools::LUTData(JKQTPBuildColorPaletteLUTLinInterpolate(lst), "PuOr", QObject::tr("purple-white-orange (diverging)")); - const auto& normStepLUT=lutstore[JKQTPMathImagePU_OR_STEP]=JKQTPImageTools::LUTData(JKQTPBuildColorPaletteLUTColorsOnlySteps(lst), "stepsPuOr", QObject::tr("steps: purple-white-orange (diverging)")); - lutstore[JKQTPMathImageOR_PU]=JKQTPImageTools::LUTData(jkqtp_reversed(normLUT.lut), "OrPu", QObject::tr("orange-white-purple (diverging)")); - lutstore[JKQTPMathImageOR_PU_STEP]=JKQTPImageTools::LUTData(jkqtp_reversed(normStepLUT.lut), "stepsOrPu", QObject::tr("steps: orange-white-purple (diverging)")); + const auto& normLUT=lutstore[JKQTPMathImageOR_PU]=JKQTPImageTools::LUTData(JKQTPBuildColorPaletteLUTLinInterpolate(lst), "OrPu", QObject::tr("orange-white-purple (diverging)")); + const auto& normStepLUT=lutstore[JKQTPMathImageOR_PU_STEP]=JKQTPImageTools::LUTData(JKQTPBuildColorPaletteLUTColorsOnlySteps(lst), "stepsOrPu", QObject::tr("steps: orange-white-purple (diverging)")); + lutstore[JKQTPMathImagePU_OR]=JKQTPImageTools::LUTData(jkqtp_reversed(normLUT.lut), "PuOr", QObject::tr("purple-white-orange (diverging)")); + lutstore[JKQTPMathImagePU_OR_STEP]=JKQTPImageTools::LUTData(jkqtp_reversed(normStepLUT.lut), "stepsPuOr", QObject::tr("steps: purple-white-orange (diverging)")); } {