2 files changed, 26 insertions, 11 deletions

diff --git a/noncore/apps/opie-bartender/bac.cpp b/noncore/apps/opie-bartender/bac.cpp
index c97a253..2e74029 100644
--- a/noncore/apps/opie-bartender/bac.cpp
+++ b/noncore/apps/opie-bartender/bac.cpp
@@ -36,7 +36,7 @@ BacDialog::BacDialog( QWidget* parent,  const char* name, bool modal, WFlags fl
     Layout1->addWidget( NumberSpinBox );
 
     TextLabel1 = new QLabel(this, "TextLabel1" );
-    TextLabel1->setText( tr( "Number of Drinks Consumed" ) );
+        TextLabel1->setText( tr( "# Drinks Consumed" ) );
     Layout1->addWidget( TextLabel1 );
     Layout7->addLayout( Layout1 );
 
@@ -53,6 +53,15 @@ BacDialog::BacDialog( QWidget* parent,  const char* name, bool modal, WFlags fl
     Layout2->addWidget( TextLabel2 );
     Layout7->addLayout( Layout2 );
 
+        weightUnitsCombo =new QComboBox( FALSE, this, "unitComboBox" );
+        weightUnitsCombo->insertItem( tr( "Kilos" ) );
+        weightUnitsCombo->insertItem( tr( "Pounds" ) );
+        Layout2->addWidget( weightUnitsCombo );
+
+        weightUnitsLabel = new QLabel(this, "unitsTextLabel" );
+        weightUnitsLabel->setText( tr( "Units" ) );
+        Layout2->addWidget( weightUnitsLabel );
+
     Layout3 = new QHBoxLayout; 
     Layout3->setSpacing( 6 );
     Layout3->setMargin( 0 );
@@ -114,17 +123,18 @@ BacDialog::BacDialog( QWidget* parent,  const char* name, bool modal, WFlags fl
     palette.setColor(QPalette::Normal, QColorGroup::Dark, Qt::darkGreen);
     LCDNumber1->setPalette(palette);
 
-
     Layout7->addWidget( LCDNumber1 );
-    
-    
+        NumberSpinBox->setFocus();
 }
 
-BacDialog::~BacDialog() {
-}
+BacDialog::~BacDialog()
+{}
+
+void BacDialog::calculate()
+{
 
-void BacDialog::calculate() {
     float weight,genderDiff, bac, typeDrink=0, drinkOz=0, bodyWater, milliliters, oz, gram, gramsMil, alc, metab, bac1;
+        float weightunitDifference, massunitdiff;
     QString estBac;
 
     if( GenderComboBox->currentItem()==0)
@@ -149,7 +159,12 @@ void BacDialog::calculate() {
       }
           break;
     };
-    weight = WeightSpinBox->value() / 2.2046; // in kilograms
+
+        if( weightUnitsCombo->currentItem() == 0 ) {
+                weight = WeightSpinBox->value(); // kilos
+        } else {
+                weight = WeightSpinBox->value() / 2.2046; // convert to kilograms
+        }
     bodyWater = weight * genderDiff;
     milliliters = bodyWater * 1000;
     oz = 23.36/milliliters;
@@ -160,8 +175,6 @@ void BacDialog::calculate() {
     bac1 = gramsMil * alc;
     bac = bac1 - metab;
     
-
-    
 //       weightDrink= (nDrinks * .79) / (weight * genderDiff*1000);
 // (ounces * percent * 0.075 / weight) - (hours * 0.015);
 //       bac = (((weightDrink * .806) * 100) * .54);// - (time * .012);  // assuming beer of 4.5%
diff --git a/noncore/apps/opie-bartender/bac.h b/noncore/apps/opie-bartender/bac.h
index 9245c96..43c7035 100644
--- a/noncore/apps/opie-bartender/bac.h
+++ b/noncore/apps/opie-bartender/bac.h
@@ -42,7 +42,8 @@ public:
     QLabel* TextLabel1_2;
     QPushButton* PushButton1;
     QLCDNumber* LCDNumber1;
-
+    QComboBox *weightUnitsCombo;
+    QLabel *weightUnitsLabel;
 protected:
     QVBoxLayout* Layout7;
     QHBoxLayout* Layout1;
@@ -50,6 +51,7 @@ protected:
     QHBoxLayout* Layout3;
     QHBoxLayout* Layout4;
     QHBoxLayout* Layout6;
+
 protected slots:
     void calculate();