mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 13:10:19 +00:00
c7ea7426f7
Previously gps information was always overwritten, unless the user had
modified it in the current editing session. This causes problem with
some use cases, like when coordinates are provided before the location
name by the companion app.
Now gps information is only overwritten when it is:
- Empty
- Auto-completed in the current editing session. (When the user hits
accept it is considered hand-edited.)
Signed-off-by: Michael Andreen <harv@ruin.nu>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
105 lines
2.6 KiB
C++
105 lines
2.6 KiB
C++
/*
|
|
* maintab.h
|
|
*
|
|
* header file for the main tab of Subsurface
|
|
*
|
|
*/
|
|
#ifndef MAINTAB_H
|
|
#define MAINTAB_H
|
|
|
|
#include <QTabWidget>
|
|
#include <QDialog>
|
|
#include <QMap>
|
|
|
|
#include "models.h"
|
|
#include "ui_maintab.h"
|
|
|
|
class QCompleter;
|
|
struct dive;
|
|
|
|
struct NotesBackup{
|
|
QString airtemp;
|
|
QString watertemp;
|
|
QString datetime;
|
|
QString location;
|
|
QString coordinates;
|
|
degrees_t latitude;
|
|
degrees_t longitude;
|
|
QString notes;
|
|
QString buddy;
|
|
QString suit;
|
|
int rating;
|
|
int visibility;
|
|
QString divemaster;
|
|
QString tags;
|
|
cylinder_t cylinders[MAX_CYLINDERS];
|
|
weightsystem_t weightsystem[MAX_WEIGHTSYSTEMS ];
|
|
};
|
|
|
|
struct Completers{
|
|
QCompleter *location;
|
|
QCompleter *divemaster;
|
|
QCompleter *buddy;
|
|
QCompleter *suit;
|
|
QCompleter *tags;
|
|
};
|
|
|
|
class MainTab : public QTabWidget
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
enum EditMode { NONE, DIVE, TRIP, ADD, MANUALLY_ADDED_DIVE };
|
|
|
|
MainTab(QWidget *parent);
|
|
void clearStats();
|
|
void clearInfo();
|
|
void clearEquipment();
|
|
void reload();
|
|
bool eventFilter(QObject* , QEvent*);
|
|
void initialUiSetup();
|
|
void equipmentPlusUpdate();
|
|
bool isEditing();
|
|
public slots:
|
|
void addCylinder_clicked();
|
|
void addWeight_clicked();
|
|
void updateDiveInfo(int dive);
|
|
void acceptChanges();
|
|
void rejectChanges();
|
|
void on_location_textChanged(const QString& text);
|
|
void on_coordinates_textChanged(const QString& text);
|
|
void on_divemaster_textChanged(const QString& text);
|
|
void on_buddy_textChanged(const QString& text);
|
|
void on_suit_textChanged(const QString& text);
|
|
void on_notes_textChanged();
|
|
void on_airtemp_textChanged(const QString& text);
|
|
void on_watertemp_textChanged(const QString& text);
|
|
void on_dateTimeEdit_dateTimeChanged(const QDateTime& datetime);
|
|
void on_rating_valueChanged(int value);
|
|
void on_visibility_valueChanged(int value);
|
|
void on_tagWidget_textChanged();
|
|
void editCylinderWidget(const QModelIndex& index);
|
|
void editWeightWidget(const QModelIndex& index);
|
|
void addDiveStarted();
|
|
void enableEdition(EditMode newEditMode = NONE);
|
|
|
|
private:
|
|
EditMode editMode;
|
|
Ui::MainTab ui;
|
|
WeightModel *weightModel;
|
|
CylindersModel *cylindersModel;
|
|
QMap<dive*, NotesBackup> notesBackup;
|
|
|
|
/* since the multi-edition of the equipment is fairly more
|
|
* complex than a single item, because it involves a Qt
|
|
* Model to edit things, we are copying the first selected
|
|
* dive to this structure, making all editions there,
|
|
* then applying the changes on the other dives.*/
|
|
struct dive multiEditEquipmentPlaceholder;
|
|
Completers completers;
|
|
void resetPallete();
|
|
void saveTags();
|
|
QString printGPSCoords(int lat, int lon);
|
|
void updateGpsCoordinates(const struct dive *dive);
|
|
};
|
|
|
|
#endif
|