Menu
▾
▴
[Tail-cvs] Tail/src/java/net/sf/tail/report/xls WorkbookGenerator.java, 1.4 ReportXlsGenerator.java, 1.17 TimeSeriesXlsGenerator.java, 1.11 SliceXlsGenerator.java, 1.18
|
From: Thies <tg...@us...> - 2007-12-10 20:34:20
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14185/src/java/net/sf/tail/report/xls Modified Files: WorkbookGenerator.java ReportXlsGenerator.java TimeSeriesXlsGenerator.java SliceXlsGenerator.java Log Message: Adicionada a opcao de nao gerar os gráficos Index: TimeSeriesXlsGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/TimeSeriesXlsGenerator.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TimeSeriesXlsGenerator.java 5 Dec 2007 23:22:45 -0000 1.10 --- TimeSeriesXlsGenerator.java 10 Dec 2007 20:34:22 -0000 1.11 *************** *** 11,14 **** --- 11,15 ---- import net.sf.tail.tick.DefaultTick; + import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.poi.hssf.usermodel.HSSFCell; *************** *** 35,38 **** --- 36,40 ---- this.sheet = workbook.createSheet("Time Series"); stylist = new CellStylist(workbook); + LOG.setLevel(Level.WARN); } Index: SliceXlsGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/SliceXlsGenerator.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** SliceXlsGenerator.java 21 Nov 2007 21:55:20 -0000 1.17 --- SliceXlsGenerator.java 10 Dec 2007 20:34:22 -0000 1.18 *************** *** 14,17 **** --- 14,18 ---- import net.sf.tail.report.Report; + import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.poi.hssf.usermodel.HSSFCell; *************** *** 42,45 **** --- 43,47 ---- this.workbook = workbook; this.stylist = new CellStylist(workbook); + LOG.setLevel(Level.WARN); } *************** *** 53,63 **** } ! public List<HSSFSheet> generate(Decision decision, List<AnalysisCriterion> criteria, Period period, File chart) ! throws IOException { LOG.info("Initializing XLS Decision for " + decision.getFileName()); long time = System.currentTimeMillis(); int row = INDEX_FIRST_ROW; - List<HSSFSheet> sheets = new LinkedList<HSSFSheet>(); HSSFSheet sheet = workbook.createSheet(decision.getFileName()); --- 55,77 ---- } ! public HSSFSheet generate(Decision decision, List<AnalysisCriterion> criteria, Period period, File chart) ! throws IOException { ! ! HSSFSheet sheet = generate(decision, criteria, period); ! ! stylist.drawImage(chart, sheet, 1, 7); ! ! stylist.rearrangeSheet(sheet, criteria.size() + 6); ! ! ! return sheet; ! } ! ! public HSSFSheet generate(Decision decision, List<AnalysisCriterion> criteria, Period period) ! throws IOException { LOG.info("Initializing XLS Decision for " + decision.getFileName()); long time = System.currentTimeMillis(); int row = INDEX_FIRST_ROW; HSSFSheet sheet = workbook.createSheet(decision.getFileName()); *************** *** 65,69 **** String title = "Slice Report"; row = generateTitle(row, title, style, sheet); ! style = stylist.createSubTitleCellStyle(); String[] subtitle = new String[4]; --- 79,83 ---- String title = "Slice Report"; row = generateTitle(row, title, style, sheet); ! style = stylist.createSubTitleCellStyle(); String[] subtitle = new String[4]; *************** *** 73,77 **** subtitle[3] = decision.getActualSlice().getPeriodName(); row = generateSubTitle(row, subtitle, style, sheet); ! style = stylist.createInfoCellStyle(); String[] info = new String[4]; --- 87,91 ---- subtitle[3] = decision.getActualSlice().getPeriodName(); row = generateSubTitle(row, subtitle, style, sheet); ! style = stylist.createInfoCellStyle(); String[] info = new String[4]; *************** *** 81,87 **** info[3] = decision.getCriterion().getName(); row = generateInfo(row, info, style, sheet); ! row = 24; ! style = stylist.createHeaderCellStyle(); row = generateHeader(row, workbook, sheet, criteria, style); --- 95,101 ---- info[3] = decision.getCriterion().getName(); row = generateInfo(row, info, style, sheet); ! row = 24; ! style = stylist.createHeaderCellStyle(); row = generateHeader(row, workbook, sheet, criteria, style); *************** *** 94,111 **** generateSummaryRow(row, workbook, sheet, decision, criteria, style); - stylist.drawImage(chart, sheet, 1, 7); - - stylist.rearrangeSheet(sheet, criteria.size() + 6); - - sheets.add(sheet); - LOG.info("Decision "+ decision.getFileName() +" generated (" + (System.currentTimeMillis() - time) + " miliseconds)"); ! return sheets; } public List<HSSFSheet> generate(Report report, List<AnalysisCriterion> criteria, Period period, List<File> charts) throws IOException { List<HSSFSheet> sheets = new LinkedList<HSSFSheet>(); for (int i = 0; i < report.getDecisions().size(); i++) { ! sheets.addAll(this.generate(report.getDecisions().get(i), criteria, period, charts.get(i))); } return sheets; --- 108,124 ---- generateSummaryRow(row, workbook, sheet, decision, criteria, style); LOG.info("Decision "+ decision.getFileName() +" generated (" + (System.currentTimeMillis() - time) + " miliseconds)"); ! return sheet; } + + public List<HSSFSheet> generate(Report report, List<AnalysisCriterion> criteria, Period period, List<File> charts) throws IOException { List<HSSFSheet> sheets = new LinkedList<HSSFSheet>(); for (int i = 0; i < report.getDecisions().size(); i++) { ! if(charts.size() > 0) ! sheets.add(this.generate(report.getDecisions().get(i), criteria, period, charts.get(i))); ! else ! sheets.add(this.generate(report.getDecisions().get(i), criteria, period)); } return sheets; *************** *** 121,125 **** return firstRow; } ! private int generateSubTitle(int firstRow, String[] title, HSSFCellStyle style, HSSFSheet sheet) { HSSFRow rowHeader = sheet.createRow((short) firstRow++); --- 134,138 ---- return firstRow; } ! private int generateSubTitle(int firstRow, String[] title, HSSFCellStyle style, HSSFSheet sheet) { HSSFRow rowHeader = sheet.createRow((short) firstRow++); *************** *** 134,138 **** return firstRow; } ! private int generateInfo(int firstRow, String[] title, HSSFCellStyle style, HSSFSheet sheet) { HSSFRow rowHeader = sheet.createRow((short) firstRow); --- 147,151 ---- return firstRow; } ! private int generateInfo(int firstRow, String[] title, HSSFCellStyle style, HSSFSheet sheet) { HSSFRow rowHeader = sheet.createRow((short) firstRow); *************** *** 147,151 **** return firstRow+2; } ! private int generateHeader(int firtRow, HSSFWorkbook workbook, HSSFSheet sheet, List<AnalysisCriterion> criteria, HSSFCellStyle style) { --- 160,164 ---- return firstRow+2; } ! private int generateHeader(int firtRow, HSSFWorkbook workbook, HSSFSheet sheet, List<AnalysisCriterion> criteria, HSSFCellStyle style) { *************** *** 210,214 **** even = !even; } ! LOG.info("Ending Internal rows of the Decision " + decision.getFileName() + " (" + (System.currentTimeMillis() - time) + " miliseconds)"); return firtRow; --- 223,227 ---- even = !even; } ! LOG.info("Ending Internal rows of the Decision " + decision.getFileName() + " (" + (System.currentTimeMillis() - time) + " miliseconds)"); return firtRow; Index: WorkbookGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/WorkbookGenerator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WorkbookGenerator.java 17 Oct 2007 21:40:53 -0000 1.3 --- WorkbookGenerator.java 10 Dec 2007 20:34:22 -0000 1.4 *************** *** 12,15 **** --- 12,16 ---- import net.sf.tail.report.Report; + import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.poi.hssf.usermodel.HSSFWorkbook; *************** *** 19,22 **** --- 20,26 ---- private static final Logger LOG = Logger.getLogger(WorkbookGenerator.class); + public WorkbookGenerator() { + LOG.setLevel(Level.WARN); + } public HSSFWorkbook generate(Report report, Period period, List<File> charts) throws IOException { *************** *** 28,39 **** public HSSFWorkbook generate(Report report, List<AnalysisCriterion> criteria, Period period, List<File> charts) ! throws IOException { long time = System.currentTimeMillis(); LOG.info("Initializing the generation of the XLS"); List<File> chartFile = new ArrayList<File>(); ! chartFile.add(charts.remove(0)); HSSFWorkbook workbook = new HSSFWorkbook(); ! XLSReportGenerator reportXls = new ReportXlsGenerator(workbook); XLSReportGenerator slicerXls = new SliceXlsGenerator(workbook); TimeSeriesXlsGenerator seriesXls = new TimeSeriesXlsGenerator(workbook); --- 32,44 ---- public HSSFWorkbook generate(Report report, List<AnalysisCriterion> criteria, Period period, List<File> charts) ! throws IOException { long time = System.currentTimeMillis(); LOG.info("Initializing the generation of the XLS"); List<File> chartFile = new ArrayList<File>(); ! if(charts.size() > 0) ! chartFile.add(charts.remove(0)); HSSFWorkbook workbook = new HSSFWorkbook(); ! ReportXlsGenerator reportXls = new ReportXlsGenerator(workbook); XLSReportGenerator slicerXls = new SliceXlsGenerator(workbook); TimeSeriesXlsGenerator seriesXls = new TimeSeriesXlsGenerator(workbook); *************** *** 44,48 **** seriesXls.generate(report); ! reportXls.generate(report, criteria, period, chartFile); slicerXls.generate(report, criteria2, period, charts); --- 49,56 ---- seriesXls.generate(report); ! if(chartFile.size() > 0) ! reportXls.generate(report, criteria, period, chartFile); ! else ! reportXls.generate(report, criteria, period); slicerXls.generate(report, criteria2, period, charts); Index: ReportXlsGenerator.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/ReportXlsGenerator.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ReportXlsGenerator.java 21 Nov 2007 21:55:20 -0000 1.16 --- ReportXlsGenerator.java 10 Dec 2007 20:34:22 -0000 1.17 *************** *** 12,15 **** --- 12,16 ---- import net.sf.tail.report.Report; + import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.poi.hssf.usermodel.HSSFCell; *************** *** 36,39 **** --- 37,41 ---- this.workbook = workbook; stylist = new CellStylist(workbook); + LOG.setLevel(Level.WARN); } *************** *** 48,52 **** public List<HSSFSheet> generate(Report report, List<AnalysisCriterion> criteria, Period period, List<File> charts) ! throws IOException { LOG.info("Initializing XLS Report"); long time = System.currentTimeMillis(); --- 50,68 ---- public List<HSSFSheet> generate(Report report, List<AnalysisCriterion> criteria, Period period, List<File> charts) ! throws IOException { ! ! List<HSSFSheet> sheets = generate(report, criteria, period); ! ! for (HSSFSheet sheet : sheets) { ! ! stylist.drawImage(charts.get(0), sheet, 1, 4); ! ! stylist.rearrangeSheet(sheet, criteria.size() + 5); ! } ! return sheets; ! } ! ! public List<HSSFSheet> generate(Report report, List<AnalysisCriterion> criteria, Period period) ! throws IOException { LOG.info("Initializing XLS Report"); long time = System.currentTimeMillis(); *************** *** 59,63 **** String title = "WalkForward Report"; row = generateTitle(row, title, style, sheet); ! style = stylist.createSubTitleCellStyle(); String[] subtitle = new String[4]; --- 75,79 ---- String title = "WalkForward Report"; row = generateTitle(row, title, style, sheet); ! style = stylist.createSubTitleCellStyle(); String[] subtitle = new String[4]; *************** *** 67,71 **** subtitle[3] = report.getSlicer().getSeries().getPeriodName(); row = generateSubTitle(row, subtitle, style, sheet); ! style = stylist.createInfoCellStyle(); String[] info = new String[4]; --- 83,87 ---- subtitle[3] = report.getSlicer().getSeries().getPeriodName(); row = generateSubTitle(row, subtitle, style, sheet); ! style = stylist.createInfoCellStyle(); String[] info = new String[4]; *************** *** 75,81 **** info[3] = report.getDecisions().get(0).getStrategy().getClass().getSimpleName() + " Criteria: " + report.getApplyedCriterion().getName(); row = generateInfo(row, info, style, sheet); ! row = 24; ! style = stylist.createHeaderCellStyle(); row = generateHeader(row, sheet, report, criteria, style); --- 91,97 ---- info[3] = report.getDecisions().get(0).getStrategy().getClass().getSimpleName() + " Criteria: " + report.getApplyedCriterion().getName(); row = generateInfo(row, info, style, sheet); ! row = 24; ! style = stylist.createHeaderCellStyle(); row = generateHeader(row, sheet, report, criteria, style); *************** *** 90,98 **** style = stylist.createSummaryCellStyle(); generateSummaryRow(row, sheet, report, criteria, style); - - stylist.drawImage(charts.get(0), sheet, 1, 4); - - stylist.rearrangeSheet(sheet, criteria.size() + 5); - sheets.add(sheet); LOG.info("XLS Report generated (" + (System.currentTimeMillis() - time) + " miliseconds)"); --- 106,109 ---- *************** *** 109,113 **** return firstRow; } ! private int generateSubTitle(int firstRow, String[] title, HSSFCellStyle style, HSSFSheet sheet) { HSSFRow rowHeader = sheet.createRow((short) firstRow++); --- 120,124 ---- return firstRow; } ! private int generateSubTitle(int firstRow, String[] title, HSSFCellStyle style, HSSFSheet sheet) { HSSFRow rowHeader = sheet.createRow((short) firstRow++); *************** *** 122,126 **** return firstRow; } ! private int generateInfo(int firstRow, String[] title, HSSFCellStyle style, HSSFSheet sheet) { HSSFRow rowHeader = sheet.createRow((short) firstRow); --- 133,137 ---- return firstRow; } ! private int generateInfo(int firstRow, String[] title, HSSFCellStyle style, HSSFSheet sheet) { HSSFRow rowHeader = sheet.createRow((short) firstRow); *************** *** 135,139 **** return firstRow+2; } ! private int generateHeader(int firtRow, HSSFSheet sheet, Report report, List<AnalysisCriterion> criteria, HSSFCellStyle style) { --- 146,150 ---- return firstRow+2; } ! private int generateHeader(int firtRow, HSSFSheet sheet, Report report, List<AnalysisCriterion> criteria, HSSFCellStyle style) { |
