Changeset 533

Timestamp:

02/14/11 22:39:26 (2 years ago)

Author:

philsmart

Message:

 

Location:

raptor-web/trunk/src/main

Files:

• java/uk/ac/cardiff/raptorweb/engine/ChartProcessor.java (modified) (5 diffs)
• java/uk/ac/cardiff/raptorweb/service/impl/StartServiceImpl.java (modified) (1 diff)
• webapp/WEB-INF/flows/reports/startReport.xhtml (modified) (4 diffs)

raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/engine/ChartProcessor.java

@@ -4 +4 @@
 package uk.ac.cardiff.raptorweb.engine;
 
+import java.awt.BasicStroke;
 import java.awt.Color;
+import java.awt.Font;
 import java.awt.GradientPaint;
 import java.awt.Rectangle;
@@ -66 +68 @@
     /* options for how the graph is displayed */
     public enum GraphPresentation {
-        FANCY(true), SIMPLE(false);
+        FANCY(true), FRONT(false);
         private boolean legend;
 
@@ -189 +191 @@
         if (graphPresentation == GraphPresentation.FANCY)
             fancyGraphOutput(chart);
-        else if (graphPresentation == GraphPresentation.SIMPLE)
-            simpleGraphOutput(chart);
+        else if (graphPresentation == GraphPresentation.FRONT)
+            frontGraphOutput(chart);
 
         // save the graph
@@ -252 +254 @@
     }
 
-    private void simpleGraphOutput(JFreeChart chart) {
+    private void frontGraphOutput(JFreeChart chart) {
         CategoryPlot plot = (CategoryPlot) chart.getPlot();
         CategoryAxis xAxis = (CategoryAxis) plot.getDomainAxis();
@@ -263 +265 @@
         plot.setRangeGridlinePaint(Color.black);
         plot.setDomainGridlinePaint(Color.black);
-
+        //set the thickness of the first series
+        plot.getRenderer().setSeriesStroke(0, new BasicStroke(2.0f));
+        plot.setForegroundAlpha(0.7f);
+        plot.setBackgroundPaint(new GradientPaint(0, 0,Color.white , 1f, 1f, new Color(210,210,210)));
+        plot.getRenderer().setSeriesPaint(0, Color.blue);
         // axis
-        CategoryAxis rangeAxis = (CategoryAxis) plot.getDomainAxis();
-        rangeAxis.setUpperMargin(0.0);
-        rangeAxis.setLowerMargin(0.0);
+        CategoryAxis domainAxis = (CategoryAxis) plot.getDomainAxis();
+        domainAxis.setUpperMargin(0.0);
+        domainAxis.setLowerMargin(0.0);
+        domainAxis.setLabelFont(new Font("SansSerif",Font.PLAIN,0));
+        domainAxis.setTickLabelFont(new Font("SansSerif",Font.PLAIN,0));
 
     }

raptor-web/trunk/src/main/java/uk/ac/cardiff/raptorweb/service/impl/StartServiceImpl.java

@@ -225 +225 @@
             }
             if (numberOfAuthenticationsPerIntervalNumberModel != null) {
-                RaptorJFreeChartModel jfreeChart = getChartProcessor().constructJFreeGraph(GraphPresentation.SIMPLE,GraphType.LINE,numberOfAuthenticationsPerIntervalNumberModel,1270,400,(chosenStartTime.toString("ddMMyyyHH-mm")+"-"+currentDateTime.toString("ddMMyyyHH-mm")));
+                RaptorJFreeChartModel jfreeChart = getChartProcessor().constructJFreeGraph(GraphPresentation.FRONT,GraphType.AREA,numberOfAuthenticationsPerIntervalNumberModel,1270,300,(chosenStartTime.toString("ddMMyyyHH-mm")+"-"+currentDateTime.toString("ddMMyyyHH-mm")));
                 startstats.setHeadlineGraph(jfreeChart);
             }

raptor-web/trunk/src/main/webapp/WEB-INF/flows/reports/startReport.xhtml

@@ -22 +22 @@
                                         <h:panelGrid columns="7" columnClasses="verticalAlignMiddle">
 
-                                                <h:outputText style="font-size:150%; font-weight:bold' color:red"
+                                                <h:outputText style="font-size:150%"
                                                         value="Currently Attached to #{flowScope.websession.startmodel.attachedMUACapabilities.muaMetadata.muaName}, and showing statistics for: " />
 
@@ -57 +57 @@
 
                                 <h:panelGrid width="100%" style="height: 100%; text-align: center;">
-                                        <rich:spacer height="20px" />
+                                        <rich:spacer height="50px" />
 
                                         <h:panelGroup layout="horizontal" width="100%">
-                                                <rich:spacer width="60px" />
+                                                <rich:spacer width="30px" />
 
 
@@ -80 +80 @@
 
                                         </h:panelGroup>
-                                        <!--<h:outputText
-                                value="aaaaaaaaaaaaaaaaaaaaaaaaa"
-                                inlineStyle="opacity:0.0;color:#EEE9E8;" />
-                        -->
 
                                 </h:panelGrid>
@@ -92 +88 @@
                         <rich:layoutPanel position="center" >
                                 <a4j:form id="startTables">
-                                <rich:spacer height="20px" />
+                                <rich:spacer height="50px" />
                                 <h:panelGroup columns = "2">
                                         <rich:dataTable id="currentTableGraphTable"