modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java | 11 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java | 68 +----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java | 25 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java | 112 +++------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java | 2 8 files changed, 92 insertions(+), 131 deletions(-)
New commits: commit 8eb409781377d65603dd9611483719a09f96db49 Author: Mike Thompson mithomps@redhat.com Date: Thu Mar 7 13:30:03 2013 -0800
Charting - Fix the Dashboard tabs bug where renders properly first time but if you click on another tab and then come back to original tab no d3 charts are shown (original chart is shown). Partial commit not complete.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java index 70aa2ef..25dd91a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java @@ -19,7 +19,6 @@ package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.groups.graph;
import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; -import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.ResourceGroupMetricGraphView;
import com.smartgwt.client.data.Criteria; import com.smartgwt.client.types.Overflow; @@ -45,7 +44,9 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow; -import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.ResourceGroupMetricGraphView; +import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData; +import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricStackedBarGraph; +import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.ResourceGroupMetricD3GraphView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource; import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.SingleResourceGroupSelector; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm; @@ -56,7 +57,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm; * @author Jay Shaughnessy * @author Mike Thompson */ -public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricGraphView implements CustomSettingsPortlet { +public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView implements CustomSettingsPortlet {
// A non-displayed, persisted identifier for the portlet public static final String KEY = "ResourceGroupMetricD3"; @@ -70,7 +71,7 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricGraphView im public static final String CFG_DEFINITION_ID = "definitionId";
public ResourceGroupD3GraphPortlet(String locatorId) { - super(locatorId); + super(locatorId, new MetricStackedBarGraph(new MetricGraphData())); setOverflow(Overflow.HIDDEN); }
@@ -204,7 +205,7 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricGraphView im if (simple == null | simple.getIntegerValue()==null) { addMember(new Label("<i>" + MSG.view_portlet_configure_needed() + "</i>")); } else { - renderGraph(); + drawGraph(); } }
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java index 832695d..211b01e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java @@ -78,8 +78,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitorin import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.Log; -import org.rhq.enterprise.gui.coregui.client.util.async.Command; -import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch; import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
/** @@ -173,7 +171,23 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Cus getJsniChart().setEntityId(resource.getId()); getJsniChart().setEntityName(resource.getName()); getJsniChart().setDefinition(def); - queryMetricsDataForDashboardGraphs(resource.getId(), def); + final long startTime = System.currentTimeMillis(); + // + GWTServiceLookup.getMeasurementDataService().findDataForResourceForLast(resource.getId(), new int[] { def.getId() }, + 8, MeasurementUtils.UNIT_HOURS, 60, + new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_loadFailed(), caught); + } + + @Override + public void onSuccess(final List<List<MeasurementDataNumericHighLowComposite>> measurementData) { + Log.debug("Dashboard Metric data in: " + (System.currentTimeMillis() - startTime) + " ms."); + graph.getMetricGraphData().setMetricData(measurementData.get(0)); + drawGraph(); + } + }); break; } } @@ -183,52 +197,6 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Cus }); }
- private void queryMetricsDataForDashboardGraphs(final Integer entityId, final MeasurementDefinition def) { - final long startTime = System.currentTimeMillis(); - - // setting up a deferred Command to execute after all resource queries have completed (successfully or unsuccessfully) - // we know there are exactly 1 resources - final CountDownLatch countDownLatch = CountDownLatch.create(1, new Command() { - @Override - /** - * Satisfied only after ALL of the metric queries AND availability have completed - */ - public void execute() { - Log.debug("Dashboard chart query total time for entity: " + entityId + ", MeasurementDef: " - + def.getId() + " in " + (System.currentTimeMillis() - startTime) + " ms"); - drawGraph(); - } - }); - - queryMeasurementsAndMetricData(entityId, def.getId(), countDownLatch); - // now the countDown latch will run sometime asynchronously after BOTH the previous 2 queries have executed - } - - private void queryMeasurementsAndMetricData(final Integer entityId, final Integer definitionId, - final CountDownLatch countDownLatch) { - final long startTime = System.currentTimeMillis(); - // - GWTServiceLookup.getMeasurementDataService().findDataForResourceForLast(entityId, new int[] { definitionId }, - 8, MeasurementUtils.UNIT_HOURS, 60, - new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_loadFailed(), caught); - if(countDownLatch != null){ - countDownLatch.countDown(); - } - } - - @Override - public void onSuccess(final List<List<MeasurementDataNumericHighLowComposite>> measurementData) { - Log.debug("Dashboard Metric data in: " + (System.currentTimeMillis() - startTime) + " ms."); - graph.getMetricGraphData().setMetricData(measurementData.get(0)); - if(countDownLatch != null){ - countDownLatch.countDown(); - } - } - }); - }
@Override public Canvas getHelpCanvas() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java index 68dd242..91ac17a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java @@ -41,11 +41,12 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; */ public abstract class AbstractMetricD3GraphView extends LocatableVLayout {
- @Deprecated - protected HTMLFlow resourceTitle; + //protected HTMLFlow resourceTitle; protected AbstractGraph graph; private Integer chartHeight; protected boolean isPortalGraph = false; + private int entityId; + private int definitionId;
public AbstractMetricD3GraphView(String locatorId) { super(locatorId); @@ -99,6 +100,23 @@ public abstract class AbstractMetricD3GraphView extends LocatableVLayout { drawGraph(); }
+ public void setEntityId(int entityId) { + this.entityId = entityId; + } + + public void setDefinitionId(int definitionId) { + this.definitionId = definitionId; + } + + public int getEntityId() { + return entityId; + } + + public int getDefinitionId() { + return definitionId; + } + + /** * Setup the page elements especially the div and svg elements that serve as * placeholders for the d3 stuff to grab onto and add svg tags to render the chart. @@ -123,6 +141,7 @@ public abstract class AbstractMetricD3GraphView extends LocatableVLayout { new Timer() { @Override public void run() { + Log.debug("Scheduling Graph Rendering"); //@todo: this is a hack around timing issue of jsni not seeing the DOM drawJsniChart(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java index 5b684bb..478b69d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map;
import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.widgets.HTMLFlow;
import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.measurement.MeasurementDefinition; @@ -33,40 +32,21 @@ import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph; -import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMetricD3GraphView; +import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph; import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; -import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
public class ResourceGroupMetricD3GraphView extends AbstractMetricD3GraphView {
- /** - * Defines the jsniChart type like area, line, etc... - * - */ - //private HasD3JsniChart jsniChart; - - -// public ResourceGroupMetricD3GraphView(String locatorId){ -// super(locatorId); -// //setChartHeight("150px"); -// } - - public ResourceGroupMetricD3GraphView(String locatorId, AbstractGraph graph) { - - //super(locatorId, entityId, entityName, def, data); - super(locatorId,graph); - //setChartHeight("150px"); + super(locatorId, graph); }
- - protected void renderGraph() { + protected void drawGraph() { if (null == graph.getMetricGraphData().getDefinition()) {
ResourceGWTServiceAsync resourceService = GWTServiceLookup.getResourceService(); @@ -94,44 +74,41 @@ public class ResourceGroupMetricD3GraphView extends AbstractMetricD3GraphView { typesSet.addAll(AncestryUtil.getAncestryTypeIds(ancestries));
ResourceTypeRepository.Cache.getInstance().getResourceTypes( - typesSet.toArray(new Integer[typesSet.size()]), - EnumSet.of(ResourceTypeRepository.MetadataType.measurements), - new ResourceTypeRepository.TypesLoadedCallback() { - - @Override - public void onTypesLoaded(Map<Integer, ResourceType> types) { - String url = LinkManager.getResourceLink(resource.getId()); - resourceTitle = new HTMLFlow(SeleniumUtility.getLocatableHref(url, resource.getName(), - null)); - resourceTitle.setTooltip(AncestryUtil.getAncestryHoverHTMLForResource(resource, types, - 0)); - - ResourceType type = types.get(resource.getResourceType().getId()); - for (MeasurementDefinition def : type.getMetricDefinitions()) { - if (def.getId() == graph.getMetricGraphData().getDefinitionId()) { - graph.getMetricGraphData().setDefinition(def); - - GWTServiceLookup.getMeasurementDataService().findDataForResourceForLast(graph.getMetricGraphData().getEntityId(), - new int[] { graph.getMetricGraphData().getDefinitionId() }, 8, MeasurementUtils.UNIT_HOURS, 60, - new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError( - MSG.view_resource_monitor_graphs_loadFailed(), caught); - } - - @Override - public void onSuccess( - List<List<MeasurementDataNumericHighLowComposite>> result) { - graph.getMetricGraphData().setMetricData(result.get(0)); - - drawGraph(); - } - }); - } + typesSet.toArray(new Integer[typesSet.size()]), + EnumSet.of(ResourceTypeRepository.MetadataType.measurements), + new ResourceTypeRepository.TypesLoadedCallback() { + + @Override + public void onTypesLoaded(Map<Integer, ResourceType> types) { + + ResourceType type = types.get(resource.getResourceType().getId()); + for (MeasurementDefinition def : type.getMetricDefinitions()) { + if (def.getId() == graph.getMetricGraphData().getDefinitionId()) { + graph.getMetricGraphData().setDefinition(def); + + GWTServiceLookup.getMeasurementDataService().findDataForResourceForLast( + graph.getMetricGraphData().getEntityId(), + new int[] { graph.getMetricGraphData().getDefinitionId() }, 8, + MeasurementUtils.UNIT_HOURS, 60, + new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() { + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError( + MSG.view_resource_monitor_graphs_loadFailed(), caught); + } + + @Override + public void onSuccess( + List<List<MeasurementDataNumericHighLowComposite>> result) { + graph.getMetricGraphData().setMetricData(result.get(0)); + + drawGraph(); + } + }); } } - }); + } + }); } });
@@ -140,28 +117,23 @@ public class ResourceGroupMetricD3GraphView extends AbstractMetricD3GraphView { } }
- @Override /** * Delegate the call to rendering the JSNI chart. * This way the chart type can be swapped out at any time. */ - public void drawJsniChart() - { + public void drawJsniChart() { graph.drawJsniChart(); }
- - @Override protected boolean supportsLiveGraphViewDialog() { return false; }
- -// public AbstractMetricD3GraphView getInstance(String locatorId, int entityId, String entityName, MeasurementDefinition def, -// List<MeasurementDataNumericHighLowComposite> data, HasD3JsniChart jsniChart) { -// -// return new ResourceGroupMetricD3GraphView(locatorId, entityId, entityName, def, data, jsniChart); -// } + // public AbstractMetricD3GraphView getInstance(String locatorId, int entityId, String entityName, MeasurementDefinition def, + // List<MeasurementDataNumericHighLowComposite> data, HasD3JsniChart jsniChart) { + // + // return new ResourceGroupMetricD3GraphView(locatorId, entityId, entityName, def, data, jsniChart); + // } }
commit 503ce2a1c3f9ca0f2b8468b1010a2fad0c7358c4 Author: Mike Thompson mithomps@redhat.com Date: Thu Mar 7 08:54:12 2013 -0800
Charting - Fix the Dashboard tabs bug where renders properly first time but if you click on another tab and then come back to original tab no d3 charts are shown (original chart is shown).
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java index c5fa4dc..27071aa 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java @@ -71,6 +71,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.util.MashupPortl import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.util.MessagePortlet; import org.rhq.enterprise.gui.coregui.client.gwt.DashboardGWTServiceAsync; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.util.Log; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -222,6 +223,7 @@ public class DashboardsView extends LocatableVLayout implements DashboardContain * which would require the user to hit the back button twice to return to the previous page. */ if (selectedDashboardView != null) { + Log.debug(" ***** selectedTab: "+selectedTab.getName() + ", "+ selectedTab.getTitle()); CoreGUI.goToView(LinkManager.getDashboardLink(Integer.valueOf(selectedTab.getName())), true); }
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java index 4e1f9d9..832695d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java @@ -335,7 +335,7 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Cus graph.getMetricGraphData().setEntityId(simple.getIntegerValue()); PropertySimple simpleDefId = storedPortlet.getConfiguration().getSimple(CFG_DEFINITION_ID); graph.getMetricGraphData().setDefinitionId(simpleDefId.getIntegerValue()); - Log.debug(" *** Redraw Portlet"); + Log.debug(" *** Redraw Portlet for entityId: "+simple.getIntegerValue()); drawJsniChart(); markForRedraw(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java index 8e8c462..68dd242 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java @@ -107,7 +107,7 @@ public abstract class AbstractMetricD3GraphView extends LocatableVLayout { * */ protected void drawGraph() { - Log.debug("drawGraph marker in AbstractMetricD3GraphView for: " + graph.getMetricGraphData().getChartId()); + Log.debug("drawGraph marker in AbstractMetricD3GraphView for: " + graph.getMetricGraphData().getChartId()+ " " + graph.getChartTitle());
StringBuilder divAndSvgDefs = new StringBuilder(); divAndSvgDefs.append("<div id="rChart-" + graph.getMetricGraphData().getChartId() 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 05810c3..0ca0794 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 @@ -217,8 +217,6 @@ public class AvailabilityLineGraphType { var hoverString, xValue = (d.x == undefined) ? 0 : +d.x, date = new Date(+xValue), - //timeFormatter = $wnd.d3.time.format("%I:%M:%S %p"), - //dateFormatter = $wnd.d3.time.format("%m/%d/%y"), timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat), dateFormatter = $wnd.d3.time.format(availChartContext.chartHoverDateFormat), availType = d.availType, 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 a820977..99f9539 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 @@ -301,6 +301,7 @@ public class MetricGraphData implements JsonMetricProducer { sb.setLength(sb.length() - 1); // delete the last ',' } sb.append("]"); + Log.debug("Json data for: "+getChartTitle()); Log.debug(sb.toString()); return sb.toString(); } 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 5b997b4..53cc1cc 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 @@ -121,7 +121,7 @@ public class D3GraphListView extends AbstractD3GraphListView { @Override protected void onDraw() { super.onDraw(); - Log.debug("D3GraphListView.onDraw()"); + Log.debug("D3GraphListView.onDraw() for: "+resource.getName()); destroyMembers(); addMember(measurementRangeEditor);
rhq-commits@lists.fedorahosted.org