Skip to content

Fix graph scaling #647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 16, 2018
Merged

Fix graph scaling #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ef18bd
Remove not needed dates in the large graph, and fix the scaleX when f…
WojcikMike Jul 16, 2018
440138b
Fixing the Y scaling to accomodate for the case when first series hol…
WojcikMike Jul 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/ServicePulse.Host/app/modules/monitoring/js/directives/ui.particular.largeGraph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@
function(formatter) {
return {
restrict: 'E',
scope: {
dates: '=xaxisPoints',
scope: {
firstDataSeries: '=firstDataSeries',
secondDataSeries: '=secondDataSeries',
isDurationGraph: '=isDurationGraph',
Expand Down Expand Up @@ -111,8 +110,10 @@
var firstSeries = scope.firstDataSeries;
var secondSeries = scope.secondDataSeries;

var amountOfValues = Math.max(firstSeries.points.length, secondSeries ? secondSeries.points.length : 0);

var scaleX = d3.scaleLinear()
.domain([0, firstSeries.points.length - 1])
.domain([0, amountOfValues - 1])
.range([leftMargin, width]);

chart.append('rect')
Expand All @@ -122,7 +123,7 @@
.attr('fill', '#F2F6F7');

var minimumYaxis = !isNaN(scope.minimumYaxis) ? Number(scope.minimumYaxis) : 10;
var max = Math.max(firstSeries.average, d3.max(firstSeries.points), minimumYaxis);
var max = Math.max(firstSeries.average, firstSeries.points.length > 0 ? d3.max(firstSeries.points) : 0, minimumYaxis);

if (secondSeries && secondSeries.points.length > 0) {
max = Math.max(max, secondSeries.average, d3.max(secondSeries.points));
Expand Down
3 changes: 0 additions & 3 deletions src/ServicePulse.Host/app/modules/monitoring/views/endpoint_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ <h1 class="righ-side-ellipsis col-lg-max-10" uib-tooltip="{{endpointName}}">
<!-- here goes diagram -->
<large-graph ng-if="endpoint.metricDetails.metrics.queueLength"
first-data-series="endpoint.metricDetails.metrics.queueLength"
xAxis-points="endpoint.metricDetails.metrics.queueLength.timeAxisValues"
minimum-YAxis="{{largeGraphsMinimumYAxis.queueLength}}"
plot-width="750"
plot-height="200"
Expand Down Expand Up @@ -79,7 +78,6 @@ <h1 class="righ-side-ellipsis col-lg-max-10" uib-tooltip="{{endpointName}}">
<large-graph ng-if="endpoint.metricDetails.metrics.throughput"
first-data-series="endpoint.metricDetails.metrics.throughput"
second-data-series="endpoint.metricDetails.metrics.retries"
xAxis-points="endpoint.metricDetails.metrics.throughput.timeAxisValues"
minimum-YAxis="{{largeGraphsMinimumYAxis.throughputRetries}}"
plot-width="750"
plot-height="200"
Expand Down Expand Up @@ -140,7 +138,6 @@ <h1 class="righ-side-ellipsis col-lg-max-10" uib-tooltip="{{endpointName}}">
<large-graph ng-if="endpoint.metricDetails.metrics.processingTime"
first-data-series="endpoint.metricDetails.metrics.criticalTime"
second-data-series="endpoint.metricDetails.metrics.processingTime"
xAxis-points="endpoint.metricDetails.metrics.criticalTime.timeAxisValues"
minimum-YAxis="{{largeGraphsMinimumYAxis.processingCritical}}"
plot-width="750"
plot-height="200"
Expand Down