Diffstat (limited to 'noncore/apps/oxygen/calcdlgui.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/oxygen/calcdlgui.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/apps/oxygen/calcdlgui.cpp b/noncore/apps/oxygen/calcdlgui.cpp index ca3a9f2..f8dfde5 100644 --- a/noncore/apps/oxygen/calcdlgui.cpp +++ b/noncore/apps/oxygen/calcdlgui.cpp | |||
@@ -24,41 +24,41 @@ | |||
24 | 24 | ||
25 | calcDlgUI::calcDlgUI() : CalcDlg() | 25 | calcDlgUI::calcDlgUI() : CalcDlg() |
26 | { | 26 | { |
27 | kmolcalc = new KMolCalc; | 27 | kmolcalc = new KMolCalc; |
28 | connect( calculate, SIGNAL( clicked() ), this, SLOT( calc() ) ); | 28 | connect( calculate, SIGNAL( clicked() ), this, SLOT( calc() ) ); |
29 | connect( clear_fields, SIGNAL( clicked() ), this, SLOT( clear() ) ); | 29 | connect( clear_fields, SIGNAL( clicked() ), this, SLOT( clear() ) ); |
30 | result->setReadOnly( true ); | 30 | result->setReadOnly( true ); |
31 | } | 31 | } |
32 | 32 | ||
33 | void calcDlgUI::calc() | 33 | void calcDlgUI::calc() |
34 | { | 34 | { |
35 | QString compound( formula->text() ); | 35 | QString compound( formula->text() ); |
36 | if ( compound.isEmpty() ) { | 36 | if ( compound.isEmpty() ) { |
37 | clear(); | 37 | clear(); |
38 | return; | 38 | return; |
39 | } | 39 | } |
40 | QString errors( kmolcalc->readFormula( compound ) ); | 40 | QString errors( kmolcalc->readFormula( compound ) ); |
41 | QString mw, ea; | 41 | QString mw, ea; |
42 | double weight = kmolcalc->getWeight(); | 42 | double weight = kmolcalc->getWeight(); |
43 | if ( errors == "OK" ) { | 43 | if ( errors == "OK" ) { |
44 | mw.setNum( weight ); | 44 | mw.setNum( weight ); |
45 | ea = kmolcalc->getEmpFormula() + " :\n" + kmolcalc->getEA(); | 45 | ea = kmolcalc->getEmpFormula() + " :\n" + kmolcalc->getEA(); |
46 | } else { | 46 | } else { |
47 | mw = "???"; | 47 | mw = "???"; |
48 | ea = tr( "ERROR: \n" ) + errors + "\n"; | 48 | ea = tr( "ERROR: \n" ).arg( errors )+ "\n"; |
49 | } | 49 | } |
50 | result->setText( mw ); | 50 | result->setText( mw ); |
51 | anal_display->setText( ea ); | 51 | anal_display->setText( ea ); |
52 | } | 52 | } |
53 | 53 | ||
54 | /** | 54 | /** |
55 | * * Clear all text entry / result fields. | 55 | * * Clear all text entry / result fields. |
56 | * */ | 56 | * */ |
57 | void calcDlgUI::clear() | 57 | void calcDlgUI::clear() |
58 | { | 58 | { |
59 | formula->clear(); | 59 | formula->clear(); |
60 | result->clear(); | 60 | result->clear(); |
61 | anal_display->clear(); | 61 | anal_display->clear(); |
62 | } | 62 | } |
63 | 63 | ||
64 | 64 | ||