diff options
author | Anton Lundin <glance@acc.umu.se> | 2013-11-14 19:55:33 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2013-11-15 08:58:35 +0900 |
commit | bc6a1a4c53ceaf5797c8879ec3e157fe745a7b8d (patch) | |
tree | c553e226ad1c8e18e45f5f7bf7a4bbd781b95938 /qt-ui/diveplanner.cpp | |
parent | 2d8cd443702c5155bda12b711b9ab5d0f99104da (diff) | |
download | subsurface-bc6a1a4c53ceaf5797c8879ec3e157fe745a7b8d.tar.gz |
Planner: use a QSpinBox for GFLow/GFHigh
Switch to using a QSpinBox instead of a QLineEdit. This makes it a bit
more intuitive and now you can see how the deco plan changes based on
the GF's.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/diveplanner.cpp')
-rw-r--r-- | qt-ui/diveplanner.cpp | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 49d89da1f..b5d7f5d90 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -929,9 +929,8 @@ DivePlannerWidget::DivePlannerWidget(QWidget* parent, Qt::WindowFlags f): QWidge connect(ui.ATMPressure, SIGNAL(textChanged(QString)), this, SLOT(atmPressureChanged(QString))); connect(ui.bottomSAC, SIGNAL(textChanged(QString)), this, SLOT(bottomSacChanged(QString))); connect(ui.decoStopSAC, SIGNAL(textChanged(QString)), this, SLOT(decoSacChanged(QString))); - connect(ui.highGF, SIGNAL(textChanged(QString)), this, SLOT(gfhighChanged(QString))); - connect(ui.lowGF, SIGNAL(textChanged(QString)), this, SLOT(gflowChanged(QString))); - connect(ui.highGF, SIGNAL(textChanged(QString)), this, SLOT(gfhighChanged(QString))); + connect(ui.gfhigh, SIGNAL(valueChanged(int)), plannerModel, SLOT(setGFHigh(int))); + connect(ui.gflow, SIGNAL(valueChanged(int)), plannerModel, SLOT(setGFLow(int))); connect(ui.lastStop, SIGNAL(toggled(bool)), this, SLOT(lastStopChanged(bool))); // Creating the plan @@ -946,8 +945,8 @@ DivePlannerWidget::DivePlannerWidget(QWidget* parent, Qt::WindowFlags f): QWidge ui.ATMPressure->setText( "1013" ); ui.bottomSAC->setText("20"); ui.decoStopSAC->setText("17"); - ui.lowGF->setText("30"); - ui.highGF->setText("75"); + ui.gflow->setValue(30); + ui.gfhigh->setValue(75); setMinimumWidth(0); setMinimumHeight(0); @@ -978,16 +977,6 @@ void DivePlannerWidget::decoSacChanged(const QString& decosac) plannerModel->setDecoSac(decosac.toInt()); } -void DivePlannerWidget::gfhighChanged(const QString& gfhigh) -{ - plannerModel->setGFHigh(gfhigh.toShort()); -} - -void DivePlannerWidget::gflowChanged(const QString& gflow) -{ - plannerModel->setGFLow(gflow.toShort()); -} - void DivePlannerWidget::lastStopChanged(bool checked) { plannerModel->setLastStop6m(checked); @@ -1104,13 +1093,13 @@ void DivePlannerPointsModel::setDecoSac(int sac) emit dataChanged(createIndex(0, 0), createIndex(rowCount()-1, COLUMNS-1)); } -void DivePlannerPointsModel::setGFHigh(short int gfhigh) +void DivePlannerPointsModel::setGFHigh(const int gfhigh) { diveplan.gfhigh = gfhigh; emit dataChanged(createIndex(0, 0), createIndex(rowCount()-1, COLUMNS-1)); } -void DivePlannerPointsModel::setGFLow(short int ghflow) +void DivePlannerPointsModel::setGFLow(const int ghflow) { diveplan.gflow = ghflow; emit dataChanged(createIndex(0, 0), createIndex(rowCount()-1, COLUMNS-1)); |