modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java | 42 +++++++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java | 2 5 files changed, 38 insertions(+), 15 deletions(-)
New commits: commit 2dbab1e4820d1a43c47ed1f9d6981d8ef9bc55c7 Author: Mike Thompson mithomps@redhat.com Date: Fri Feb 1 13:41:25 2013 -0800
Charting - Bug fixes to dashboard chart refactor.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java index b633432..86056e4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java @@ -29,6 +29,7 @@ import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.types.Alignment; import com.smartgwt.client.types.ContentsType; +import com.smartgwt.client.types.Overflow; import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.HTMLFlow; @@ -401,7 +402,7 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti link.setClipValue(true); link.setWrap(true); link.setHeight(26); - link.setWidth("100%"); + link.setWidth("150px"); link.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java index 6deb6e4..dbb437a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java @@ -47,7 +47,7 @@ public class MetricGraphData implements JsonMetricProducer {
// i18n final protected Messages MSG = CoreGUI.getMessages(); - private static final Integer DEFAULT_CHART_HEIGHT = 250; + private static final Integer DEFAULT_CHART_HEIGHT = 200; private final String chartTitleMinLabel = MSG.chart_title_min_label(); private final String chartTitleAvgLabel = MSG.chart_title_avg_label(); private final String chartTitlePeakLabel = MSG.chart_title_peak_label(); @@ -151,9 +151,6 @@ public class MetricGraphData implements JsonMetricProducer { this.availabilityDownList = availabilityDownList; }
-// public PageList<MeasurementOOBComposite> getMeasurementOOBCompositeList() { -// return measurementOOBCompositeList; -// }
public void setMeasurementOOBCompositeList(PageList<MeasurementOOBComposite> measurementOOBCompositeList) { this.measurementOOBCompositeList = measurementOOBCompositeList; @@ -221,7 +218,11 @@ public class MetricGraphData implements JsonMetricProducer { if (null != definition.getDisplayName() && definition.getDisplayName().length() > 55) { return definition.getDisplayName().substring(0, 55) + "..."; } else { - return definition.getDisplayName(); + if(definition == null ){ + return ""; + }else { + return definition.getDisplayName(); + } } }
@@ -234,8 +235,10 @@ public class MetricGraphData implements JsonMetricProducer { public String getYAxisUnits() { if (adjustedMeasurementUnits == null) { Log.error("AbstractMetricD3GraphView.adjustedMeasurementUnits is populated by getJsonMetrics. Make sure it is called first."); + return ""; + }else { + return adjustedMeasurementUnits.toString(); } - return adjustedMeasurementUnits.toString(); }
public String getXAxisTitle() { @@ -368,11 +371,19 @@ public class MetricGraphData implements JsonMetricProducer { //find all possible starting interval points int i = 0; for (MeasurementDataNumericHighLowComposite measurement : metricData) { - boolean notAtStart = i > 1; + boolean notAtStart = i >= 1; boolean currentBarUndefined = Double.isNaN(measurement.getValue()); boolean previousBarDefined = (notAtStart) ? !Double.isNaN(metricData.get(i - 1).getValue()) : false; + //Log.debug("Bar: "+i); + //Log.debug("Current BarUndefined: "+currentBarUndefined); + //Log.debug("Prev Bar Undefined: "+previousBarDefined); + // for first bar + if(i == 0 && currentBarUndefined){ + //Log.debug("**Adding Unknown Start interval period for Bar 0"); + startPoints.add(i); + } if (currentBarUndefined && previousBarDefined && notAtStart && i < metricData.size()-1) { - //Log.debug("Adding Down or Disabled start Point: " + i); + //Log.debug("** Adding Down or Disabled start Point: " + i); startPoints.add(i+1); } i++; @@ -386,7 +397,8 @@ public class MetricGraphData implements JsonMetricProducer { boolean notAtEnd = j < metricData.size(); boolean currentBarUndefined = Double.isNaN(metricData.get(j).getValue()); boolean nextBarDefined = (notAtEnd) ? !Double.isNaN(metricData.get(j + 1).getValue()) : false; - if (currentBarUndefined && nextBarDefined && notAtEnd) { + boolean nextBarNotInAnyAvailPeriod = !isAvailabilityDownOrDisabledForBar(metricData.get(j+1).getTimestamp()); + if (currentBarUndefined && nextBarDefined && notAtEnd && nextBarNotInAnyAvailPeriod) { Date startDate = new Date(metricData.get(startPoint).getTimestamp()); Date endDate = new Date(metricData.get(j+1).getTimestamp()); //Log.debug("\n\nStartDate: " + startDate); @@ -397,7 +409,10 @@ public class MetricGraphData implements JsonMetricProducer { } } } - //Log.debug("intervalDatePairList.size():" + unknownIntervalList.size()); +// Log.debug("intervalDatePairList.size():" + unknownIntervalList.size()); +// for (DatePair datePair : unknownIntervalList) { +// Log.debug("Unknown Interval: "+ datePair); +// } }
private boolean isAvailabilityDownOrDisabledForBar(long timestamp) { @@ -463,5 +478,12 @@ public class MetricGraphData implements JsonMetricProducer { return endDateTime; }
+ @Override + public String toString() { + return "DatePair{" + + "startDateTime=" + startDateTime + + ", endDateTime=" + endDateTime + + '}'; + } } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java index 33998f8..e88275c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java @@ -72,7 +72,7 @@ public final class MetricStackedBarGraph extends AbstractGraph { // privates
console.log("Chart Height: "+chartContext.height); - var margin = {top: 10, right: 5, bottom: 20, left: 40}, + var margin = {top: 10, right: 5, bottom: 5, left: 40}, width = 750 - margin.left - margin.right, adjustedChartHeight = chartContext.chartHeight - 40, height = adjustedChartHeight - margin.top - margin.bottom, @@ -123,7 +123,7 @@ public final class MetricStackedBarGraph extends AbstractGraph { yAxis = $wnd.d3.svg.axis() .scale(yScale) .tickSubdivide(2) - .ticks(10) + .ticks(5) .tickSize(4, 4, 0) .orient("left"),
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java index 3c0f505..9fc4902 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java @@ -635,7 +635,7 @@ public abstract class AbstractActivityView extends LocatableVLayout implements R setIsModal(true); setShowModalMask(true); setWidth(900); - setHeight(650); + setHeight(350); setShowResizer(true); setCanDragResize(true); centerInPage(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java index 9302529..84edc04 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java @@ -333,7 +333,7 @@ public class D3GraphListView extends LocatableVLayout { // single graph case if (measurementId == selectedDefinitionId) { buildSingleGraph(downAvailList, measurementOOBCompositeList, measurementDefinition, - metric, 450); + metric, 250); } } else { // multiple graph case
rhq-commits@lists.fedorahosted.org