diff --git a/MantidQt/API/src/MdConstants.cpp b/MantidQt/API/src/MdConstants.cpp index 63d25f53d96826003a9a1a92b2a955bfc8337f9d..e773a253dce6b986774a3dc0c8e77203c533166c 100644 --- a/MantidQt/API/src/MdConstants.cpp +++ b/MantidQt/API/src/MdConstants.cpp @@ -37,7 +37,7 @@ namespace MantidQt m_defaultBackgroundColor = QColor(84,89,109); // Populate the optional color maps - m_vsiColorMaps.append("Viridis"); + m_vsiColorMaps.append("Viridis (matplotlib)"); m_vsiColorMaps.append("Cool to Warm"); m_vsiColorMaps.append("Blue to Red Rainbow"); m_vsiColorMaps.append("Red to Blue Rainbow"); diff --git a/MantidQt/API/src/MdPlottingCmapsProvider.cpp b/MantidQt/API/src/MdPlottingCmapsProvider.cpp index dcb9d57c341b6743fda3ac35a6d286c552958a99..81b6176c99a5444fb4c38a5d1a219e2294a4bc79 100644 --- a/MantidQt/API/src/MdPlottingCmapsProvider.cpp +++ b/MantidQt/API/src/MdPlottingCmapsProvider.cpp @@ -60,9 +60,9 @@ namespace MantidQt{ #ifdef MAKE_VATES vtkNew<vtkSMTransferFunctionPresets> presets; - // Check for colormap "Viridis". If preset, assume custom colormaps have + // Check for colormap "hot". If preset, assume custom colormaps have // already been loaded. - auto viridisColormap = presets->GetFirstPresetWithName("Viridis"); + auto viridisColormap = presets->GetFirstPresetWithName("hot"); if (viridisColormap.empty()) { const std::string filenames[3] = {"All_slice_viewer_cmaps_for_vsi.json", "All_idl_cmaps.json", diff --git a/installers/colormaps/All_mpl_cmaps.json b/installers/colormaps/All_mpl_cmaps.json index 9d7e96f0614ede8f778300d8ed453b7a2d643f53..af8927492c4c6b0993e3c2f5f836c919fee6a8c0 100644 --- a/installers/colormaps/All_mpl_cmaps.json +++ b/installers/colormaps/All_mpl_cmaps.json @@ -51498,1035 +51498,5 @@ 1, 1 ] - }, - { - "ColorSpace": "RGB", - "Name": "Viridis", - "RGBPoints": [ - 0.0, - 0.267004, - 0.004874, - 0.329415, - 0.003922, - 0.26851, - 0.009605, - 0.335427, - 0.007843, - 0.269944, - 0.014625, - 0.341379, - 0.011765, - 0.271305, - 0.019942, - 0.347269, - 0.015686, - 0.272594, - 0.025563, - 0.353093, - 0.019608, - 0.273809, - 0.031497, - 0.358853, - 0.023529, - 0.274952, - 0.037752, - 0.364543, - 0.027451, - 0.276022, - 0.044167, - 0.370164, - 0.031373, - 0.277018, - 0.050344, - 0.375715, - 0.035294, - 0.277941, - 0.056324, - 0.381191, - 0.039216, - 0.278791, - 0.062145, - 0.386592, - 0.043137, - 0.279566, - 0.067836, - 0.391917, - 0.047059, - 0.280267, - 0.073417, - 0.397163, - 0.05098, - 0.280894, - 0.078907, - 0.402329, - 0.054902, - 0.281446, - 0.08432, - 0.407414, - 0.058824, - 0.281924, - 0.089666, - 0.412415, - 0.062745, - 0.282327, - 0.094955, - 0.417331, - 0.066667, - 0.282656, - 0.100196, - 0.42216, - 0.070588, - 0.28291, - 0.105393, - 0.426902, - 0.07451, - 0.283091, - 0.110553, - 0.431554, - 0.078431, - 0.283197, - 0.11568, - 0.436115, - 0.082353, - 0.283229, - 0.120777, - 0.440584, - 0.086275, - 0.283187, - 0.125848, - 0.44496, - 0.090196, - 0.283072, - 0.130895, - 0.449241, - 0.094118, - 0.282884, - 0.13592, - 0.453427, - 0.098039, - 0.282623, - 0.140926, - 0.457517, - 0.101961, - 0.28229, - 0.145912, - 0.46151, - 0.105882, - 0.281887, - 0.150881, - 0.465405, - 0.109804, - 0.281412, - 0.155834, - 0.469201, - 0.113725, - 0.280868, - 0.160771, - 0.472899, - 0.117647, - 0.280255, - 0.165693, - 0.476498, - 0.121569, - 0.279574, - 0.170599, - 0.479997, - 0.12549, - 0.278826, - 0.17549, - 0.483397, - 0.129412, - 0.278012, - 0.180367, - 0.486697, - 0.133333, - 0.277134, - 0.185228, - 0.489898, - 0.137255, - 0.276194, - 0.190074, - 0.493001, - 0.141176, - 0.275191, - 0.194905, - 0.496005, - 0.145098, - 0.274128, - 0.199721, - 0.498911, - 0.14902, - 0.273006, - 0.20452, - 0.501721, - 0.152941, - 0.271828, - 0.209303, - 0.504434, - 0.156863, - 0.270595, - 0.214069, - 0.507052, - 0.160784, - 0.269308, - 0.218818, - 0.509577, - 0.164706, - 0.267968, - 0.223549, - 0.512008, - 0.168627, - 0.26658, - 0.228262, - 0.514349, - 0.172549, - 0.265145, - 0.232956, - 0.516599, - 0.176471, - 0.263663, - 0.237631, - 0.518762, - 0.180392, - 0.262138, - 0.242286, - 0.520837, - 0.184314, - 0.260571, - 0.246922, - 0.522828, - 0.188235, - 0.258965, - 0.251537, - 0.524736, - 0.192157, - 0.257322, - 0.25613, - 0.526563, - 0.196078, - 0.255645, - 0.260703, - 0.528312, - 0.2, - 0.253935, - 0.265254, - 0.529983, - 0.203922, - 0.252194, - 0.269783, - 0.531579, - 0.207843, - 0.250425, - 0.27429, - 0.533103, - 0.211765, - 0.248629, - 0.278775, - 0.534556, - 0.215686, - 0.246811, - 0.283237, - 0.535941, - 0.219608, - 0.244972, - 0.287675, - 0.53726, - 0.223529, - 0.243113, - 0.292092, - 0.538516, - 0.227451, - 0.241237, - 0.296485, - 0.539709, - 0.231373, - 0.239346, - 0.300855, - 0.540844, - 0.235294, - 0.237441, - 0.305202, - 0.541921, - 0.239216, - 0.235526, - 0.309527, - 0.542944, - 0.243137, - 0.233603, - 0.313828, - 0.543914, - 0.247059, - 0.231674, - 0.318106, - 0.544834, - 0.25098, - 0.229739, - 0.322361, - 0.545706, - 0.254902, - 0.227802, - 0.326594, - 0.546532, - 0.258824, - 0.225863, - 0.330805, - 0.547314, - 0.262745, - 0.223925, - 0.334994, - 0.548053, - 0.266667, - 0.221989, - 0.339161, - 0.548752, - 0.270588, - 0.220057, - 0.343307, - 0.549413, - 0.27451, - 0.21813, - 0.347432, - 0.550038, - 0.278431, - 0.21621, - 0.351535, - 0.550627, - 0.282353, - 0.214298, - 0.355619, - 0.551184, - 0.286275, - 0.212395, - 0.359683, - 0.55171, - 0.290196, - 0.210503, - 0.363727, - 0.552206, - 0.294118, - 0.208623, - 0.367752, - 0.552675, - 0.298039, - 0.206756, - 0.371758, - 0.553117, - 0.301961, - 0.204903, - 0.375746, - 0.553533, - 0.305882, - 0.203063, - 0.379716, - 0.553925, - 0.309804, - 0.201239, - 0.38367, - 0.554294, - 0.313725, - 0.19943, - 0.387607, - 0.554642, - 0.317647, - 0.197636, - 0.391528, - 0.554969, - 0.321569, - 0.19586, - 0.395433, - 0.555276, - 0.32549, - 0.1941, - 0.399323, - 0.555565, - 0.329412, - 0.192357, - 0.403199, - 0.555836, - 0.333333, - 0.190631, - 0.407061, - 0.556089, - 0.337255, - 0.188923, - 0.41091, - 0.556326, - 0.341176, - 0.187231, - 0.414746, - 0.556547, - 0.345098, - 0.185556, - 0.41857, - 0.556753, - 0.34902, - 0.183898, - 0.422383, - 0.556944, - 0.352941, - 0.182256, - 0.426184, - 0.55712, - 0.356863, - 0.180629, - 0.429975, - 0.557282, - 0.360784, - 0.179019, - 0.433756, - 0.55743, - 0.364706, - 0.177423, - 0.437527, - 0.557565, - 0.368627, - 0.175841, - 0.44129, - 0.557685, - 0.372549, - 0.174274, - 0.445044, - 0.557792, - 0.376471, - 0.172719, - 0.448791, - 0.557885, - 0.380392, - 0.171176, - 0.45253, - 0.557965, - 0.384314, - 0.169646, - 0.456262, - 0.55803, - 0.388235, - 0.168126, - 0.459988, - 0.558082, - 0.392157, - 0.166617, - 0.463708, - 0.558119, - 0.396078, - 0.165117, - 0.467423, - 0.558141, - 0.4, - 0.163625, - 0.471133, - 0.558148, - 0.403922, - 0.162142, - 0.474838, - 0.55814, - 0.407843, - 0.160665, - 0.47854, - 0.558115, - 0.411765, - 0.159194, - 0.482237, - 0.558073, - 0.415686, - 0.157729, - 0.485932, - 0.558013, - 0.419608, - 0.15627, - 0.489624, - 0.557936, - 0.423529, - 0.154815, - 0.493313, - 0.55784, - 0.427451, - 0.153364, - 0.497, - 0.557724, - 0.431373, - 0.151918, - 0.500685, - 0.557587, - 0.435294, - 0.150476, - 0.504369, - 0.55743, - 0.439216, - 0.149039, - 0.508051, - 0.55725, - 0.443137, - 0.147607, - 0.511733, - 0.557049, - 0.447059, - 0.14618, - 0.515413, - 0.556823, - 0.45098, - 0.144759, - 0.519093, - 0.556572, - 0.454902, - 0.143343, - 0.522773, - 0.556295, - 0.458824, - 0.141935, - 0.526453, - 0.555991, - 0.462745, - 0.140536, - 0.530132, - 0.555659, - 0.466667, - 0.139147, - 0.533812, - 0.555298, - 0.470588, - 0.13777, - 0.537492, - 0.554906, - 0.47451, - 0.136408, - 0.541173, - 0.554483, - 0.478431, - 0.135066, - 0.544853, - 0.554029, - 0.482353, - 0.133743, - 0.548535, - 0.553541, - 0.486275, - 0.132444, - 0.552216, - 0.553018, - 0.490196, - 0.131172, - 0.555899, - 0.552459, - 0.494118, - 0.129933, - 0.559582, - 0.551864, - 0.498039, - 0.128729, - 0.563265, - 0.551229, - 0.501961, - 0.127568, - 0.566949, - 0.550556, - 0.505882, - 0.126453, - 0.570633, - 0.549841, - 0.509804, - 0.125394, - 0.574318, - 0.549086, - 0.513725, - 0.124395, - 0.578002, - 0.548287, - 0.517647, - 0.123463, - 0.581687, - 0.547445, - 0.521569, - 0.122606, - 0.585371, - 0.546557, - 0.52549, - 0.121831, - 0.589055, - 0.545623, - 0.529412, - 0.121148, - 0.592739, - 0.544641, - 0.533333, - 0.120565, - 0.596422, - 0.543611, - 0.537255, - 0.120092, - 0.600104, - 0.54253, - 0.541176, - 0.119738, - 0.603785, - 0.5414, - 0.545098, - 0.119512, - 0.607464, - 0.540218, - 0.54902, - 0.119423, - 0.611141, - 0.538982, - 0.552941, - 0.119483, - 0.614817, - 0.537692, - 0.556863, - 0.119699, - 0.61849, - 0.536347, - 0.560784, - 0.120081, - 0.622161, - 0.534946, - 0.564706, - 0.120638, - 0.625828, - 0.533488, - 0.568627, - 0.12138, - 0.629492, - 0.531973, - 0.572549, - 0.122312, - 0.633153, - 0.530398, - 0.576471, - 0.123444, - 0.636809, - 0.528763, - 0.580392, - 0.12478, - 0.640461, - 0.527068, - 0.584314, - 0.126326, - 0.644107, - 0.525311, - 0.588235, - 0.128087, - 0.647749, - 0.523491, - 0.592157, - 0.130067, - 0.651384, - 0.521608, - 0.596078, - 0.132268, - 0.655014, - 0.519661, - 0.6, - 0.134692, - 0.658636, - 0.517649, - 0.603922, - 0.137339, - 0.662252, - 0.515571, - 0.607843, - 0.14021, - 0.665859, - 0.513427, - 0.611765, - 0.143303, - 0.669459, - 0.511215, - 0.615686, - 0.146616, - 0.67305, - 0.508936, - 0.619608, - 0.150148, - 0.676631, - 0.506589, - 0.623529, - 0.153894, - 0.680203, - 0.504172, - 0.627451, - 0.157851, - 0.683765, - 0.501686, - 0.631373, - 0.162016, - 0.687316, - 0.499129, - 0.635294, - 0.166383, - 0.690856, - 0.496502, - 0.639216, - 0.170948, - 0.694384, - 0.493803, - 0.643137, - 0.175707, - 0.6979, - 0.491033, - 0.647059, - 0.180653, - 0.701402, - 0.488189, - 0.65098, - 0.185783, - 0.704891, - 0.485273, - 0.654902, - 0.19109, - 0.708366, - 0.482284, - 0.658824, - 0.196571, - 0.711827, - 0.479221, - 0.662745, - 0.202219, - 0.715272, - 0.476084, - 0.666667, - 0.20803, - 0.718701, - 0.472873, - 0.670588, - 0.214, - 0.722114, - 0.469588, - 0.67451, - 0.220124, - 0.725509, - 0.466226, - 0.678431, - 0.226397, - 0.728888, - 0.462789, - 0.682353, - 0.232815, - 0.732247, - 0.459277, - 0.686275, - 0.239374, - 0.735588, - 0.455688, - 0.690196, - 0.24607, - 0.73891, - 0.452024, - 0.694118, - 0.252899, - 0.742211, - 0.448284, - 0.698039, - 0.259857, - 0.745492, - 0.444467, - 0.701961, - 0.266941, - 0.748751, - 0.440573, - 0.705882, - 0.274149, - 0.751988, - 0.436601, - 0.709804, - 0.281477, - 0.755203, - 0.432552, - 0.713725, - 0.288921, - 0.758394, - 0.428426, - 0.717647, - 0.296479, - 0.761561, - 0.424223, - 0.721569, - 0.304148, - 0.764704, - 0.419943, - 0.72549, - 0.311925, - 0.767822, - 0.415586, - 0.729412, - 0.319809, - 0.770914, - 0.411152, - 0.733333, - 0.327796, - 0.77398, - 0.40664, - 0.737255, - 0.335885, - 0.777018, - 0.402049, - 0.741176, - 0.344074, - 0.780029, - 0.397381, - 0.745098, - 0.35236, - 0.783011, - 0.392636, - 0.74902, - 0.360741, - 0.785964, - 0.387814, - 0.752941, - 0.369214, - 0.788888, - 0.382914, - 0.756863, - 0.377779, - 0.791781, - 0.377939, - 0.760784, - 0.386433, - 0.794644, - 0.372886, - 0.764706, - 0.395174, - 0.797475, - 0.367757, - 0.768627, - 0.404001, - 0.800275, - 0.362552, - 0.772549, - 0.412913, - 0.803041, - 0.357269, - 0.776471, - 0.421908, - 0.805774, - 0.35191, - 0.780392, - 0.430983, - 0.808473, - 0.346476, - 0.784314, - 0.440137, - 0.811138, - 0.340967, - 0.788235, - 0.449368, - 0.813768, - 0.335384, - 0.792157, - 0.458674, - 0.816363, - 0.329727, - 0.796078, - 0.468053, - 0.818921, - 0.323998, - 0.8, - 0.477504, - 0.821444, - 0.318195, - 0.803922, - 0.487026, - 0.823929, - 0.312321, - 0.807843, - 0.496615, - 0.826376, - 0.306377, - 0.811765, - 0.506271, - 0.828786, - 0.300362, - 0.815686, - 0.515992, - 0.831158, - 0.294279, - 0.819608, - 0.525776, - 0.833491, - 0.288127, - 0.823529, - 0.535621, - 0.835785, - 0.281908, - 0.827451, - 0.545524, - 0.838039, - 0.275626, - 0.831373, - 0.555484, - 0.840254, - 0.269281, - 0.835294, - 0.565498, - 0.84243, - 0.262877, - 0.839216, - 0.575563, - 0.844566, - 0.256415, - 0.843137, - 0.585678, - 0.846661, - 0.249897, - 0.847059, - 0.595839, - 0.848717, - 0.243329, - 0.85098, - 0.606045, - 0.850733, - 0.236712, - 0.854902, - 0.616293, - 0.852709, - 0.230052, - 0.858824, - 0.626579, - 0.854645, - 0.223353, - 0.862745, - 0.636902, - 0.856542, - 0.21662, - 0.866667, - 0.647257, - 0.8584, - 0.209861, - 0.870588, - 0.657642, - 0.860219, - 0.203082, - 0.87451, - 0.668054, - 0.861999, - 0.196293, - 0.878431, - 0.678489, - 0.863742, - 0.189503, - 0.882353, - 0.688944, - 0.865448, - 0.182725, - 0.886275, - 0.699415, - 0.867117, - 0.175971, - 0.890196, - 0.709898, - 0.868751, - 0.169257, - 0.894118, - 0.720391, - 0.87035, - 0.162603, - 0.898039, - 0.730889, - 0.871916, - 0.156029, - 0.901961, - 0.741388, - 0.873449, - 0.149561, - 0.905882, - 0.751884, - 0.874951, - 0.143228, - 0.909804, - 0.762373, - 0.876424, - 0.137064, - 0.913725, - 0.772852, - 0.877868, - 0.131109, - 0.917647, - 0.783315, - 0.879285, - 0.125405, - 0.921569, - 0.79376, - 0.880678, - 0.120005, - 0.92549, - 0.804182, - 0.882046, - 0.114965, - 0.929412, - 0.814576, - 0.883393, - 0.110347, - 0.933333, - 0.82494, - 0.88472, - 0.106217, - 0.937255, - 0.83527, - 0.886029, - 0.102646, - 0.941176, - 0.845561, - 0.887322, - 0.099702, - 0.945098, - 0.85581, - 0.888601, - 0.097452, - 0.94902, - 0.866013, - 0.889868, - 0.095953, - 0.952941, - 0.876168, - 0.891125, - 0.09525, - 0.956863, - 0.886271, - 0.892374, - 0.095374, - 0.960784, - 0.89632, - 0.893616, - 0.096335, - 0.964706, - 0.906311, - 0.894855, - 0.098125, - 0.968627, - 0.916242, - 0.896091, - 0.100717, - 0.972549, - 0.926106, - 0.89733, - 0.104071, - 0.976471, - 0.935904, - 0.89857, - 0.108131, - 0.980392, - 0.945636, - 0.899815, - 0.112838, - 0.984314, - 0.9553, - 0.901065, - 0.118128, - 0.988235, - 0.964894, - 0.902323, - 0.123941, - 0.992157, - 0.974417, - 0.90359, - 0.130215, - 0.996078, - 0.983868, - 0.904867, - 0.136897, - 1.0, - 0.993248, - 0.906157, - 0.143936 - ] } ]