Revision 1854

sqs-reader/src/main/java/net/sqs2/omr/result/export/chart/ChartHTMLWriter.java (revision 1854)
64 64
	void drawBarChartImage(List<FormArea> formAreaList, SpreadSheet spreadSheet) throws IOException, TemplateException {
65 65
		SourceDirectory sourceDirectory = spreadSheet.getSourceDirectory();
66 66
		FormArea defaultFormArea = formAreaList.get(0);
67
		int columnIndex = defaultFormArea.getColumnIndex();
67
		int columnIndex = defaultFormArea.getQuestionIndex();
68 68
		File chartImageFile = ResultDirectoryUtil.createTargetFile(sourceDirectory, defaultFormArea, "CHART", "bar");
69 69
		if (chartImageFile.exists()
70 70
				&& this.sessionResultEventExporter.getTargetLastModifiedArray()[columnIndex] < chartImageFile.lastModified()) {
......
94 94
		// FormMaster master = (FormMaster) sourceDirectory.getPageMaster();
95 95
		FormArea defaultFormArea = formAreaList.get(0);
96 96

  
97
		int columnIndex = defaultFormArea.getColumnIndex();
97
		int columnIndex = defaultFormArea.getQuestionIndex();
98 98

  
99 99
		File chartImageFile = ResultDirectoryUtil.createTargetFile(sourceDirectory, defaultFormArea, "CHART", "pie");
100 100

  
......
139 139
			List<FormArea> formAreaList = master.getFormAreaList(qid);
140 140
			List<ChartItem> chartItemList = new ArrayList<ChartItem>(formAreaList.size());
141 141
			FormArea defaultFormArea = formAreaList.get(0);
142
			int columnIndex = defaultFormArea.getColumnIndex();
142
			int columnIndex = defaultFormArea.getQuestionIndex();
143 143
			int[] numAnswers = this.sessionResultEventExporter.getValueTotalMatrix()[columnIndex];
144 144

  
145 145
			if (defaultFormArea.isSelect1() || defaultFormArea.isSelect()) {
......
167 167

  
168 168
		HTMLReportExportModule.registTitle(master, map);
169 169
		map.put("exportChartImageMode", isExportChartImageMode);
170
		map.put("path", sourceDirectory.getPath());
170
		map.put("path", sourceDirectory.getRelativePath());
171 171
		map.put("master", master);
172 172
		map.put("numRows", numRows);
173 173
		map.put("charts", charts);

Also available in: Unified diff