SlicDiagWeb/src/main/webapp
diff -u -r1.1 -r1.2
--- dbFrame.jsp 24 Sep 2007 17:07:50 -0000 1.1
+++ dbFrame.jsp 28 Sep 2007 21:37:46 -0000 1.2
@@ -43,14 +43,18 @@
var index1 = fileName.indexOf("_SLIC");
if (index1 > 0) {
theForm.event_type.value = fileName.substring(0, index1);
- fileName = fileName.substring(index1 + 1);
+ fileName = fileName.substring(index1 + 6);
} else {
return true;
}
var fields = fileName.split(separator);
if (fields.length > 0) theForm.slic_version.value = fields[0];
- if (fields.length > 1) theForm.geant4_version.value = fields[1].substring(7);
+ if (fields.length > 1) {
+ if (fields[1].toLowerCase().indexOf("geant4") == 0)
+ fields[1] = fields[1].substring(7);
+ theForm.geant4_version.value = fields[1];
+ }
if (fields.length > 2) theForm.detector.value = fields[2];
}
return true;
@@ -177,6 +181,9 @@
<c:set var="size" value="100" scope="page"/>
<c:set var="onCh" value="fillAfterFileUrlChange(this)" scope="page"/>
</c:if>
+ <c:if test="${col == \"event_type\"}">
+ <c:set var="size" value="50" scope="page"/>
+ </c:if>
<input type="text" size="${size}" name="${col}" onchange="${onCh}"/>
</c:if>
</display:column>
SlicDiagWeb/src/main/webapp
diff -u -r1.1 -r1.2
--- plotFrame.jsp 24 Sep 2007 17:07:50 -0000 1.1
+++ plotFrame.jsp 28 Sep 2007 21:37:46 -0000 1.2
@@ -2,6 +2,7 @@
<%@page pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
<%@taglib prefix="aida" uri="http://aida.freehep.org/jsp20" %>
<%@page isELIgnored="false" %>
@@ -9,165 +10,28 @@
<head>
<title>AIDA Plot Frame</title>
<base target="_self">
- <SCRIPT TYPE="text/javascript">
- function showOrHide(check, id) {
- var theForm = check.form;
- var folder = document.getElementById(id);
- if (folder == null) {
- return false;
- }
- if (theForm.useStyle.checked) {
- folder.style.display = "block";
- } else {
- folder.style.display = "none";
- }
- plotStyle(check);
- }
- function plotStyle(check) {
- var theForm = check.form;
-
- if (theForm.useStyle.checked) theForm.useStyle.value = "true";
- else theForm.useStyle.value = "false";
-
- if (theForm.showStatistics.checked) theForm.showStatistics.value = "true";
- else theForm.showStatistics.value = "false";
-
- if (theForm.showLegend.checked) theForm.showLegend.value = "true";
- else theForm.showLegend.value = "false";
-
- theForm.submit();
- }
- </SCRIPT>
</head>
<body>
-
- <!-- Set User Plotter Style Here -->
-
- <!-- Set session variables from the form -->
- <!-- State of the session variable changes only by request parameter -->
- <c:if test="${!empty param.plotStyleForm}">
- <c:set var="usePlotStyle" value="false" scope="session"/>
- <c:set var="showPlotStatistics" value="false" scope="session"/>
- <c:set var="showPlotLegend" value="false" scope="session"/>
- <c:set var="showPlotNormalization" value="${initParam.no_selection}" scope="session"/>
- <c:set var="showPlotMarkerSize" value="${initParam.no_selection}" scope="session"/>
- <c:if test="${!empty param.useStyle}">
- <c:set var="usePlotStyle" value="${param.useStyle}" scope="session"/>
- </c:if>
- <c:if test="${!empty param.showStatistics}">
- <c:set var="showPlotStatistics" value="${param.showStatistics}" scope="session"/>
- </c:if>
- <c:if test="${!empty param.showLegend}">
- <c:set var="showPlotLegend" value="${param.showLegend}" scope="session"/>
- </c:if>
- <c:if test="${!empty param.showNormalization}">
- <c:set var="showPlotNormalization" value="${param.showNormalization}" scope="session"/>
- </c:if>
- <c:if test="${!empty param.showMarkerSize}">
- <c:set var="showPlotMarkerSize" value="${param.showMarkerSize}" scope="session"/>
- </c:if>
- </c:if>
-
- <!-- Now set page variables from the session variables -->
- <!-- Beware that session variables can be not set -->
-
- <c:set var="pageStylePanelDisplay" value="block" scope="page"/>
- <c:set var="pageUseStyle" value="checked" scope="page"/>
- <c:set var="pageShowStatistics" value="checked" scope="page"/>
- <c:set var="pageShowLegend" value="checked" scope="page"/>
- <c:if test="${empty usePlotStyle || usePlotStyle == 'false'}">
- <c:set var="pageUseStyle" value="" scope="page"/>
- <c:set var="pageStylePanelDisplay" value="none" scope="page"/>
- </c:if>
- <c:if test="${empty showPlotStatistics || showPlotStatistics == \"false\"}">
- <c:set var="pageShowStatistics" value="" scope="page"/>
- </c:if>
- <c:if test="${empty showPlotLegend || showPlotLegend == \"false\"}">
- <c:set var="pageShowLegend" value="" scope="page"/>
- </c:if>
+ <c:set var="sv" value="styleVar" scope="session"/>
+ <aida:plotterStyleEditor
+ selectorText="Style Editor"
+ action="plotFrame.jsp"
+ var="styleVar"
+ />
<!--
-
- <br>
- usePlotStyle=${usePlotStyle} <br>
- showPlotStatistics=${showPlotStatistics} <br>
- showPlotLegend=${showPlotLegend} <br>
- showPlotNormalization=${showPlotNormalization} <br>
-
<br>
- param.plotStyleForm=${param.plotStyleForm} <br>
- param.useStyle=${param.useStyle} <br>
- param.showStatistics=${param.showStatistics} <br>
- param.showLegend=${param.showLegend} <br><br>
- param.showNormalization=${param.showNormalization} <br><br>
-
- pageUseStyle=${pageUseStyle} <br>
- pageStylePanelDisplay=${pageStylePanelDisplay} <br>
- pageShowStatistics=${pageShowStatistics} <br>
- pageShowLegend=${pageShowLegend} <br>
+ showPlotStyle=${styleVar.showPlotStyle} <br>
+ showStatistics=${styleVar.showStatistics} <br>
+ showLegend=${styleVar.showLegend} <br>
<br>
-->
- <!-- End User Plotter Style -->
-
- <c:set var="aidaPath" value="${param.leafHref}" scope="page"/>
-
- <form name="plotStyleForm" action="plotFrame.jsp">
- <TABLE CELLPADDING="0" CELLSPACING="0" border="0">
- <TR><TD >
- <input type="checkbox" name="useStyle" ${pageUseStyle} onClick="showOrHide(this, 'stylePanel')">Change Plot Style
- </TD><TD>
- <div id="stylePanel" style="display: ${pageStylePanelDisplay};">
- <TABLE bgcolor="orange" border="2">
- <TR>
- <TD title="Show Statistics">
- <input type="checkbox" name="showStatistics" ${pageShowStatistics} onClick="plotStyle(this)">Statistics
- </TD>
- <TD title="Show Legend">
- <input type="checkbox" name="showLegend" ${pageShowLegend} onClick="plotStyle(this)">Legend
- </TD>
- <TD title="Select Normalization for the Refrence Plot">
- Norm:
- <select name="showNormalization" onChange="plotStyle(this)">
- <option <c:if test="${showPlotNormalization == initParam.no_selection}"> selected</c:if> >
- ${initParam.no_selection}
- </option>
- <option <c:if test="${showPlotNormalization == 'Area'}"> selected</c:if> >
- Area
- </option>
- <option <c:if test="${showPlotNormalization == 'Entries'}"> selected</c:if> >
- Entries
- </option><!--
- <option <c:if test="${showPlotNormalization == 'MaxBin'}"> selected</c:if> >
- MaxBin
- </option>
- -->
- </select>
- </TD>
- <TD title="Select Marker Size">
- Marker Size:
- <select name="showMarkerSize" onChange="plotStyle(this)">
- <option <c:if test="${showPlotMarkerSize == initParam.no_selection}"> selected</c:if> >
- ${initParam.no_selection}
- </option>
- <c:forEach var="i" begin="0" end="10" step="1">
- <option <c:if test="${showPlotMarkerSize != initParam.no_selection && showPlotMarkerSize == i}"> selected</c:if> >
- ${i}
- </option>
- </c:forEach>
- </select>
- </TD>
- <input type="hidden" name="leafHref" value="${aidaPath}"/>
- <input type="hidden" name="plotStyleForm" value="${true}"/>
- </TR>
- </TABLE>
- </div>
- </TD></TR>
- </TABLE>
- </form>
-
+ <c:if test="${!empty param.plotHref}">
+ <c:set var="aidaPath" value="${param.plotHref}" scope="session"/>
+ </c:if>
<h3><c:out value="Path=${aidaPath}"/></h3>
- <c:if test="${!empty selectedFileId && !(selectedFileId == initParam.no_selection) && !(empty param.leafHref)}">
-
+
+ <c:if test="${!empty selectedFileId && !(selectedFileId == initParam.no_selection) && !(empty aidaPath)}">
<c:set var="aidaDataFile" value="${initParam.slic_file_base}/${selectedFileId}" scope="page"/>
<aida:objects storeName="${aidaDataFile}"
@@ -175,22 +39,26 @@
var="aidaDataObject">
</aida:objects>
+ <!--
+ <aida:plotBrowser nplots="${fn:length(aidaDataObject)}" url="plotFrame.jsp" layoutVar="layout" maxplots="16" id="plotBrowserID"/>
+ -->
<aida:plotter allowDownload="true" format="png">
<aida:region>
- <c:if test="${!empty usePlotStyle && usePlotStyle != \"false\"}">
+ <c:if test="${!empty styleVar.showPlotStyle && styleVar.showPlotStyle != false}">
<aida:style>
- <c:if test="${!empty showPlotMarkerSize && showPlotMarkerSize != initParam.no_selection}">
+ <c:if test="${!empty styleVar.markerSize && styleVar.markerSize != initParam.no_selection}">
<aida:style type="data">
<aida:style type="marker">
- <aida:attribute name="size" value="${showPlotMarkerSize}"/>
+ <aida:attribute name="shape" value="${styleVar.markerShape}"/>
+ <aida:attribute name="size" value="${styleVar.markerSize}"/>
</aida:style>
</aida:style>
</c:if>
<aida:style type="statisticsBox">
- <aida:attribute name="isVisible" value="${showPlotStatistics}"/>
+ <aida:attribute name="isVisible" value="${styleVar.showStatistics}"/>
</aida:style>
<aida:style type="legendBox">
- <aida:attribute name="isVisible" value="${showPlotLegend}"/>
+ <aida:attribute name="isVisible" value="${styleVar.showLegend}"/>
</aida:style>
</aida:style>
</c:if>
@@ -206,12 +74,26 @@
var="aidaRefObject">
</aida:objects>
+ <c:if test="${!empty styleVar.showPlotStyle && styleVar.showPlotStyle != false}">
+ <c:if test="${!empty styleVar.statCompareAlgorithm && styleVar.statCompareAlgorithm != initParam.no_selection}">
+ <font size=+1><b><u>Statistical Comparison:</u> <i>
+ <aida:statCompare
+ algorithm="${styleVar.statCompareAlgorithm}"
+ var1="${aidaDataObject[0]}"
+ var2="${aidaRefObject[0]}"
+ verbose="true"/>
+ </i></b><br></font>
+ </c:if>
+ </c:if>
+
<aida:plot var="${aidaRefObject[0]}">
- <c:if test="${!empty usePlotStyle && usePlotStyle != \"false\"}">
+ <c:if test="${!empty styleVar.showPlotStyle && styleVar.showPlotStyle != false}">
+ <c:if test="${!empty styleVar.normalization && styleVar.normalization != initParam.no_selection}">
<aida:style>
- <aida:attribute name="normalization" value="${showPlotNormalization}"/>
+ <aida:attribute name="normalization" value="${styleVar.normalization}"/>
</aida:style>
</c:if>
+ </c:if>
</aida:plot>
</c:catch>
</c:if>
SlicDiagWeb/src/main/webapp
diff -u -r1.1 -r1.2
--- treeFrame.jsp 24 Sep 2007 17:07:50 -0000 1.1
+++ treeFrame.jsp 28 Sep 2007 21:37:46 -0000 1.2
@@ -25,7 +25,7 @@
<c:set var="aidaRefFile" value="${initParam.slic_file_base}/${selectedRefId}" scope="page"/>
<aida:tree
storeName="${aidaRefFile}"
- storeType="xml" options="useProxies=\"true\"">
+ storeType="xml" options="useProxies=true">
</aida:tree>
</c:if>
@@ -33,12 +33,14 @@
<c:set var="aidaDataFile" value="${initParam.slic_file_base}/${selectedFileId}" scope="page"/>
<aida:tree
storeName="${aidaDataFile}"
- storeType="xml" options="useProxies=\"true\"">
+ storeType="xml" options="useProxies=true">
</aida:tree>
<aida:displaytree
- leafHref="plotFrame.jsp?leafHref=%p"
+ leafHref="plotFrame.jsp?plotHref=%p"
+ showFolderHrefForNodesWithLeavesOnly="true"
rootLabel="${selectedFileId}"
+ showItemCount="true"
rootVisible="false"
storeName="${aidaDataFile}">
</aida:displaytree>
