@@ -208,31 +208,48 @@ void CMy75alcoholDlg::OnBnClickedButton2()
208
208
if (check != 3 ) {
209
209
MessageBox (__T (" 需要在四个框中填入三个数字" ));
210
210
}
211
- else if (Ac < Bc) {
211
+ else if (Ac < Bc && Ac != 0 ) {
212
212
MessageBox (__T (" 浓酒精浓度小于稀酒精" ));
213
213
Aconcentration = __T (" 95" );
214
214
Bconcentration = __T (" 75" );
215
215
}
216
216
else {
217
- if (Ac == 0 ) {// 计算浓酒精浓度
217
+ if (Ac == 0 && Av ) {// 计算浓酒精浓度
218
218
unsigned int Acanswer = 1.0 * (1ll * Bc * Bv) / Av;
219
219
Aconcentration = changeuinttocstring (Acanswer);
220
+ double danswer= 1.0 * (1ll * Bc * Bv) / Av;
221
+ CString sanswer=__T (" " );
222
+ sanswer.Format (__T (" 浓酒精浓度为%.4f" ),danswer);
223
+ MessageBox (sanswer, __T (" 计算结果" ));
220
224
}
221
- else if (Av == 0 ) {// 计算浓酒精容积
225
+ else if (Av == 0 && Ac ) {// 计算浓酒精容积
222
226
unsigned int Avanswer = 1.0 * (1ll * Bc * Bv) / Ac;
223
227
Avolume = changeuinttocstring (Avanswer);
228
+ double danswer = 1.0 * (1ll * Bc * Bv) / Ac;
224
229
addwater = changeuinttocstring (Bv-Avanswer);
230
+ CString sanswer=__T (" " );
231
+ sanswer.Format (__T (" 浓酒精量为%.4fmL,加水量为%.4fmL" ), danswer, Bv-danswer);
232
+ MessageBox (sanswer, __T (" 计算结果" ));
225
233
}
226
- else if (Bc == 0 ) {// 计算稀酒精浓度
234
+ else if (Bc == 0 && Bv ) {// 计算稀酒精浓度
227
235
unsigned int Bcanswer = 1.0 * (1ll * Ac * Av) / Bv;
228
236
Bconcentration = changeuinttocstring (Bcanswer);
237
+ double danswer = 1.0 * (1ll * Ac * Av) / Bv;
238
+ CString sanswer = __T (" " );
239
+ sanswer.Format (__T (" 稀酒精浓度为%.4f" ), danswer);
240
+ MessageBox (sanswer, __T (" 计算结果" ));
229
241
}
230
- else if (Bv == 0 ) {// 计算稀酒精容积
242
+ else if (Bv == 0 && Bc ) {// 计算稀酒精容积
231
243
unsigned int Bvanswer = 1.0 * (1ll * Ac * Av) / Bc;
232
244
Bvolume = changeuinttocstring (Bvanswer);
245
+ double danswer = 1.0 * (1ll * Ac * Av) / Bc;
246
+ CString sanswer=__T (" " );
247
+ sanswer.Format (__T (" 稀酒精量为%.4fmL,加水量为%.4fmL" ), danswer, danswer - Av);
248
+ MessageBox (sanswer, __T (" 计算结果" ));
233
249
addwater = changeuinttocstring (Bvanswer - Av);
234
250
}
235
251
}
252
+
236
253
UpdateData (FALSE );
237
254
}
238
255
0 commit comments