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

Undo: implement undo of dive site location editing

Browse source 
Simply copy the code of note editing. It's a bit more complex,
since we have to parse the Gps coordinates. For consitency,
rename the COORD field to LOCATION (the field in the dive_site
struct is called LOCATION).

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-03-14 22:07:48 +01:00 committed by Dirk Hohndel
parent 1deded7874
commit fa4fedbb48
9 changed files with 69 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
desktop-widgets/command.cpp
View file

@ -103,6 +103,11 @@ void editDiveSiteCountry(dive_site *ds, const QString &value)
execute(new EditDiveSiteCountry(ds, value));
}
void editDiveSiteLocation(dive_site *ds, const QString &value)
{
execute(new EditDiveSiteLocation(ds, value));
}
void addDiveSite(const QString &name)
{
execute(new AddDiveSite(name));

1
desktop-widgets/command.h
View file

@ -45,6 +45,7 @@ void editDiveSiteName(dive_site *ds, const QString &value);
void editDiveSiteDescription(dive_site *ds, const QString &value);
void editDiveSiteNotes(dive_site *ds, const QString &value);
void editDiveSiteCountry(dive_site *ds, const QString &value);
void editDiveSiteLocation(dive_site *ds, const QString &value);
void addDiveSite(const QString &name);
} // namespace Command

36
desktop-widgets/command_divesite.cpp
View file

@ -208,4 +208,40 @@ void EditDiveSiteCountry::undo()
redo();
}
// Parse GPS text into location_t
static location_t parseGpsText(const QString &text)
{
double lat, lon;
if (parseGpsText(text, &lat, &lon))
return create_location(lat, lon);
return { {0}, {0} };
}
EditDiveSiteLocation::EditDiveSiteLocation(dive_site *dsIn, const QString &location) : ds(dsIn),
value(parseGpsText(location))
{
setText(tr("Edit dive site location"));
}
bool EditDiveSiteLocation::workToBeDone()
{
bool ok = has_location(&value);
bool old_ok = has_location(&ds->location);
if (ok != old_ok)
return true;
return ok && !same_location(&value, &ds->location);
}
void EditDiveSiteLocation::redo()
{
std::swap(value, ds->location);
emit diveListNotifier.diveSiteChanged(ds, LocationInformationModel::LOCATION); // Inform frontend of changed dive site.
}
void EditDiveSiteLocation::undo()
{
// Undo and redo do the same
redo();
}
} // namespace Command

12
desktop-widgets/command_divesite.h
View file

@ -92,6 +92,18 @@ private:
QString value; // Value to be set
};
class EditDiveSiteLocation : public Base {
public:
EditDiveSiteLocation(dive_site *ds, const QString &location);
private:
bool workToBeDone() override;
void undo() override;
void redo() override;
dive_site *ds;
location_t value; // Value to be set
};
} // namespace Command
#endif // COMMAND_DIVESITE_H

32
desktop-widgets/locationinformation.cpp
View file

@ -142,6 +142,15 @@ void LocationInformationWidget::diveSiteChanged(struct dive_site *ds, int field)
case LocationInformationModel::TAXONOMY:
ui.diveSiteCountry->setText(taxonomy_get_country(&diveSite->taxonomy));
return;
case LocationInformationModel::LOCATION:
filter_model.setCoordinates(diveSite->location);
if (has_location(&diveSite->location)) {
enableLocationButtons(true);
ui.diveSiteCoordinates->setText(printGPSCoords(&diveSite->location));
} else {
enableLocationButtons(false);
ui.diveSiteCoordinates->clear();
}
default:
return;
}
@ -181,14 +190,6 @@ bool parseGpsText(const QString &text, location_t &location)
void LocationInformationWidget::acceptChanges()
{
if (!diveSite) {
qWarning() << "did not have valid dive site in LocationInformationWidget";
return;
}
if (!ui.diveSiteCoordinates->text().isEmpty())
parseGpsText(ui.diveSiteCoordinates->text(), diveSite->location);
mark_divelist_changed(true);
resetState();
}
@ -250,22 +251,11 @@ void LocationInformationWidget::enableEdition()
ui.diveSiteMessage->setText(tr("You are editing a dive site"));
}
void LocationInformationWidget::on_diveSiteCoordinates_textChanged(const QString &text)
void LocationInformationWidget::on_diveSiteCoordinates_editingFinished()
{
if (!diveSite)
return;
location_t location;
bool ok_old = has_location(&diveSite->location);
bool ok = parseGpsText(text, location);
if (ok != ok_old || !same_location(&location, &diveSite->location)) {
if (ok) {
markChangedWidget(ui.diveSiteCoordinates);
enableLocationButtons(true);
filter_model.setCoordinates(location);
} else {
enableLocationButtons(false);
}
}
Command::editDiveSiteLocation(diveSite, ui.diveSiteCoordinates->text());
}
void LocationInformationWidget::on_diveSiteCountry_editingFinished()

2
desktop-widgets/locationinformation.h
View file

@ -30,7 +30,7 @@ public slots:
void resetState();
void resetPallete();
void on_diveSiteCountry_editingFinished();
void on_diveSiteCoordinates_textChanged(const QString& text);
void on_diveSiteCoordinates_editingFinished();
void on_diveSiteDescription_editingFinished();
void on_diveSiteName_editingFinished();
void on_diveSiteNotes_editingFinished();

2
desktop-widgets/tab-widgets/TabDiveSite.cpp
View file

@ -17,7 +17,7 @@ TabDiveSite::TabDiveSite(QWidget *parent) : TabBase(parent)
ui.diveSites->view()->setSortingEnabled(true);
// Show only the first few columns
for (int i = LocationInformationModel::COORDS; i < LocationInformationModel::COLUMNS; ++i)
for (int i = LocationInformationModel::LOCATION; i < LocationInformationModel::COLUMNS; ++i)
ui.diveSites->view()->setColumnHidden(i, true);
connect(ui.diveSites, &TableView::addButtonClicked, this, &TabDiveSite::add);

2
qt-models/divelocationmodel.cpp
View file

@ -92,7 +92,7 @@ QVariant LocationInformationModel::getDiveSiteData(const struct dive_site *ds, i
case DIVESITE: return QVariant::fromValue<dive_site *>((dive_site *)ds); // Not nice: casting away const
case NAME: return ds->name;
case NUM_DIVES: return ds->dives.nr;
case COORDS: return "TODO";
case LOCATION: return "TODO";
case DESCRIPTION: return ds->description;
case NOTES: return ds->name;
case TAXONOMY: return "TODO";

2
qt-models/divelocationmodel.h
View file

@ -17,7 +17,7 @@ class LocationInformationModel : public QAbstractTableModel {
public:
// Common columns, roles and accessor function for all dive-site models.
// Thus, different views can connect to different models.
enum Columns { REMOVE, NAME, DESCRIPTION, NUM_DIVES, COORDS, NOTES, DIVESITE, TAXONOMY, COLUMNS};
enum Columns { REMOVE, NAME, DESCRIPTION, NUM_DIVES, LOCATION, NOTES, DIVESITE, TAXONOMY, COLUMNS};
enum Roles { DIVESITE_ROLE = Qt::UserRole + 1 };
static QVariant getDiveSiteData(const struct dive_site *ds, int column, int role);