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

Enable the CC SetPoint on the planner, also input bug fix.

Browse source 
Enabled the CC SetPoint settings on the table, changing
it will automatically reflect the canvas. Also fixed a bug
that prevented the 'Air' handling on the diveplanner
table to show the list of options using arrow up and down.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
This commit is contained in:
Tomaz Canabrava 2013-09-09 06:48:03 -03:00
parent c029cb0a07
commit 64864fea9c
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
qt-ui/diveplanner.cpp
View file

@ -888,7 +888,7 @@ QVariant DivePlannerPointsModel::data(const QModelIndex& index, int role) const
if(role == Qt::DisplayRole){ if(role == Qt::DisplayRole){
divedatapoint p = divepoints.at(index.row()); divedatapoint p = divepoints.at(index.row());
switch(index.column()){ switch(index.column()){
case CCSETPOINT: return 0; case CCSETPOINT: return p.po2;
case DEPTH: return p.depth / 1000; case DEPTH: return p.depth / 1000;
case DURATION: return p.time / 60; case DURATION: return p.time / 60;
case GAS: return strForAir(p); case GAS: return strForAir(p);
@ -912,7 +912,12 @@ bool DivePlannerPointsModel::setData(const QModelIndex& index, const QVariant& v
switch(index.column()){ switch(index.column()){
case DEPTH: p.depth = value.toInt() * 1000; break; case DEPTH: p.depth = value.toInt() * 1000; break;
case DURATION: p.time = value.toInt() * 60; break; case DURATION: p.time = value.toInt() * 60; break;
case CCSETPOINT: /* what do I do here? */ case CCSETPOINT:{
int po2 = 0;
QByteArray gasv = value.toByteArray();
if (validate_po2(gasv.data(), &po2))
p.po2 = po2;
} break;
case GAS: { case GAS: {
int o2 = 0; int o2 = 0;
int he = 0; int he = 0;

2
qt-ui/modeldelegates.cpp
View file

@ -108,7 +108,7 @@ void ComboBoxDelegate::testActivation(const QString& s)
bool ComboBoxDelegate::eventFilter(QObject* object, QEvent* event) bool ComboBoxDelegate::eventFilter(QObject* object, QEvent* event)
{ {
// Reacts on Key_UP and Key_DOWN to show the QComboBox - list of choices. // Reacts on Key_UP and Key_DOWN to show the QComboBox - list of choices.
if (event->type() == QEvent::KeyPress){ if (event->type() == QEvent::KeyPress || event->type() == QEvent::ShortcutOverride){
if (object == currCombo.comboEditor){ // the 'LineEdit' part if (object == currCombo.comboEditor){ // the 'LineEdit' part
QKeyEvent *ev = static_cast<QKeyEvent*>(event); QKeyEvent *ev = static_cast<QKeyEvent*>(event);
if(ev->key() == Qt::Key_Up || ev->key() == Qt::Key_Down){ if(ev->key() == Qt::Key_Up || ev->key() == Qt::Key_Down){