Revision: 107
http://polepos.svn.sourceforge.net/polepos/?rev=107&view=rev
Author: carlrosenberger
Date: 2010-06-10 14:59:25 +0000 (Thu, 10 Jun 2010)
Log Message:
-----------
cr + pr: No more overview in PDF, Sorting of props for Turnsetups,
fixed issue with long names in XLSReporter,
Modified Paths:
--------------
trunk/polepos/src/org/polepos/framework/ConcurrencyCircuit.java
trunk/polepos/src/org/polepos/framework/Lap.java
trunk/polepos/src/org/polepos/framework/SetupProperty.java
trunk/polepos/src/org/polepos/framework/TurnSetup.java
trunk/polepos/src/org/polepos/reporters/PDFReporter.java
trunk/polepos/src/org/polepos/reporters/XLSReporter.java
Modified: trunk/polepos/src/org/polepos/framework/ConcurrencyCircuit.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/ConcurrencyCircuit.java 2010-06-10 14:21:30 UTC (rev 106)
+++ trunk/polepos/src/org/polepos/framework/ConcurrencyCircuit.java 2010-06-10 14:59:25 UTC (rev 107)
@@ -24,7 +24,7 @@
public class ConcurrencyCircuit implements Circuit {
- private final String NAME_ADD_ON = "Concurrency";
+ public static final String NAME_ADD_ON = "Concurrency";
private final Circuit _delegate;
Modified: trunk/polepos/src/org/polepos/framework/Lap.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/Lap.java 2010-06-10 14:21:30 UTC (rev 106)
+++ trunk/polepos/src/org/polepos/framework/Lap.java 2010-06-10 14:59:25 UTC (rev 107)
@@ -105,7 +105,6 @@
sb.append("\n");
}
_code = sb.toString();
- System.out.println(_code);
bufferedReader.close();
} catch (FileNotFoundException e) {
e.printStackTrace();
Modified: trunk/polepos/src/org/polepos/framework/SetupProperty.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/SetupProperty.java 2010-06-10 14:21:30 UTC (rev 106)
+++ trunk/polepos/src/org/polepos/framework/SetupProperty.java 2010-06-10 14:59:25 UTC (rev 107)
@@ -19,7 +19,7 @@
package org.polepos.framework;
-public class SetupProperty {
+public class SetupProperty implements Comparable<SetupProperty>{
private final String name;
@@ -71,5 +71,10 @@
}
return true;
}
+
+ @Override
+ public int compareTo(SetupProperty other) {
+ return name.compareTo(other.name);
+ }
}
Modified: trunk/polepos/src/org/polepos/framework/TurnSetup.java
===================================================================
--- trunk/polepos/src/org/polepos/framework/TurnSetup.java 2010-06-10 14:21:30 UTC (rev 106)
+++ trunk/polepos/src/org/polepos/framework/TurnSetup.java 2010-06-10 14:59:25 UTC (rev 107)
@@ -119,8 +119,10 @@
return "";
}
- public Set<SetupProperty> properties() {
- return Collections.unmodifiableSet(new HashSet<SetupProperty>(mSettings.values()));
+ public List<SetupProperty> properties() {
+ List<SetupProperty> list = new ArrayList<SetupProperty>(mSettings.values());
+ Collections.sort(list);
+ return list;
}
public void addSetting(SetupProperty setupProperty){
Modified: trunk/polepos/src/org/polepos/reporters/PDFReporter.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/PDFReporter.java 2010-06-10 14:21:30 UTC (rev 106)
+++ trunk/polepos/src/org/polepos/reporters/PDFReporter.java 2010-06-10 14:59:25 UTC (rev 107)
@@ -285,20 +285,25 @@
try {
JFreeChart overviewSizeChart = createChart(_overviewSizeDataset,
ReporterConstants.SIZE_CHART_LEGEND);
- renderOverviewPage(overviewSizeChart,
- ReporterConstants.SIZE_OVERVIEW_LEGEND);
+
- JFreeChart overviewMemoryChart = createChart(
- _overviewMemoryDataset,
- ReporterConstants.MEMORY_CHART_LEGEND);
- renderOverviewPage(overviewMemoryChart,
- ReporterConstants.MEMORY_OVERVIEW_LEGEND);
+ // Overviews don't really look nice and useful if lots of circuits are run.
+
+
+// renderOverviewPage(overviewSizeChart,
+// ReporterConstants.SIZE_OVERVIEW_LEGEND);
+//
+// JFreeChart overviewMemoryChart = createChart(
+// _overviewMemoryDataset,
+// ReporterConstants.MEMORY_CHART_LEGEND);
+// renderOverviewPage(overviewMemoryChart,
+// ReporterConstants.MEMORY_OVERVIEW_LEGEND);
+//
+// JFreeChart overviewTimeChart = createChart(_overviewTimeDataset,
+// ReporterConstants.TIME_CHART_LEGEND);
+// renderOverviewPage(overviewTimeChart,
+// ReporterConstants.TIME_OVERVIEW_LEGEND);
- JFreeChart overviewTimeChart = createChart(_overviewTimeDataset,
- ReporterConstants.TIME_CHART_LEGEND);
- renderOverviewPage(overviewTimeChart,
- ReporterConstants.TIME_OVERVIEW_LEGEND);
-
renderFirstPage(cars);
renderPDFFile();
Modified: trunk/polepos/src/org/polepos/reporters/XLSReporter.java
===================================================================
--- trunk/polepos/src/org/polepos/reporters/XLSReporter.java 2010-06-10 14:21:30 UTC (rev 106)
+++ trunk/polepos/src/org/polepos/reporters/XLSReporter.java 2010-06-10 14:59:25 UTC (rev 107)
@@ -29,9 +29,7 @@
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.polepos.framework.SetupProperty;
-import org.polepos.framework.TeamCar;
-import org.polepos.framework.TurnSetup;
+import org.polepos.framework.*;
public class XLSReporter extends GraphReporter {
@@ -58,6 +56,9 @@
String sheetName = graph.circuit().name()+ " " +graph.lap().name();
+ // Names are limited to 31 characters
+ sheetName = sheetName.replaceAll(ConcurrencyCircuit.NAME_ADD_ON + " ", "C");
+
HSSFSheet sheet = workbook.getSheet(sheetName);
if(sheet == null){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
