X-Git-Url: https://satomichan.jp/gitweb/?p=nucalgen;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fjp%2Fsatomichan%2Fnucalgen%2FNucalgen.java;h=9eb18fcb5a579bdb36a2b4f0fcbff66ae3dfe5cb;hp=9f900568c84cd660be73021ff7b7b5f6406c4c32;hb=33a043c52b68b0feb72f4f3a84d648793f223b83;hpb=912f8df8f86a0e4b456abc34b0627d1f3f3c9f1d

diff --git a/src/main/java/jp/satomichan/nucalgen/Nucalgen.java b/src/main/java/jp/satomichan/nucalgen/Nucalgen.java
index 9f90056..9eb18fc 100644
--- a/src/main/java/jp/satomichan/nucalgen/Nucalgen.java
+++ b/src/main/java/jp/satomichan/nucalgen/Nucalgen.java
@@ -2,8 +2,11 @@ package jp.satomichan.nucalgen;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
@@ -18,7 +21,6 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.xssf.usermodel.XSSFName;
 
 public class Nucalgen {
 
@@ -36,6 +38,8 @@ public class Nucalgen {
 		options.addOption(Option.builder("protect").longOpt("set-protect").build());
 		options.addOption(Option.builder("r").longOpt("-use-processed-table").build());
 
+		Map<String, String> namedAreaMap = new HashMap<String, String>();
+
 		try {
 
 			CommandLineParser parser = new DefaultParser();
@@ -55,8 +59,8 @@ public class Nucalgen {
 
 			if(cmd.hasOption("use-processed-table") == false) {
 				//成分表 変換
-				MextStdFoodCompTable moe = new MextStdFoodCompTable(cmd.getOptionValue("bright-colored-vegetables-list"));
-				moe.processInto(outputWorkbook);
+				MextStdFoodCompTable stdCompTable = new MextStdFoodCompTable(cmd.getOptionValue("bright-colored-vegetables-list"));
+				stdCompTable.processInto(outputWorkbook);
 			}
 
 
@@ -93,12 +97,14 @@ public class Nucalgen {
 			}
 
 			//「栄養計算」行
+			List<String> usedTableList = new ArrayList<String>();
 			int rowIndex = 3;
 			for(int i = rowIndex; i < lines + 3; i++,rowIndex++) {
 				Row thisRow = calcSheet.createRow(rowIndex);
 
+				//「食品名」
 				thisRow.createCell(1).setCellStyle(csPool.getCellStyle("00000", false));
-				thisRow.createCell(2).setCellFormula("IFERROR(VLOOKUP(B" + (rowIndex + 1) + ",成分表!$B$12:$BL$2500,3,FALSE),\"\")");
+				thisRow.createCell(2).setCellFormula("IFERROR(VLOOKUP(B" + (rowIndex + 1) + ",成分表!$B$13:$BL$2500,3,FALSE),\"\")");
 				thisRow.createCell(3).setCellStyle(csPool.getCellStyle("", false));
 
 				colIndex = 4;
@@ -108,18 +114,18 @@ public class Nucalgen {
 
 					String div100 = aColumn.isUseRawValue() ? "" :  "/ 100 * $D" + (rowIndex + 1);
 
-					thisCell.setCellFormula("IFERROR(VLOOKUP($B" + (rowIndex + 1) + ",成分表!$B$12:$BL$2500,MATCH(\"" + aColumn.getName() + "\",成分表!$B$11:$BL$11,0),FALSE) " + div100 + ",\"\")");
+					thisCell.setCellFormula("IFERROR(VLOOKUP($B" + (rowIndex + 1) + "," + aColumn.getTable() + "!$B$13:$BL$2500,MATCH(\"" + aColumn.getName() + "\"," + aColumn.getTable() + "!$B$12:$BL$12,0),FALSE) " + div100 + ",\"\")");
 					colIndex++;
+
+					usedTableList.add(aColumn.getTable());
 				}
 
 			}
 
 
-			//摂取量 名前付き範囲
-			String intakeArea = new CellReference(calcSheet.getSheetName(), 3, 3, true, true).formatAsString() + ":" + new CellReference(calcSheet.getSheetName(), rowIndex -1, 3, true, true).formatAsString();
-			XSSFName intakeNamedRangeArea = (XSSFName) outputWorkbook.createName();
-			intakeNamedRangeArea.setNameName("AREA_INTAKE");
-			intakeNamedRangeArea.setRefersToFormula(intakeArea);
+			//摂取量 範囲を記憶
+			String intakeArea = new CellReference(3, 3, true, true).formatAsString() + ":" + new CellReference(rowIndex -1, 3, true, true).formatAsString();
+			namedAreaMap.put("AREA_INTAKE", intakeArea);
 
 
 			//「合計」行
@@ -129,24 +135,21 @@ public class Nucalgen {
 			colIndex = 4;
 			for(NutritionColumn aColumn : nc.getNutritionColumnList()) {
 				Cell thisCell = sumRow.createCell(colIndex);
-				String sumArea = new CellReference(calcSheet.getSheetName(), 3, colIndex, true, true).formatAsString() + ":" + new CellReference(calcSheet.getSheetName(), rowIndex -1, colIndex, true, true).formatAsString();
+				String sumTargetArea = new CellReference(3, colIndex, true, true).formatAsString() + ":" + new CellReference(rowIndex -1, colIndex, true, true).formatAsString();
 
-				//名前付き範囲（alias あれば設定）
+				//範囲を記憶（alias あれば設定）
 				if(aColumn.getAlias().length() > 0) {
-					XSSFName namedRangeArea = (XSSFName) outputWorkbook.createName();
-					namedRangeArea.setNameName("AREA_" + aColumn.getAlias());
-					namedRangeArea.setRefersToFormula(sumArea);
+					namedAreaMap.put("AREA_" + aColumn.getAlias(), sumTargetArea);
 
 					if(aColumn.isUseSum()) {
-						XSSFName namedRangeSum = (XSSFName) outputWorkbook.createName();
-						namedRangeSum.setNameName("SUM_" + aColumn.getAlias());
-						namedRangeSum.setRefersToFormula(new CellReference(calcSheet.getSheetName(), rowIndex, colIndex, true, true).formatAsString());
+						String sumArea = new CellReference(rowIndex, colIndex, true, true).formatAsString();
+						namedAreaMap.put("SUM_" + aColumn.getAlias(), sumArea);
 					}
 				}
 
 				thisCell.setCellStyle(csPool.getCellStyle(aColumn.getFormat()));
 				if(aColumn.isUseSum()) {
-					thisCell.setCellFormula("SUM(" + sumArea + ")");
+					thisCell.setCellFormula("SUM(" + sumTargetArea + ")");
 				}
 				colIndex++;
 			}
@@ -155,13 +158,28 @@ public class Nucalgen {
 			//「PFCバランス」出力
 			if(cmd.hasOption("with-pfc-balance")) {
 				rowIndex += 3;
-				rowIndex = generatePfcBalance(calcSheet, csPool, rowIndex);
+				rowIndex = generatePfcBalance(calcSheet, csPool, rowIndex, namedAreaMap);
 			}
 
 			//「食品群別摂取量」出力
 			if(cmd.hasOption("with-group-sum")) {
 				rowIndex += 3;
-				rowIndex = generateGroupSum(calcSheet, csPool, rowIndex);
+				rowIndex = generateGroupSum(calcSheet, csPool, rowIndex, namedAreaMap);
+			}
+
+
+			//未使用表シート削除
+			for(int si = outputWorkbook.getNumberOfSheets() - 1 ; si >= 1 ; si--) {
+				String sheetName = outputWorkbook.getSheetName(si);
+				boolean used = false;
+				for(String usedTable : usedTableList) {
+					if(usedTable.equals(sheetName)) {
+						used = true;
+					}
+				}
+				if(!used) {
+					outputWorkbook.removeSheetAt(si);
+				}
 			}
 
 			//ブック出力
@@ -181,7 +199,7 @@ public class Nucalgen {
 
 
 	//PFCバランス
-	private static int generatePfcBalance(Sheet calcSheet, CellStylePool csPool, int rowIndex) {
+	private static int generatePfcBalance(Sheet calcSheet, CellStylePool csPool, int rowIndex, Map<String,String> _namedAreaMap) {
 		Row pfbBalanceRow1 = calcSheet.createRow(rowIndex);
 		pfbBalanceRow1.createCell(1).setCellValue("PFCバランス (%)");
 		calcSheet.addMergedRegion(new CellRangeAddress(rowIndex, rowIndex, 1, 2));
@@ -189,17 +207,20 @@ public class Nucalgen {
 		pfbBalanceRow1.createCell(4).setCellValue("F");
 		pfbBalanceRow1.createCell(5).setCellValue("C");
 
+		final String sumPfc = "(" + _namedAreaMap.get("SUM_P") + "*4+" + _namedAreaMap.get("SUM_F") + "*9+" + _namedAreaMap.get("SUM_C") + "*4)";
+
 		rowIndex++;
 		Row pfbBalanceRow2 = calcSheet.createRow(rowIndex);
 		Cell pCell = pfbBalanceRow2.createCell(3);
 		pCell.setCellStyle(csPool.getCellStyle("0"));
-		pCell.setCellFormula("SUM_P*4*100/(SUM_P*4+SUM_F*9+SUM_C*4)");
+		pCell.setCellFormula(_namedAreaMap.get("SUM_P") + "*4*100/" + sumPfc);
+
 		Cell fCell = pfbBalanceRow2.createCell(4);
 		fCell.setCellStyle(csPool.getCellStyle("0"));
-		fCell.setCellFormula("SUM_F*9*100/(SUM_P*4+SUM_F*9+SUM_C*4)");
+		fCell.setCellFormula(_namedAreaMap.get("SUM_F") + "*9*100/" + sumPfc);
 		Cell cCell = pfbBalanceRow2.createCell(5);
 		cCell.setCellStyle(csPool.getCellStyle("0"));
-		cCell.setCellFormula("SUM_C*4*100/(SUM_P*4+SUM_F*9+SUM_C*4)");
+		cCell.setCellFormula(_namedAreaMap.get("SUM_C") + "*4*100/" + sumPfc);
 
 		return rowIndex;
 	}
@@ -207,12 +228,14 @@ public class Nucalgen {
 
 
 	 //群別摂取量
-	private static int generateGroupSum(Sheet calcSheet, CellStylePool csPool, int rowIndex) {
+	private static int generateGroupSum(Sheet calcSheet, CellStylePool csPool, int rowIndex, Map<String,String> _namedAreaMap) {
 
 		List<String> groupName = Arrays.asList("0", "穀類", "いも及びでん粉類", "砂糖及び甘味類", "豆類",
 				"種実類", "野菜類", "果実類", "きのこ類", "藻類", "魚介類", "肉類", "卵類", "乳類",
 				"油脂類", "菓子類", "し好飲料類", "調味料及び香辛料類", "調理加工食品類");
 
+
+
 		Row groupRow = calcSheet.createRow(rowIndex);
 		groupRow.createCell(1).setCellValue("食品群");
 		groupRow.createCell(3).setCellValue("摂取量(g)");
@@ -224,7 +247,8 @@ public class Nucalgen {
 			thisRow.createCell(2).setCellValue(groupName.get(i));
 			Cell cCell = thisRow.createCell(3);
 			cCell.setCellStyle(csPool.getCellStyle(""));
-			cCell.setCellFormula("SUMIF(AREA_GROUP, " + i + ", AREA_INTAKE)");
+			//cCell.setCellFormula("SUMIF(AREA_GROUP, " + i + ", AREA_INTAKE)");
+			cCell.setCellFormula("SUMIF(" + _namedAreaMap.get("AREA_GROUP") + ", " + i + ", " + _namedAreaMap.get("AREA_INTAKE") + ")");
 
 			if(i == 6) {
 				rowIndex++;
@@ -232,8 +256,8 @@ public class Nucalgen {
 				thisRow.createCell(2).setCellValue("うち　緑黄色野菜");
 				Cell bcvCell = thisRow.createCell(3);
 				bcvCell.setCellStyle(csPool.getCellStyle("0"));
-				bcvCell.setCellFormula("SUMIF(AREA_BRIGHT_COLORED_VEGETABLE, 1, AREA_INTAKE)");
-
+				//bcvCell.setCellFormula("SUMIF(AREA_BRIGHT_COLORED_VEGETABLE, 1, AREA_INTAKE)");
+				bcvCell.setCellFormula("SUMIF(" + _namedAreaMap.get("AREA_BRIGHT_COLORED_VEGETABLE") + ", 1, " + _namedAreaMap.get("AREA_INTAKE") + ")");
 			}