diff options
author | mikeller <github@ike.ch> | 2021-05-16 15:39:47 +1200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2021-05-19 15:15:34 -0700 |
commit | 2d734c529b5eb389ca9526575c9520b444d21a30 (patch) | |
tree | ca34e7dd7eacdbb107079441ae1d13be49db117e /commands | |
parent | 2264a5e16659f847187271e852473fb454f990d1 (diff) | |
download | subsurface-2d734c529b5eb389ca9526575c9520b444d21a30.tar.gz |
desktop: Add the capability to copy / paste dive number and date / time.
This is adding the capability to select 'Dive number' and 'Date / Time'
in the 'Copy dive components' dialog, and then copy them into the
clipboard.
When using 'Paste dive components, these values will then be pasted into
the selected dive(s).
This is intended to help with workflows that import dive information
from two different sources, like general information from another
logging program, and CCR ppO2 sensor readings from a unit log, and then
stitch them together into one cohesive entry with all data per dive.
Copied data is also output into formatted text when pasting the
clipboard outside of the application:
```
Dive number: 401
Date / time: Sun 2 May 2021 12:00 AM
```
No translations have been added as of now - I could not find any
information on how strings are translated for this project.
Signed-off-by: Michael Keller <github@ike.ch>
Diffstat (limited to 'commands')
-rw-r--r-- | commands/command_edit.cpp | 10 | ||||
-rw-r--r-- | commands/command_edit.h | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/commands/command_edit.cpp b/commands/command_edit.cpp index 345ca0cfe..39b734438 100644 --- a/commands/command_edit.cpp +++ b/commands/command_edit.cpp @@ -685,6 +685,10 @@ PasteState::PasteState(dive *dIn, const dive *data, dive_components what) : d(dI } if (what.weights) copy_weights(&data->weightsystems, &weightsystems); + if (what.number) + number = data->number; + if (what.when) + when = data->when; } PasteState::~PasteState() @@ -725,6 +729,10 @@ void PasteState::swap(dive_components what) std::swap(cylinders, d->cylinders); if (what.weights) std::swap(weightsystems, d->weightsystems); + if (what.number) + std::swap(number, d->number); + if (what.when) + std::swap(when, d->when); } // ***** Paste ***** @@ -767,6 +775,8 @@ void PasteDives::undo() fields.chill = what.chill; fields.divesite = what.divesite; fields.tags = what.tags; + fields.datetime = what.when; + fields.nr = what.number; emit diveListNotifier.divesChanged(divesToNotify, fields); if (what.cylinders) emit diveListNotifier.cylindersReset(divesToNotify); diff --git a/commands/command_edit.h b/commands/command_edit.h index ab842a13c..257461c59 100644 --- a/commands/command_edit.h +++ b/commands/command_edit.h @@ -301,6 +301,8 @@ struct PasteState { tag_entry *tags; struct cylinder_table cylinders; struct weightsystem_table weightsystems; + int number; + timestamp_t when; PasteState(dive *d, const dive *data, dive_components what); // Read data from dive data for dive d ~PasteState(); |