Changeset 505

Timestamp:

02/03/11 17:34:42 (2 years ago)

Author:

philsmart

Message:

 

Location:

raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model

Files:

• Graph/AggregatorGraphModel.java (modified) (3 diffs)
• Presentation.java (added)
• Series.java (added)
• StatisticParameters.java (modified) (6 diffs)

raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/Graph/AggregatorGraphModel.java

@@ -3 +3 @@
 import java.util.ArrayList;
 import java.util.List;
+
+import uk.ac.cardiff.model.Presentation;
 
 
@@ -15 +17 @@
         private List<String> seriesLabels;
         private List<List<Double>> chartValues;
+
+        private Presentation presentation;
 
 
@@ -72 +76 @@
         }
 
+        public void setPresentation(Presentation presentation) {
+            this.presentation = presentation;
+        }
+
+        public Presentation getPresentation() {
+            return presentation;
+        }
+
 
 }

raptor-information-model/trunk/src/main/java/uk/ac/cardiff/model/StatisticParameters.java

@@ -5 +5 @@
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -41 +42 @@
     private List<MethodParameter> methodParams;
 
-    /* The textual description of the series, as attached to the x-axis */
-    private String seriesLabel;
-    /* A formatted textual description of the series, typically formatted by the logic of the authentication statistic*/
-    private String SeriesLabelFormatted;
-
     /*
      * the start time from which to produce the starts, defining the temporal extent If a starttime and endtime is not given, the entire temporal extent of the
@@ -67 +63 @@
     private SQLFilter sqlFilter;
 
+    /* Configures the parameters used to view a graphical representation*/
+    private Presentation presentation;
+
+    /* A series to plot on the graph*/
+     private List<Series> series;
+
+     public StatisticParameters(){
+         presentation = new Presentation();
+         presentation.setGraphTitle("");
+         presentation.setxAxisLabel("");
+         presentation.setyAxisLabel("");
+         setSeries(new ArrayList<Series>());
+     }
+
     public void setUnitName(String unitName) {
-        log.debug("Setting unit name: "+unitName);
         this.unitName = unitName;
     }
@@ -90 +99 @@
     public List<MethodParameter> getMethodParams() {
         return methodParams;
-    }
-
-    public void setSeriesLabel(String seriesLabel) {
-        this.seriesLabel = seriesLabel;
-    }
-
-    public String getSeriesLabel() {
-        return seriesLabel;
     }
 
@@ -313 +314 @@
     }
 
-    public void setSeriesLabelFormatted(String seriesLabelFormatted) {
-        SeriesLabelFormatted = seriesLabelFormatted;
-    }
-
-    public String getSeriesLabelFormatted() {
-        return SeriesLabelFormatted;
-    }
-
     public void setSqlFilter(SQLFilter sqlFilter) {
         this.sqlFilter = sqlFilter;
@@ -329 +322 @@
     }
 
-
+    public void setPresentation(Presentation presentation) {
+        this.presentation = presentation;
+    }
+
+    public Presentation getPresentation() {
+        return presentation;
+    }
+
+    public void setSeries(List<Series> series) {
+        this.series = series;
+    }
+
+    public List<Series> getSeries() {
+        return series;
+    }