mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Timeseries: only migrage point size when configured (#30461)
This commit is contained in:
parent
98406d6c42
commit
2ec4784190
@ -10,7 +10,6 @@ Object {
|
||||
"fillOpacity": 50,
|
||||
"lineInterpolation": "stepAfter",
|
||||
"lineWidth": 5,
|
||||
"pointSize": 6,
|
||||
"showPoints": "never",
|
||||
"spanNulls": true,
|
||||
},
|
||||
@ -93,7 +92,6 @@ Object {
|
||||
"gradientMode": "opacity",
|
||||
"lineInterpolation": "stepAfter",
|
||||
"lineWidth": 1,
|
||||
"pointSize": 6,
|
||||
"showPoints": "never",
|
||||
"spanNulls": true,
|
||||
},
|
||||
@ -133,7 +131,6 @@ Object {
|
||||
"fillOpacity": 50,
|
||||
"lineInterpolation": "stepAfter",
|
||||
"lineWidth": 5,
|
||||
"pointSize": 6,
|
||||
"showPoints": "never",
|
||||
"spanNulls": true,
|
||||
},
|
||||
@ -189,7 +186,6 @@ Object {
|
||||
"fill": "dash",
|
||||
},
|
||||
"lineWidth": 1,
|
||||
"pointSize": 6,
|
||||
"showPoints": "never",
|
||||
"spanNulls": true,
|
||||
},
|
||||
|
@ -231,6 +231,10 @@ export function flotToGraphOptions(angular: any): { fieldConfig: FieldConfigSour
|
||||
|
||||
if (angular.points) {
|
||||
graph.showPoints = PointVisibility.Always;
|
||||
|
||||
if (isNumber(angular.pointradius)) {
|
||||
graph.pointSize = 2 + angular.pointradius * 2;
|
||||
}
|
||||
} else if (graph.drawStyle !== DrawStyle.Points) {
|
||||
graph.showPoints = PointVisibility.Never;
|
||||
}
|
||||
@ -240,10 +244,6 @@ export function flotToGraphOptions(angular: any): { fieldConfig: FieldConfigSour
|
||||
graph.lineStyle = dash;
|
||||
}
|
||||
|
||||
if (isNumber(angular.pointradius)) {
|
||||
graph.pointSize = 2 + angular.pointradius * 2;
|
||||
}
|
||||
|
||||
if (hasFillBelowTo) {
|
||||
graph.fillOpacity = 35; // bands are hardcoded in flot
|
||||
} else if (isNumber(angular.fill)) {
|
||||
|
Loading…
Reference in New Issue
Block a user