projects
/
nucalgen
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
★「PFCバランス」の算出方法を変更
[nucalgen]
/
src
/
main
/
java
/
jp
/
satomichan
/
nucalgen
/
Nucalgen.java
diff --git
a/src/main/java/jp/satomichan/nucalgen/Nucalgen.java
b/src/main/java/jp/satomichan/nucalgen/Nucalgen.java
index 9eb18fcb5a579bdb36a2b4f0fcbff66ae3dfe5cb..3c9dbcc81486db38215c9106e0654b82dac26607 100644
(file)
--- a/
src/main/java/jp/satomichan/nucalgen/Nucalgen.java
+++ b/
src/main/java/jp/satomichan/nucalgen/Nucalgen.java
@@
-207,20
+207,22
@@
public class Nucalgen {
pfbBalanceRow1.createCell(4).setCellValue("F");
pfbBalanceRow1.createCell(5).setCellValue("C");
pfbBalanceRow1.createCell(4).setCellValue("F");
pfbBalanceRow1.createCell(5).setCellValue("C");
- final String sum
Pfc = "(" + _namedAreaMap.get("SUM_P") + "*4+" + _namedAreaMap.get("SUM_F") + "*9+" + _namedAreaMap.get("SUM_C") + "*4)"
;
+ final String sum
KiloCalorieCell = _namedAreaMap.get("SUM_KCAL")
;
rowIndex++;
Row pfbBalanceRow2 = calcSheet.createRow(rowIndex);
Cell pCell = pfbBalanceRow2.createCell(3);
pCell.setCellStyle(csPool.getCellStyle("0"));
rowIndex++;
Row pfbBalanceRow2 = calcSheet.createRow(rowIndex);
Cell pCell = pfbBalanceRow2.createCell(3);
pCell.setCellStyle(csPool.getCellStyle("0"));
- pCell.setCellFormula(
_namedAreaMap.get("SUM_P") + "*4*100/" + sumPfc
);
+ pCell.setCellFormula(
"ROUND(" + _namedAreaMap.get("SUM_P") + "*4*100/" + sumKiloCalorieCell + ",0)"
);
Cell fCell = pfbBalanceRow2.createCell(4);
fCell.setCellStyle(csPool.getCellStyle("0"));
Cell fCell = pfbBalanceRow2.createCell(4);
fCell.setCellStyle(csPool.getCellStyle("0"));
- fCell.setCellFormula(_namedAreaMap.get("SUM_F") + "*9*100/" + sumPfc);
+ fCell.setCellFormula("ROUND(" + _namedAreaMap.get("SUM_F") + "*9*100/" + sumKiloCalorieCell + ",0)");
+
Cell cCell = pfbBalanceRow2.createCell(5);
cCell.setCellStyle(csPool.getCellStyle("0"));
Cell cCell = pfbBalanceRow2.createCell(5);
cCell.setCellStyle(csPool.getCellStyle("0"));
- cCell.setCellFormula(_namedAreaMap.get("SUM_C") + "*4*100/" + sumPfc);
+ cCell.setCellFormula("100 - (" + new CellReference(cCell.getRowIndex(), 3).formatAsString() + " + "
+ + new CellReference(cCell.getRowIndex(), 4).formatAsString() + ")");
return rowIndex;
}
return rowIndex;
}