modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java
| 9 ++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
| 2 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
| 19 ++++++----
3 files changed, 22 insertions(+), 8 deletions(-)
New commits:
commit fc1952d3af2e4d03542351efd65de51985734269
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Jun 24 17:15:19 2013 -0500
[BZ 977474] Red global exception when refreshing empty graphs with no data.
(cherry picked from commit 983670c88441af9098d5b675cf9af814d39b1f28)
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
index d411255..bd021f1 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
@@ -89,7 +89,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph {
interpolation = "basis",
avgFiltered, avg, minFiltered, min, peakFiltered, peak,
oobMax,
- legendDefined,
+ legendUnDefined,
lowBound,
highBound,
calcBarWidth,
@@ -200,8 +200,8 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph {
.attr("height", height + margin.top - titleHeight -
titleSpace + margin.bottom)
.attr("transform", "translate(" +
margin.left + "," + (+titleHeight + titleSpace + margin.top) + ")");
- legendDefined = (typeof min !== "undefined") || (typeof avg
!== "undefined") || (typeof peak !== "undefined");
- if (!useSmallCharts() && legendDefined) {
+ legendUnDefined = (typeof min === undefined) || (typeof avg ===
undefined) || (typeof peak === undefined);
+ if (!useSmallCharts() && !legendUnDefined) {
createMinAvgPeakSidePanel(chartContext.minChartTitle, min,
chartContext.avgChartTitle, avg, chartContext.peakChartTitle, peak,
chartContext.yAxisUnits);
}
}
@@ -235,11 +235,13 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph
{
.attr("y", yBase)
.text(highLabel + " - ");
- chart.append("text")
+ if(highValue !== undefined){
+ chart.append("text")
.attr("class", "highText")
.attr("x", xValue)
.attr("y", yBase)
.text(highValue.toFixed(decimalPlaces) + " " + uom);
+ }
//avg
@@ -249,11 +251,13 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph
{
.attr("y", yBase + yInc)
.text(avgLabel + " - ");
- chart.append("text")
+ if(avgValue !== undefined){
+ chart.append("text")
.attr("class", "avgText")
.attr("x", xValue)
.attr("y", yBase + yInc)
.text(avgValue.toFixed(decimalPlaces) + " " + uom);
+ }
// min
chart.append("text")
@@ -262,12 +266,13 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph
{
.attr("y", yBase + 2 * yInc)
.text(minLabel + " - ");
- chart.append("text")
+ if(minValue !== undefined){
+ chart.append("text")
.attr("class", "minText")
.attr("x", xValue)
.attr("y", yBase + 2 * yInc)
.text(minValue.toFixed(decimalPlaces) + " " + uom);
-
+ }
}
commit d6a8834ad2b67131a21117da35dd6906b7f2423e
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Jun 24 17:14:47 2013 -0500
BZ 977470 Graph buttons confusing should just be relative date - last x. Also updated
graph refresh to change date range to new current range.
(cherry picked from commit 84ba5be81a6128f6131918f96419b6e41eb9a0be)
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java
index 29428ae..d9f27b1 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java
@@ -18,6 +18,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.common;
+import java.util.Date;
import java.util.List;
import com.google.gwt.user.client.Timer;
@@ -27,6 +28,7 @@ import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.measurement.Availability;
import org.rhq.core.domain.resource.group.composite.ResourceGroupAvailability;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
+import
org.rhq.enterprise.gui.coregui.client.components.measurement.AbstractMeasurementRangeEditor;
import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil;
import org.rhq.enterprise.gui.coregui.client.inventory.AutoRefresh;
import
org.rhq.enterprise.gui.coregui.client.inventory.common.graph.ButtonBarDateTimeRangeEditor;
@@ -86,6 +88,13 @@ public abstract class AbstractD3GraphListView extends EnhancedVLayout
implements
@Override
public void refresh() {
if (isVisible() && !isRefreshing()) {
+ Date now = new Date();
+ AbstractMeasurementRangeEditor.MetricRangePreferences metricRangePreferences
= measurementUserPrefs.getMetricRangePreferences();
+ long timeRange = metricRangePreferences.end - metricRangePreferences.begin;
+ Date newStartDate = new Date(now.getTime() - timeRange);
+ buttonBarDateTimeRangeEditor.updateDateTimeRangeDisplay(newStartDate, now);
+ buttonBarDateTimeRangeEditor.saveDateRange(newStartDate.getTime(),
now.getTime());
+
redrawGraphs();
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
index d416222..2075783 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
@@ -201,7 +201,7 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout {
public void onClick(ClickEvent clickEvent) {
IButton button = (IButton) clickEvent.getSource();
String selectedDateTimeRange = button.getTitle();
- Date calculatedStartDateTime = calculateStartDate(new Date(getEndTime()),
selectedDateTimeRange);
+ Date calculatedStartDateTime = calculateStartDate(new Date(),
selectedDateTimeRange);
saveDateRange(calculatedStartDateTime.getTime(), new Date().getTime());
redrawGraphs();
updateDateTimeRangeDisplay(calculatedStartDateTime, new Date());