mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mobile: save edited cylinders

Browse source 
Save the edited cylinder in the correct slot.
Since the cylinder number and the used cylinder number need not be
the same we first need to test if the cylinder are used.

Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
This commit is contained in:
Jocke 2018-07-16 18:01:56 +02:00 committed by Dirk Hohndel
parent 6b93e5fe27
commit 94428b9a18
3 changed files with 41 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
mobile-widgets/qml/DiveDetailsEdit.qml
View file

@ -70,14 +70,30 @@ Item {
function saveData() {
diveDetailsPage.state = "view" // run the transition
// join cylinder info from separate string into a list.
if (usedCyl[0] != null) {
usedCyl[0] = cylinderBox0.currentText
}
if (usedCyl[1] != null) {
usedCyl[1] = cylinderBox1.currentText
}
if (usedCyl[2] != null) {
usedCyl[2] = cylinderBox2.currentText
}
if (usedCyl[3] != null) {
usedCyl[3] = cylinderBox3.currentText
}
if (usedCyl[4] != null) {
usedCyl[4] = cylinderBox4.currentText
}
// apply the changes to the dive_table
manager.commitChanges(dive_id, detailsEdit.dateText, locationBox.editText, detailsEdit.gpsText, detailsEdit.durationText,
detailsEdit.depthText, detailsEdit.airtempText, detailsEdit.watertempText,
suitBox.currentText != "" ? suitBox.currentText : suitBox.editText, buddyBox.editText,
divemasterBox.currentText != "" ? divemasterBox.currentText : divemasterBox.editText,
detailsEdit.weightText, detailsEdit.notesText, detailsEdit.startpressureText,
detailsEdit.endpressureText, detailsEdit.gasmixText,
cylinderBox.currentText != "" ? cylinderBox.currentText : cylinderBox.editText,
detailsEdit.endpressureText, detailsEdit.gasmixText, usedCyl ,
detailsEdit.rating,
detailsEdit.visibility)
// trigger the profile to be redrawn
@ -97,7 +113,6 @@ Item {
diveDetailsListView.currentItem.modelData.suit = suitBox.currentText
diveDetailsListView.currentItem.modelData.buddy = buddyBox.currentText
diveDetailsListView.currentItem.modelData.divemaster = divemasterBox.currentText
diveDetailsListView.currentItem.modelData.cylinder = cylinderBox.currentText
diveDetailsListView.currentItem.modelData.notes = detailsEdit.notesText
diveDetailsListView.currentItem.modelData.rating = detailsEdit.rating
diveDetailsListView.currentItem.modelData.visibility = detailsEdit.visibility

39
mobile-widgets/qmlmanager.cpp
View file

@ -1004,7 +1004,7 @@ bool QMLManager::checkDepth(DiveObjectHelper *myDive, dive *d, QString depth)
// update the dive and return the notes field, stripped of the HTML junk
void QMLManager::commitChanges(QString diveId, QString date, QString location, QString gps, QString duration, QString depth,
QString airtemp, QString watertemp, QString suit, QString buddy, QString diveMaster, QString weight, QString notes,
QString startpressure, QString endpressure, QString gasmix, QString cylinder, int rating, int visibility)
QString startpressure, QString endpressure, QString gasmix, QStringList usedCylinder, int rating, int visibility)
{
struct dive *d = get_dive_by_uniq_id(diveId.toInt());
@ -1069,26 +1069,31 @@ void QMLManager::commitChanges(QString diveId, QString date, QString location, Q
}
}
// info for first cylinder
if (myDive->getCylinder() != cylinder) {
if (myDive->getCylinder() != usedCylinder) {
diveChanged = true;
unsigned long i;
int size = 0, wp = 0;
for (i = 0; i < MAX_TANK_INFO && tank_info[i].name != NULL; i++) {
if (tank_info[i].name == cylinder ) {
if (tank_info[i].ml > 0){
size = tank_info[i].ml;
wp = tank_info[i].bar * 1000;
} else {
size = (int) (cuft_to_l(tank_info[i].cuft) * 1000 / bar_to_atm(psi_to_bar(tank_info[i].psi)));
wp = psi_to_mbar(tank_info[i].psi);
}
break;
}
int size = 0, wp = 0, j = 0, k = 0;
for (j = 0; k < usedCylinder.length() ; j++) {
if (!is_cylinder_used(d, j))
continue;
for (i = 0; i < MAX_TANK_INFO && tank_info[i].name != NULL; i++) {
if (tank_info[i].name == usedCylinder[k] ) {
if (tank_info[i].ml > 0){
size = tank_info[i].ml;
wp = tank_info[i].bar * 1000;
} else {
size = (int) (cuft_to_l(tank_info[i].cuft) * 1000 / bar_to_atm(psi_to_bar(tank_info[i].psi)));
wp = psi_to_mbar(tank_info[i].psi);
}
break;
}
}
d->cylinder[j].type.description = copy_qstring(usedCylinder[k]);
d->cylinder[j].type.size.mliter = size;
d->cylinder[j].type.workingpressure.mbar = wp;
k++;
}
d->cylinder[0].type.description = copy_qstring(cylinder);
d->cylinder[0].type.size.mliter = size;
d->cylinder[0].type.workingpressure.mbar = wp;
}
if (myDive->suit() != suit) {
diveChanged = true;

2
mobile-widgets/qmlmanager.h
View file

@ -158,7 +158,7 @@ public slots:
QString duration, QString depth, QString airtemp,
QString watertemp, QString suit, QString buddy,
QString diveMaster, QString weight, QString notes, QString startpressure,
QString endpressure, QString gasmix, QString cylinder, int rating, int visibility);
QString endpressure, QString gasmix, QStringList usedCylinder, int rating, int visibility);
void changesNeedSaving();
void openNoCloudRepo();
void saveChangesLocal();