Author: [log in to unmask]
Date: Tue Oct 27 14:26:11 2015
New Revision: 3897
Log:
Plot 2D histograms as color map; set default marker and line color; do not show stat box for histogram 2D; remove style selection component; increase font size of plot titles.
Modified:
webapps/trunk/data-quality-webapp/src/main/webapp/plot_page.jsp
Modified: webapps/trunk/data-quality-webapp/src/main/webapp/plot_page.jsp
=============================================================================
--- webapps/trunk/data-quality-webapp/src/main/webapp/plot_page.jsp (original)
+++ webapps/trunk/data-quality-webapp/src/main/webapp/plot_page.jsp Tue Oct 27 14:26:11 2015
@@ -28,9 +28,9 @@
<c:if test="${!empty param.plotHref || !empty aidaPath}">
<!--
- Get AIDA Tree.
- rootDataURI - name of the root file, defined elsewhere.
- -->
+ Get AIDA Tree.
+ rootDataURI - name of the root file, defined elsewhere.
+ -->
<aida:tree storeName="${rootDataURI}" storeType="xml">
</aida:tree>
@@ -43,13 +43,10 @@
<aida:objects storeName="${rootDataURI}" path="${aidaPath}" var="aidaObjects">
</aida:objects>
+ <c:set value="${fn:contains(aidaObjects[0], 'Histogram2D')}" var="isHistogram2D"/>
<h3>
- <b>Path:</b> ${aidaPath}
+ <b>Path:</b> ${aidaPath}<br/>
</h3>
-
- <!-- Display Plotter Style Editor that controls Errors, Markers, etc. (optional) -->
- <aida:plotterStyleEditor selectorText="Style Editor" includeNormalization="false" includeComparison="false"
- action="${ref}" var="styleVar" />
<!-- Create clickable Image Map only for multiple data only (optional) -->
<c:set var="imgMap" value="false" />
@@ -64,40 +61,49 @@
<!-- Display the default navigation bar inside the Table (optional) -->
<aida:plotsetbar var="barVar" url="${ref}">
<c:if test="${barVar.npages > 1}">
- <TABLE bgcolor="D0D0D0" border="1">
- <TR>
- <TD> ${barVar.defaultbar} </TD>
- </TR>
- </TABLE>
- <br>
+ <table bgcolor="D0D0D0" border="1">
+ <tr>
+ <td> ${barVar.defaultbar} </TD>
+ </tr>
+ </table>
+ <br/>
</c:if>
</aida:plotsetbar>
- <!-- Format plotter style according to the Plotter Style Editor settings (optional) -->
- <c:if test="${!empty styleVar.showPlotStyle && styleVar.showPlotStyle != false}">
- <aida:style>
- <aida:style type="statisticsBox">
- <aida:attribute name="isVisible" value="${styleVar.showStatistics}" />
+ <!-- plotter style -->
+ <aida:style>
+ <aida:attribute name="hist2DStyle" value="colorMap"/>
+ <aida:style type="statisticsBox">
+ <aida:attribute name="isVisible" value="${!isHistogram2D && fn:length(aidaObjects) == 1}"/>
+ </aida:style>
+ <aida:style type="legendBox">
+ <aida:attribute name="isVisible" value="false"/>
+ </aida:style>
+ <aida:style type="data">
+ <aida:style type="errorBar">
+ <aida:attribute name="isVisible" value="true"/>
</aida:style>
- <aida:style type="legendBox">
- <aida:attribute name="isVisible" value="${styleVar.showLegend}" />
+ <aida:style type="fill">
+ <aida:attribute name="color" value="blue"/>
+ <aida:attribute name="colorMapScheme" value="rainbow"/>
</aida:style>
- <aida:style type="data">
- <aida:style type="errorBar">
- <aida:attribute name="isVisible" value="${styleVar.showError}" />
- </aida:style>
- <aida:style type="fill">
- <aida:attribute name="color" value="blue" />
- </aida:style>
- <c:if test="${!empty styleVar.markerSize && styleVar.markerSize != 'none'}">
- <aida:style type="marker">
- <aida:attribute name="isVisible" value="true" />
- <aida:attribute name="size" value="${styleVar.markerSize}" />
- </aida:style>
- </c:if>
+ <aida:style type="line">
+ <aida:attribute name="color" value="black"/>
+ </aida:style>
+ <aida:style type="marker">
+ <aida:attribute name="isVisible" value="true"/>
+ <aida:attribute name="size" value="1"/>
+ <aida:attribute name="color" value="blue"/>
</aida:style>
</aida:style>
- </c:if>
+ <c:if test="${fn:length(aidaObjects) ==1}">
+ <aida:style type="title">
+ <aida:style type="text">
+ <aida:attribute name="fontSize" value="20"/>
+ </aida:style>
+ </aida:style>
+ </c:if>
+ </aida:style>
<aida:region href="${ref}/${aida:objectName(aidaObjects[status.index])}">
<aida:plot var="${aidaObjects[status.index]}">
