1 files changed, 19 insertions, 5 deletions

diff --git a/noncore/tools/calculator/calculatorimpl.cpp b/noncore/tools/calculator/calculatorimpl.cpp
index 2f7d7ce..1b93c7f 100644
--- a/noncore/tools/calculator/calculatorimpl.cpp
+++ b/noncore/tools/calculator/calculatorimpl.cpp
@@ -19,4 +19,9 @@
 **********************************************************************/
 
+/*
+ * 01/14/2002 Charles-Edouard Ruault <ce@ruault.com>
+ * Added support for Temperature conversions.
+ */
+
 #include "calculatorimpl.h"
 
@@ -135,5 +140,6 @@ CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name,
 
         entry_list = new double[conversion_mode_count*func_button_count];
-
+                preoffset_list = new double[conversion_mode_count*func_button_count];
+                postoffset_list = new double[conversion_mode_count*func_button_count];
         myfile.close();
         myfile.open( IO_Translate | IO_ReadOnly );
@@ -154,4 +160,10 @@ CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name,
                                 line2.remove(0,6);
                                 entry_list[x] = line2.toDouble();
+                                                                line2 = ts2.readLine();
+                                line2.remove(0,7);
+                                preoffset_list[x] = line2.toDouble();
+                                                                line2 = ts2.readLine();
+                                line2.remove(0,8);
+                                postoffset_list[x] = line2.toDouble();
                                 x++;
                             }
@@ -221,14 +233,16 @@ void CalculatorImpl::do_convert(int button) {
         if ( last_conversion > -1 ) {
             if( state == sNewNumber ){
-                acc = num
+                          acc = (num+ preoffset_list[(current_mode - pre_conv_modes_count) * func_button_count + last_conversion])
                     / (entry_list[(current_mode - pre_conv_modes_count) * func_button_count + last_conversion])
-                    * (entry_list[(current_mode - pre_conv_modes_count) * func_button_count + button]) ;
+                    * (entry_list[(current_mode - pre_conv_modes_count) * func_button_count + button]) 
+                                +postoffset_list[(current_mode - pre_conv_modes_count) * func_button_count + button];
                 num = acc;
                 LCD->display( acc );
             } else {
                 state = sNewNumber;
-                num = num
+                num = (num+ preoffset_list[(current_mode - pre_conv_modes_count) * func_button_count + last_conversion])
                     / (entry_list[(current_mode - pre_conv_modes_count) * func_button_count + last_conversion])
-                    * (entry_list[(current_mode - pre_conv_modes_count) * func_button_count + button]) ;
+                    * (entry_list[(current_mode - pre_conv_modes_count) * func_button_count + button]) 
+                                  + postoffset_list[(current_mode - pre_conv_modes_count) * func_button_count + button];;
                 LCD->display( num );
                 acc = num;