github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

fixing based on Thomas' review

Browse source
This commit is contained in:
ppisljar 2016-12-14 09:14:34 +01:00
parent 4ce88b086a
commit 5b1951fa2d
4 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.html
View file

@ -16,7 +16,7 @@
<div class="kuiSideBarFormRow">
<label class="kuiSideBarFormRow__label" for="invertColors">
Invert Color Schema
Reverse Color Schema
</label>
<div class="kuiSideBarFormRow__control">
<input class="kuiCheckBox" id="invertColors" type="checkbox" ng-model="vis.params.invertColors">

4
src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.js
View file

@ -30,8 +30,8 @@ module.directive('heatmapOptions', function ($parse, $compile, getAppState) {
};
$scope.addRange = function () {
const from = $scope.vis.params.colorsRange.length ?
$scope.vis.params.colorsRange[$scope.vis.params.colorsRange.length - 1].to : 0;
const previousRange = _.last($scope.vis.params.colorsRange);
const from = previousRange ? previousRange.to : 0;
$scope.vis.params.colorsRange.push({from: from, to: null});
$scope.vis.params.colorsNumber = $scope.vis.params.colorsRange.length;
};

2
src/core_plugins/kbn_vislib_vis_types/public/heatmap.js
View file

@ -24,7 +24,7 @@ export default function HeatmapVisType(Private) {
setColorRange: false,
colorsRange: [],
invertColors: false,
percentageMode: true,
percentageMode: false,
cellLabels: false,
valueAxes: [{
show: false,

18
src/ui/public/vislib/visualizations/point_series/heatmap_chart.js
View file

@ -3,7 +3,7 @@ import d3 from 'd3';
import $ from 'jquery';
import moment from 'moment';
import VislibVisualizationsPointSeriesProvider from './_point_series';
import heatmapColorFunc from 'ui/vislib/components/color/heatmap_color';
import getColor from 'ui/vislib/components/color/heatmap_color';
export default function HeatmapChartFactory(Private) {
@ -85,7 +85,7 @@ export default function HeatmapChartFactory(Private) {
for (let i in labels) {
if (labels[i]) {
const val = invertColors ? 1 - i / colorsNumber : i / colorsNumber;
colors[labels[i]] = heatmapColorFunc(val, colorSchema);
colors[labels[i]] = getColor(val, colorSchema);
}
}
return colors;
@ -182,7 +182,7 @@ export default function HeatmapChartFactory(Private) {
.attr('height', squareHeight)
.attr('data-label', label)
.attr('fill', z)
.attr('style', 'cursor: pointer; stroke: black; stroke-width: 0.3px')
.attr('style', 'opacity: 1; cursor: pointer; stroke: black; stroke-width: 0.3px')
.style('display', d => {
return d.hide ? 'none' : 'initial';
});
@ -194,16 +194,24 @@ export default function HeatmapChartFactory(Private) {
if (showLabels) {
const rotate = zAxisConfig.get('labels.rotate');
const rotateRad = rotate * Math.PI / 180;
const cellPadding = 5;
const maxLength = Math.min(
Math.abs(squareWidth / Math.cos(rotateRad)),
Math.abs(squareHeight / Math.sin(rotateRad))
) - 10;
) - cellPadding;
const maxHeight = Math.min(
Math.abs(squareWidth / Math.sin(rotateRad)),
Math.abs(squareHeight / Math.cos(rotateRad))
) - cellPadding;
squares.append('text')
.text(d => zAxisFormatter(d.y))
.style('display', function (d) {
const textLength = this.getBBox().width;
return d.hide || textLength > maxLength ? 'none' : 'initial';
const textHeight = this.getBBox().height;
const textTooLong = textLength > maxLength;
const textTooWide = textHeight > maxHeight;
return d.hide || textTooLong || textTooWide ? 'none' : 'initial';
})
.style('dominant-baseline', 'central')
.style('text-anchor', 'middle')