modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java | 4 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityGraph.java | 14 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java | 26 ++++++---- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 2 6 files changed, 31 insertions(+), 19 deletions(-)
New commits: commit 0db1a8ec8a0806e0123657969adc561d637f0afd Author: Mike Thompson mithomps@redhat.com Date: Wed Mar 13 15:56:47 2013 -0700
Trivial - add more docs, clean up unused code.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java index 65866ad..84655ef 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java @@ -18,12 +18,8 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.common.charttype;
-import java.util.List;
import org.rhq.core.domain.measurement.MeasurementDefinition; -import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite; -import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite; -import org.rhq.core.domain.util.PageList;
/** * Common Graph capability used across multiple graphs. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java index 89b2942..2fa17eb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java @@ -47,7 +47,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp * Build the Group version of the View that shows the individual graph views. * @author Mike Thompson */ -public class D3GroupGraphListView extends AbstractD3GraphListView { +public final class D3GroupGraphListView extends AbstractD3GraphListView {
private ResourceGroup resourceGroup;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java index 37a1cf2..e670392 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java @@ -317,8 +317,6 @@ public class ResourceGroupDetailView extends viewFactory = (!visible) ? null : new ViewFactory() { @Override public Canvas createView() { - // return new FullHTMLPane( - // "/rhq/group/monitor/tables-plain.xhtml?groupId=" + groupId); //gwt version of group table view. return new GroupMonitoringTablesView(groupComposite); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java index c60a714..ae141bc 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java @@ -414,8 +414,6 @@ public class ResourceDetailView extends viewFactory = (!visibleToIE8) ? null : new ViewFactory() { @Override public Canvas createView() { - //d3GraphListView = D3GraphListView.createSummaryMultipleGraphs(monitoringTab.extendLocatorId("NewGraphs"), resourceComposite.getResource(), true); - //return d3GraphListView; return createD3GraphListView(); } };
commit 8000c036b7af46f9d4053099851a2052b05a98c6 Author: Mike Thompson mithomps@redhat.com Date: Wed Mar 13 15:54:35 2013 -0700
[BZ 872347] - Fix availability charting bug that blows up inside d3.js.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityGraph.java index 0d40a29..a5f3f02 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityGraph.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityGraph.java @@ -19,11 +19,23 @@ package org.rhq.enterprise.gui.coregui.client.inventory.common.charttype;
/** + * Interface for AvailabilityGraphs. Implementations of this interface + * always need to define the capability of creating a graph marker + * - some kind of div with an id that d3 can bind to and able to + * drawJsniChart to actually draw(render) the d3 graph. + * * @author Mike Thompson */ public interface AvailabilityGraph {
- void drawJsniChart(); + /** + * Step 1 create the graph marker to allow d3 to bind. + */ + void createGraphMarker();
+ /** + * Step 2 bind to the above div#id and render the chart. + */ + void drawJsniChart();
} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java index e2c1b86..96f67d2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java @@ -32,7 +32,7 @@ import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient;
/** * Contains the javascript chart definition for an implementation of the d3 availability chart. This implementation is - * just a line that changes color based on availability type: up=green, down=red, unknown=grey. + * just a line that changes color based on availability type: up=green, down=red, orange=disabled, yellow=warn, unknown=grey. * * @author Mike Thompson */ @@ -144,24 +144,30 @@ public class AvailabilityLineGraphType { var margin = {top: 5, right: 5, bottom: 5, left: 40}, width = 750 - margin.left - margin.right, height = 20 - margin.top - margin.bottom, + xAxisMin = $wnd.d3.min(availChartContext.data, function(d){ + return +d.x; + }), + xAxisMax = $wnd.d3.max(availChartContext.data,function(d){ + return +d.x; + }),
timeScale = $wnd.d3.time.scale() .range([0, width]) - .domain($wnd.d3.extent(availChartContext.data, function (d) { - return d.x; - })), + .domain($wnd.d3.extent(availChartContext.data, function(d){ + return +d.x; + }));
- yScale = $wnd.d3.scale.linear() + var yScale = $wnd.d3.scale.linear() .clamp(true) .rangeRound([height, 0]) - .domain([0, 1]), + .domain([0, 1]);
- svg = $wnd.d3.select(availChartContext.chartSelection).append("g") + + var svg = $wnd.d3.select(availChartContext.chartSelection).append("g") .attr("width", width + margin.left + margin.right) .attr("height", height + margin.top + margin.bottom) .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
- // The gray bars at the bottom leading up svg.selectAll("rect.availBar") .data(availChartContext.data) @@ -250,7 +256,9 @@ public class AvailabilityLineGraphType {
}
- draw(availChartContext); + if(availChartContext.data.length > 0){ + draw(availChartContext); + }
console.timeEnd("availabilityChart"); console.groupEnd("AvailabilityChart");
rhq-commits@lists.fedorahosted.org