Differential D15690 Diff 42190 src/calculator/concCalculator.cpp

Changeset View

Standalone View

View Options

src/calculator/concCalculator.cpp

Show First 20 Lines • Show All 282 Lines • ▼ Show 20 Line(s)278{
283 switch (type) { 283​ switch (type) {
284 case 0: //molarity specified 284​ case 0: //molarity specified
285 // number of moles = volume * concentration 285​ // number of moles = volume * concentration
286 numMoles = volumeSolvent() * m_concentration; 286​ numMoles = volumeSolvent() * m_concentration;
287 break; 287​ break;
288 case 1: // cannot be calculated (insufficient data) 288​ case 1: // cannot be calculated (insufficient data)
289 error(INSUFFICIENT_DATA_MOLE); 289​ error(INSUFFICIENT_DATA_MOLE);
290 return; 290​ return;
291 break; 291​
pinoUnsubmitted
Not Done

unrelated change

pino: unrelated change
292 case 2: // molality specified 292​ case 2: // molality specified
293 numMoles = massSolvent() / 1000.0 * m_concentration; 293​ numMoles = massSolvent() / 1000.0 * m_concentration;
294 break; 294​ break;
295 case 3: // cannot be calculated (insufficient data) 295​ case 3: // cannot be calculated (insufficient data)
296 case 4: 296​ case 4:
297 error(INSUFFICIENT_DATA_MOLE); 297​ error(INSUFFICIENT_DATA_MOLE);
298 return; 298​ return;
299 break; 299​
pinoUnsubmitted
Not Done

unrelated change

pino: unrelated change
300 case 5: // mole fraction specified 300​ case 5: // mole fraction specified
301 numMoles = m_concentration / (100.0 - m_concentration) * molesSolvent(); 301​ numMoles = m_concentration / (100.0 - m_concentration) * molesSolvent();
302 break; 302​ break;
303 } 303​ }
304 304​
305 if (type2 == 2) { // amount of solute is specified in moles, cannot calculate 305​ if (type2 == 2) { // amount of solute is specified in moles, cannot calculate
306 error(INSUFFICIENT_DATA_MOLES); 306​ error(INSUFFICIENT_DATA_MOLES);
307 return; 307​ return;
Show All 15 Lines320{
323 int type2 = ui.amtSltType->currentIndex(); 323​ int type2 = ui.amtSltType->currentIndex();
324 324​
325 double numEqts; 325​ double numEqts;
326 switch (type) { 326​ switch (type) {
327 // Normality required 327​ // Normality required
328 case 0: // molarity not sufficient 328​ case 0: // molarity not sufficient
329 error(INSUFFICIENT_DATA_EQT); 329​ error(INSUFFICIENT_DATA_EQT);
330 return; 330​ return;
331 break; 331​
pinoUnsubmitted
Not Done

unrelated change

pino: unrelated change
332 case 1: // normality specified 332​ case 1: // normality specified
333 numEqts = volumeSolvent() * m_concentration; 333​ numEqts = volumeSolvent() * m_concentration;
334 break; 334​ break;
335 case 2: 335​ case 2:
336 case 3: 336​ case 3:
337 case 4: 337​ case 4:
338 case 5: 338​ case 5:
339 error(INSUFFICIENT_DATA_EQT); 339​ error(INSUFFICIENT_DATA_EQT);
340 return; 340​ return;
341 break; 341​
pinoUnsubmitted
Not Done

unrelated change

pino: unrelated change
342 } 342​ }
343 343​
344 if (type2 == 2) { // Amount of solute specified in moles, cannot calculate 344​ if (type2 == 2) { // Amount of solute specified in moles, cannot calculate
345 error(INSUFFICIENT_DATA_MOLES); 345​ error(INSUFFICIENT_DATA_MOLES);
346 } else { 346​ } else {
347 if (numEqts == 0.0) { 347​ if (numEqts == 0.0) {
348 error(EQTS_ZERO); 348​ error(EQTS_ZERO);
349 return; 349​ return;
Show All 13 Lines359{
363 double numMoles; 363​ double numMoles;
364 switch (type) { 364​ switch (type) {
365 case 0: // molarity specified 365​ case 0: // molarity specified
366 case 1: // normality specified 366​ case 1: // normality specified
367 case 2: // molality specified 367​ case 2: // molality specified
368 case 3: // mass fraction specified 368​ case 3: // mass fraction specified
369 case 4: // volume fraction specified 369​ case 4: // volume fraction specified
370 error(INSUFFICIENT_DATA_SOLVENT); 370​ error(INSUFFICIENT_DATA_SOLVENT);
371 return; 371​ return; // cannot be calculated (insufficient data)
372 break; // cannot be calculated (insufficient data) 372​
pinoUnsubmitted
Not Done

unrelated changes

pino: unrelated changes
373 case 5: // mole fraction specified 373​ case 5: // mole fraction specified
374 numMoles = (100.0 - m_concentration) / m_concentration * molesSolute(); 374​ numMoles = (100.0 - m_concentration) / m_concentration * molesSolute();
375 break; 375​ break;
376 } 376​ }
377 377​
378 if (type2 == 2) { // amount specified in moles 378​ if (type2 == 2) { // amount specified in moles
379 error(INSUFFICIENT_DATA_MOLES); 379​ error(INSUFFICIENT_DATA_MOLES);
380 } else { 380​ } else {
▲ Show 20 Lines • Show All 237 Lines • ▼ Show 20 Line(s)614{
618 case 0: 618​ case 0:
619 volume = massSolute() / densitySolute(); 619​ volume = massSolute() / densitySolute();
620 break; 620​ break;
621 case 1: 621​ case 1:
622 volume = m_amtSolute.convertTo(KUnitConversion::Liter).number(); 622​ volume = m_amtSolute.convertTo(KUnitConversion::Liter).number();
623 break; 623​ break;
624 case 2: 624​ case 2:
625 volume = massSolute() / densitySolute(); 625​ volume = massSolute() / densitySolute();
626​ break;
tcanabravaUnsubmitted
Not Done

This break seems meeded

tcanabrava: This break seems meeded
pinoUnsubmitted
Not Done

good, but unrelated change

pino: good, but unrelated change
626 default: 627​ default:
627 volume = 0; 628​ volume = 0;
628 break; 629​ break;
629 } 630​ }
630 return volume; 631​ return volume;
631} 632​}
632 633​
633double concCalculator::molesSolute() 634​double concCalculator::molesSolute()
▲ Show 20 Lines • Show All 369 Lines • Show Last 20 Lines