comparison: src/Utils.cpp
src/Utils.cpp
- changeset 212
- 8b84dd3579ef
- parent 208
- 615afedbcd25
- child 215
- 4e2de71142a4
equal
deleted
inserted
replaced
| 211:bec0386b1df1 | 212:8b84dd3579ef |
|---|---|
| 522 double f4d = r1d * r2d * r3d * dd; | 522 double f4d = r1d * r2d * r3d * dd; |
| 523 return f2d + 2.0 * f3d + 3.0 * f4d; | 523 return f2d + 2.0 * f3d + 3.0 * f4d; |
| 524 } | 524 } |
| 525 | 525 |
| 526 | 526 |
| 527 double Utils::kettle_cm(double volume, double kettle_volume, double kettle_height) | |
| 528 { | |
| 529 if ((volume > 0) && (kettle_volume > 0) && (volume <= kettle_volume)) | |
| 530 return round(100 * ((1 - volume / kettle_volume) * kettle_height) * 10.0) / 10.0; | |
| 531 return 0; | |
| 532 } | |
| 533 | |
| 534 | |
| 535 double Utils::kettle_vol(double cm, double kettle_volume, double kettle_height) | |
| 536 { | |
| 537 if ((cm >= 0) && (kettle_volume > 0) && (cm <= (kettle_height * 100))) | |
| 538 return round(((kettle_height - (cm / 100)) / kettle_height) * kettle_volume * 10.0) / 10.0; | |
| 539 return 0; | |
| 540 } | |
| 541 | |
| 542 |
