mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Planner: use a QSpinBox for GFLow/GFHigh

Browse source 
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>
This commit is contained in:
Anton Lundin 2013-11-14 19:55:33 +01:00 • committed by Dirk Hohndel
parent 2d8cd44370
commit bc6a1a4c53
3 changed files with 29 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

23
qt-ui/diveplanner.cpp
View file

@ -929,9 +929,8 @@ DivePlannerWidget::DivePlannerWidget(QWidget* parent, Qt::WindowFlags f): QWidge
connect(ui.ATMPressure, SIGNAL(textChanged(QString)), this, SLOT(atmPressureChanged(QString))); connect(ui.ATMPressure, SIGNAL(textChanged(QString)), this, SLOT(atmPressureChanged(QString)));
connect(ui.bottomSAC, SIGNAL(textChanged(QString)), this, SLOT(bottomSacChanged(QString))); connect(ui.bottomSAC, SIGNAL(textChanged(QString)), this, SLOT(bottomSacChanged(QString)));
connect(ui.decoStopSAC, SIGNAL(textChanged(QString)), this, SLOT(decoSacChanged(QString))); connect(ui.decoStopSAC, SIGNAL(textChanged(QString)), this, SLOT(decoSacChanged(QString)));
connect(ui.highGF, SIGNAL(textChanged(QString)), this, SLOT(gfhighChanged(QString))); connect(ui.gfhigh, SIGNAL(valueChanged(int)), plannerModel, SLOT(setGFHigh(int)));
connect(ui.lowGF, SIGNAL(textChanged(QString)), this, SLOT(gflowChanged(QString))); connect(ui.gflow, SIGNAL(valueChanged(int)), plannerModel, SLOT(setGFLow(int)));
connect(ui.highGF, SIGNAL(textChanged(QString)), this, SLOT(gfhighChanged(QString)));
connect(ui.lastStop, SIGNAL(toggled(bool)), this, SLOT(lastStopChanged(bool))); connect(ui.lastStop, SIGNAL(toggled(bool)), this, SLOT(lastStopChanged(bool)));
// Creating the plan // Creating the plan
@ -946,8 +945,8 @@ DivePlannerWidget::DivePlannerWidget(QWidget* parent, Qt::WindowFlags f): QWidge
ui.ATMPressure->setText( "1013" ); ui.ATMPressure->setText( "1013" );
ui.bottomSAC->setText("20"); ui.bottomSAC->setText("20");
ui.decoStopSAC->setText("17"); ui.decoStopSAC->setText("17");
ui.lowGF->setText("30"); ui.gflow->setValue(30);
ui.highGF->setText("75"); ui.gfhigh->setValue(75);
setMinimumWidth(0); setMinimumWidth(0);
setMinimumHeight(0); setMinimumHeight(0);
@ -978,16 +977,6 @@ void DivePlannerWidget::decoSacChanged(const QString& decosac)
plannerModel->setDecoSac(decosac.toInt()); 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) void DivePlannerWidget::lastStopChanged(bool checked)
{ {
plannerModel->setLastStop6m(checked); plannerModel->setLastStop6m(checked);
@ -1104,13 +1093,13 @@ void DivePlannerPointsModel::setDecoSac(int sac)
emit dataChanged(createIndex(0, 0), createIndex(rowCount()-1, COLUMNS-1)); 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; diveplan.gfhigh = gfhigh;
emit dataChanged(createIndex(0, 0), createIndex(rowCount()-1, COLUMNS-1)); 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; diveplan.gflow = ghflow;
emit dataChanged(createIndex(0, 0), createIndex(rowCount()-1, COLUMNS-1)); emit dataChanged(createIndex(0, 0), createIndex(rowCount()-1, COLUMNS-1));

6
qt-ui/diveplanner.h
View file

@ -51,8 +51,8 @@ public:
public slots: public slots:
int addStop(int meters = 0, int minutes = 0, int o2 = 0, int he = 0, int ccpoint = 0 ); int addStop(int meters = 0, int minutes = 0, int o2 = 0, int he = 0, int ccpoint = 0 );
void addCylinder_clicked(); void addCylinder_clicked();
void setGFHigh(short gfhigh); void setGFHigh(const int gfhigh);
void setGFLow(short ghflow); void setGFLow(const int ghflow);
void setSurfacePressure(int pressure); void setSurfacePressure(int pressure);
void setBottomSac(int sac); void setBottomSac(int sac);
void setDecoSac(int sac); void setDecoSac(int sac);
@ -227,8 +227,6 @@ public slots:
void atmPressureChanged(const QString& pressure); void atmPressureChanged(const QString& pressure);
void bottomSacChanged(const QString& bottomSac); void bottomSacChanged(const QString& bottomSac);
void decoSacChanged(const QString& decosac); void decoSacChanged(const QString& decosac);
void gflowChanged(const QString& gflow);
void gfhighChanged(const QString& gfhigh);
void lastStopChanged(bool checked); void lastStopChanged(bool checked);
private: private:
Ui::DivePlanner ui; Ui::DivePlanner ui;

25
qt-ui/diveplanner.ui
View file

@ -78,7 +78,7 @@
<item row="4" column="1"> <item row="4" column="1">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>High GF</string> <string>GFHigh</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -98,15 +98,32 @@
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>Low GF</string> <string>GFLow</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="5" column="0">
<widget class="QLineEdit" name="lowGF"/> <widget class="QSpinBox" name="gflow">
<property name="suffix">
<string>%</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>100</number>
</property>
</widget>
</item> </item>
<item row="5" column="1"> <item row="5" column="1">
<widget class="QLineEdit" name="highGF"/> <widget class="QSpinBox" name="gfhigh">
<property name="suffix">
<string>%</string>
</property>
<property name="minimum">
<number>1</number>
</property>
</widget>
</item> </item>
<item row="6" column="0"> <item row="6" column="0">
<widget class="QCheckBox" name="lastStop"> <widget class="QCheckBox" name="lastStop">