comparison: src/EditRecipeTab7.cpp
src/EditRecipeTab7.cpp
- changeset 134
- 5099df8ba6c6
- parent 133
- 08635b028dcf
- child 135
- e68b27ad8a40
equal
deleted
inserted
replaced
| 133:08635b028dcf | 134:5099df8ba6c6 |
|---|---|
| 27 //ui->mw_acidpercEdit->setValue(recipe-> | 27 //ui->mw_acidpercEdit->setValue(recipe-> |
| 28 | 28 |
| 29 } | 29 } |
| 30 | 30 |
| 31 | 31 |
| 32 double EditRecipe::mix(double v1, double v2, double c1, double c2) | |
| 33 { | |
| 34 if ((v1 + v2) > 0) { | |
| 35 return ((v1 * c1) + (v2 * c2)) / (v1 + v2); | |
| 36 } | |
| 37 return 0; | |
| 38 } | |
| 39 | |
| 40 | |
| 41 void EditRecipe::calcWater() | 32 void EditRecipe::calcWater() |
| 42 { | 33 { |
| 43 double liters = 0; | 34 double liters = 0; |
| 44 double calcium = 0; | 35 double calcium = 0; |
| 45 double magnesium = 0; | 36 double magnesium = 0; |
| 55 /* | 46 /* |
| 56 * If there is a dilute water source, mix the waters. | 47 * If there is a dilute water source, mix the waters. |
| 57 */ | 48 */ |
| 58 if (recipe->w2_name != "") { | 49 if (recipe->w2_name != "") { |
| 59 liters = recipe->w1_amount + recipe->w2_amount; | 50 liters = recipe->w1_amount + recipe->w2_amount; |
| 60 calcium = mix(recipe->w1_amount, recipe->w2_amount, recipe->w1_calcium, recipe->w2_calcium); | 51 calcium = Utils::mix(recipe->w1_amount, recipe->w2_amount, recipe->w1_calcium, recipe->w2_calcium); |
| 61 magnesium = mix(recipe->w1_amount, recipe->w2_amount, recipe->w1_magnesium, recipe->w2_magnesium); | 52 magnesium = Utils::mix(recipe->w1_amount, recipe->w2_amount, recipe->w1_magnesium, recipe->w2_magnesium); |
| 62 sodium = mix(recipe->w1_amount, recipe->w2_amount, recipe->w1_sodium, recipe->w2_sodium); | 53 sodium = Utils::mix(recipe->w1_amount, recipe->w2_amount, recipe->w1_sodium, recipe->w2_sodium); |
| 63 chloride = mix(recipe->w1_amount, recipe->w2_amount, recipe->w1_chloride, recipe->w2_chloride); | 54 chloride = Utils::mix(recipe->w1_amount, recipe->w2_amount, recipe->w1_chloride, recipe->w2_chloride); |
| 64 sulfate = mix(recipe->w1_amount, recipe->w2_amount, recipe->w1_sulfate, recipe->w2_sulfate); | 55 sulfate = Utils::mix(recipe->w1_amount, recipe->w2_amount, recipe->w1_sulfate, recipe->w2_sulfate); |
| 65 total_alkalinity = mix(recipe->w1_amount, recipe->w2_amount, recipe->w1_total_alkalinity, recipe->w2_total_alkalinity); | 56 total_alkalinity = Utils::mix(recipe->w1_amount, recipe->w2_amount, recipe->w1_total_alkalinity, recipe->w2_total_alkalinity); |
| 66 ph = -log10(((pow(10, -recipe->w1_ph) * recipe->w1_amount) + (pow(10, -recipe->w2_ph) * recipe->w2_amount)) / liters); | 57 ph = -log10(((pow(10, -recipe->w1_ph) * recipe->w1_amount) + (pow(10, -recipe->w2_ph) * recipe->w2_amount)) / liters); |
| 67 } else { | 58 } else { |
| 68 liters = recipe->w1_amount; | 59 liters = recipe->w1_amount; |
| 69 calcium = recipe->w1_calcium; | 60 calcium = recipe->w1_calcium; |
| 70 magnesium = recipe->w1_magnesium; | 61 magnesium = recipe->w1_magnesium; |
