modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java | 18 ---------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java | 14 ++++++- 3 files changed, 11 insertions(+), 22 deletions(-)
New commits: commit 321fbfbe0a5865449ce5b1f5e9ff2ce2704151ef Author: Mike Thompson mithomps@redhat.com Date: Mon Jul 1 19:48:53 2013 -0700
Syntax error fix.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java index 101df60..2804af0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java @@ -41,7 +41,7 @@ public final class CompositeGroupMultiLineGraphListView extends CompositeGroupD3 @Override public native void drawJsniChart() /*-{ console.log("Draw nvd3 charts for composite multiline graph"); - var chartId = global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), + var chartId = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), chartHandle = "#mChart-"+chartId, chartSelection = chartHandle + " svg", yAxisUnits = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getYAxisUnits()(),
commit 4d8fded37b908cf50768b5ef249395b9fba75deb Author: Mike Thompson mithomps@redhat.com Date: Fri Jun 28 09:45:20 2013 -0700
[BZ 958754] On Multi-resource graph, time units should have minutes when appropriate.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java index 8661136..e75b65a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/AbstractMetricGraph.java @@ -29,7 +29,6 @@ import org.rhq.enterprise.gui.coregui.client.Messages; 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.inventory.common.AbstractD3GraphListView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.D3GraphListView; import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.message.Message; import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPreferences; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java index dfb53b3..faeb476 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java @@ -350,24 +350,6 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl return sb.toString(); }
- /** - * If there is more than 2 days time window then return true so we can show day of week - * in axis labels. Function to switch the timescale to whichever is more appropriate hours - * or hours with days of week. - * @return true if difference between startTime and endTime is >= x days - */ - public boolean shouldDisplayDayOfWeekInXAxisLabel() { - // because of asyncrony this is possible so default it - if (null == measurementForEachResource || measurementForEachResource.isEmpty()) { - return true; - } - List<MeasurementDataNumericHighLowComposite> firstResourceMeasurementList = measurementForEachResource.get(0) - .getMeasurementData(); - Long startTime = firstResourceMeasurementList.get(0).getTimestamp(); - Long endTime = firstResourceMeasurementList.get(firstResourceMeasurementList.size() - 1).getTimestamp(); - long timeThreshold = 24 * 60 * 60 * 1000; // 1 days - return startTime + timeThreshold < endTime; - }
/** * Client can choose which graph types to render. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java index 46e51c0..101df60 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupMultiLineGraphListView.java @@ -19,6 +19,9 @@ package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; + /** * A MultiLine version of the Composite group single metric multiple resource charts. * @@ -26,6 +29,7 @@ package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring */ public final class CompositeGroupMultiLineGraphListView extends CompositeGroupD3GraphListView { + private static final Messages MSG = CoreGUI.getMessages();
public CompositeGroupMultiLineGraphListView(int groupId, int defId, boolean isAutogroup) { @@ -37,16 +41,14 @@ public final class CompositeGroupMultiLineGraphListView extends CompositeGroupD3 @Override public native void drawJsniChart() /*-{ console.log("Draw nvd3 charts for composite multiline graph"); - var chartId = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), + var chartId = global.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getChartId()(), chartHandle = "#mChart-"+chartId, chartSelection = chartHandle + " svg", yAxisUnits = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getYAxisUnits()(), xAxisLabel = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getXAxisTitle()(), - displayDayOfWeek = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::shouldDisplayDayOfWeekInXAxisLabel()(), - xAxisTimeFormat = (displayDayOfWeek) ? "%a %I %p" : "%I %p", + xAxisTimeFormat = this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupMultiLineGraphListView::getXAxisTimeFormatHoursMinutes()(); json = eval(this.@org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.table.CompositeGroupD3GraphListView::getJsonMetrics()());
- $wnd.nv.addGraph(function() { var chart = $wnd.nv.models.lineChart();
@@ -68,4 +70,10 @@ public final class CompositeGroupMultiLineGraphListView extends CompositeGroupD3 });
}-*/; + + + + public String getXAxisTimeFormatHoursMinutes() { + return MSG.chart_xaxis_time_format_hours_minutes(); + } }
rhq-commits@lists.fedorahosted.org