[HepData-svn] r1308 - in trunk/hepdata-webapp/src/main: java/cedar/hepdata/webapp/components java/cedar/hepdata/webapp/plot resources/cedar/hepdata/webapp/pages

[blackhole at projects.hepforge.org]

Author: whalley
Date: Tue Nov 10 10:29:12 2009
New Revision: 1308

Log:
systematic table formatting changes

Modified:
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplaySystematics.java
   trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/plot/Plotter.java
   trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplaySystematics.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplaySystematics.java	Sat Nov  7 15:39:18 2009	(r1307)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/components/DisplaySystematics.java	Tue Nov 10 10:29:12 2009	(r1308)
@@ -27,12 +27,14 @@
             try{
 	        BufferedReader in = new BufferedReader(new FileReader(filename));
 	        String line;
-                writer.element("table  bgcolor='#f1ffff' border='1' cellspacing='0' cellpadding='5' ");
-                writer.element("tr");
-		writer.element("th colspan=8 align='center'");
-		writer.write("Additional Systematical Errors and Comments");
-		writer.end();
-		writer.end();
+        writer.element("table");
+        writer.attributes("class", "dataset");
+//                writer.element("table  bgcolor='#f1ffff' border='0' cellspacing='0' cellpadding='5' ");
+//                writer.element("tr");
+//		writer.element("th colspan=8 align='center'");
+//		writer.write("Additional Systematical Errors and Comments");
+//		writer.end();
+//		writer.end();
                 writer.element("tr");
 		writer.element("th align='center'");writer.write("Variable");writer.end();
 		writer.element("th align='center'");writer.write("SYS-ERR");writer.end();

Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/plot/Plotter.java
==============================================================================
--- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/plot/Plotter.java	Sat Nov  7 15:39:18 2009	(r1307)
+++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/plot/Plotter.java	Tue Nov 10 10:29:12 2009	(r1308)
@@ -58,12 +58,6 @@
             xlow *= 0.9;
             xhigh *= 1.1;
         }
-//        Double xrangepos = xhigh - xlow;
-//        if (xrangepos > 0) {
-//            xlowpos -= 0.05 * xrangepos;
-//        } else {
-//            xlowpos *= 0.9;
-//        }
 
         // Work out y range
         String ylabel = null;
@@ -120,8 +114,14 @@
         } else {
             axisY = new LogarithmicAxis(ylabel);
             axisY.setRange(rangeY);
+            //((LogarithmicAxis)axisY).getAllowNegativesFlag(true);
         }
 
+
+        //if (axisY instanceof LogarithmicAxis) {
+        //   ((LogarithmicAxis)axisY).getAllowNegativesFlag(true);
+        //}
+        
         // add series
         for (YAxis y : ys) {
             XYIntervalSeries series = getDataSeries(x, y, xscale, yscale, axisX, axisY);

Modified: trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml
==============================================================================
--- trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml	Sat Nov  7 15:39:18 2009	(r1307)
+++ trunk/hepdata-webapp/src/main/resources/cedar/hepdata/webapp/pages/View.tml	Tue Nov 10 10:29:12 2009	(r1308)
@@ -58,7 +58,10 @@
      </p>
 
       <t:if test="showSys">
-        <div class="systematics">        
+          <h4 class="datasettitle">
+          Additional Systematic Errors and Comments
+          </h4>
+       <div class="systematics">        
           <t:displaySystematics p="paper" />
         </div>
       </t:if>