diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-27 15:36:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-27 15:36:27 -0700 |
| commit | c89f88378a0a19d6b7e0771b6fd8dc31acfaf2f7 (patch) | |
| tree | 643795a8127b7fea2813f999148c1467cc5b4537 /dives | |
| parent | a44d0049f6370d022067b8aee5e847f9fe550cf1 (diff) | |
| parent | 9cf961249e197d6d8a3656968ce15dfd19e3ef3b (diff) | |
| download | subsurface-c89f88378a0a19d6b7e0771b6fd8dc31acfaf2f7.tar.gz | |
Merge branch 'trips' of git://git.hohndel.org/subsurface
Merge the initial 'track trips explicitly' code from Dirk Hohndel.
Fix up trivial conflicts in save-xml.c due to the new 'is_attribute'
flag.
* 'trips' of git://git.hohndel.org/subsurface:
Fix an issue with trips that have dives from multiple input files
Some simple test dives for the trips code
First cut of explicit trip tracking
Diffstat (limited to 'dives')
| -rw-r--r-- | dives/test21.xml | 9 | ||||
| -rw-r--r-- | dives/test22.xml | 9 | ||||
| -rw-r--r-- | dives/test23.xml | 9 |
3 files changed, 27 insertions, 0 deletions
diff --git a/dives/test21.xml b/dives/test21.xml new file mode 100644 index 000000000..5f5f6c981 --- /dev/null +++ b/dives/test21.xml @@ -0,0 +1,9 @@ +<dives> +<program name='subsurface' version='1'></program> +<trip date='2011-12-02' /> +<dive number='20' tripflag='INTRIP' date='2011-12-02' time='14:00:00' duration='30:00 min'> + <depth max='20.0 m' mean='15.0 m' /> + <location>20th test dive - this should be in a trip with same location</location> + <notes>We are testing that the location of the dive is picked up in the trip if the trip has no location</notes> +</dive> +</dives> diff --git a/dives/test22.xml b/dives/test22.xml new file mode 100644 index 000000000..a61032327 --- /dev/null +++ b/dives/test22.xml @@ -0,0 +1,9 @@ +<dives> +<program name='subsurface' version='1'></program> +<trip date='2011-12-02' location='trip location' /> +<dive number='21' tripflag='INTRIP' date='2011-12-02' time='15:00:00' duration='30:00 min'> + <depth max='20.0 m' mean='15.0 m' /> + <location>21st test dive - this should be in a trip with a trip location</location> + <notes>We are testing that the location of the dive is not picked up in the trip if the trip has a location</notes> +</dive> +</dives> diff --git a/dives/test23.xml b/dives/test23.xml new file mode 100644 index 000000000..c61ad2db9 --- /dev/null +++ b/dives/test23.xml @@ -0,0 +1,9 @@ +<dives> +<program name='subsurface' version='1'></program> +<trip date='2011-12-02' location='trip location' /> +<dive number='22' tripflag='NOTRIP' date='2011-12-09' time='6:00:00' duration='30:00 min'> + <depth max='20.0 m' mean='15.0 m' /> + <location>22nd test dive - this should not be in a trip</location> + <notes>We are testing that the NOTRIP flag works</notes> +</dive> +</dives> |