diff --git a/dives/TestDiveDiveLog5.08_RTF_compressed.zip b/dives/TestDiveDiveLog5.08_RTF_compressed.zip deleted file mode 100755 index 5d90d70ca..000000000 Binary files a/dives/TestDiveDiveLog5.08_RTF_compressed.zip and /dev/null differ diff --git a/dives/TestDiveDiveLog5.08.udcf b/dives/TestDiveDivingLog5.08.udcf similarity index 100% rename from dives/TestDiveDiveLog5.08.udcf rename to dives/TestDiveDivingLog5.08.udcf diff --git a/dives/TestDiveDiveLog5.08.uddf b/dives/TestDiveDivingLog5.08.uddf similarity index 100% rename from dives/TestDiveDiveLog5.08.uddf rename to dives/TestDiveDivingLog5.08.uddf diff --git a/dives/TestDiveDivingLog5.08allimperial.xml b/dives/TestDiveDivingLog5.08allimperial.xml new file mode 100755 index 000000000..9b12078b8 --- /dev/null +++ b/dives/TestDiveDivingLog5.08allimperial.xml @@ -0,0 +1,737 @@ + + +
+ Diving Log 5.0 + 5.0.8.0 + 2013-02-26T16:32:08 +
+ + + 1 + 2011-05-17 + 11:01 + 13:31 + + + + + + + + + 32.00 + 24.69 + + + + {\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fnil\fcharset0 Microsoft Sans Serif;}} +\viewkind4\uc1\pard\lang1033\f0\fs17 All data in DivingLog is Imperial\par +} + + Salt + Shore + Night + Steel + 11.66 + 165.47 + 68.95 + + + Sunny + No Current + No Waves + Bad + 14.00 + 10.00 + 16.33 + False + This is the "DecoStop Details" text field +I also added the silly table groups - should show up as A and K + False + 0 ft - 3000 ft + Drysuit + Vyper + 30 + +

+ 0.00 + 57.2 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 8.99 + 57.2 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 16.01 + 57.2 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 27.99 + 57.2 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 39.99 + 57.2 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 46.00 + 57.2 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 54.99 + 57.2 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 64.01 + 57.2 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 75.00 + 57.2 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 81.00 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 77.99 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 75.98 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 77.00 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 73.00 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 71.00 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 72.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 69.00 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 69.00 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 62.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 58.99 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 56.00 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 54.00 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 52.00 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 50.98 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 48.00 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 45.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 41.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 39.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 37.99 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 37.99 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 39.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 37.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 37.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 39.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 39.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 37.99 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 33.99 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 35.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 35.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 37.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 37.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 35.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 37.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 37.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 35.99 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 31.99 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 29.00 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 25.98 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 27.00 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 23.00 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 19.00 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 20.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 18.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 19.00 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 12.99 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 16.99 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 16.99 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 18.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 16.99 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 16.99 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 12.99 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 10.99 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 8.01 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 6.99 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+

+ 0.00 + 50.0 + 00000 + 0.0 + 0.0 + 0.0 + 0 + 0 +

+ + + + 182.02 + 12.02 + + + + + + 15-20ft + + + + + A + K + Alex + + + 4 + 32.00 + + False + + + 0.00 + + + + + \ No newline at end of file diff --git a/dives/TestDiveDiveLog5.08.xml b/dives/TestDiveDivingLog5.08allmetric.xml similarity index 83% rename from dives/TestDiveDiveLog5.08.xml rename to dives/TestDiveDivingLog5.08allmetric.xml index 3b5e3c48c..61c457678 100755 --- a/dives/TestDiveDiveLog5.08.xml +++ b/dives/TestDiveDivingLog5.08allmetric.xml @@ -3,11 +3,11 @@
Diving Log 5.0 5.0.8.0 - 2013-02-26T03:44:35 + 2013-02-26T16:34:07
- - 46 + + 1 2011-05-17 11:01 13:31 @@ -22,45 +22,40 @@ 32.00 24.69 - - Second deep dive -Linus and I planned and executed - Alex just watching -down to 80ft (overshot by one) -then the reverse sqeeze BS started again -So the rest of the dive is a loooong buoyancy exercise -Still, fun dive - but I skipped the next one and called it a day. + + + {\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fnil\fcharset0 Microsoft Sans Serif;}} +\viewkind4\uc1\pard\lang1033\f0\fs17 All data in DivingLog is Imperial\par +} + Salt Shore - - + Night Steel 11.66 - 164.99 - 69.02 + 165.47 + 68.95 Sunny - - - - + No Current + No Waves Bad 14.00 10.00 - 16.37 + 16.33 False - - + This is the "DecoStop Details" text field +I also added the silly table groups - should show up as A and K False - - + 0 ft - 3000 ft Drysuit Vyper 30

0.00 - 57.2 + 14.0 00000 0.0 0.0 @@ -70,7 +65,7 @@ Still, fun dive - but I skipped the next one and called it a day.

2.74 - 57.2 + 14.0 00000 0.0 0.0 @@ -80,7 +75,7 @@ Still, fun dive - but I skipped the next one and called it a day.

4.88 - 57.2 + 14.0 00000 0.0 0.0 @@ -90,7 +85,7 @@ Still, fun dive - but I skipped the next one and called it a day.

8.53 - 57.2 + 14.0 00000 0.0 0.0 @@ -100,7 +95,7 @@ Still, fun dive - but I skipped the next one and called it a day.

12.19 - 57.2 + 14.0 00000 0.0 0.0 @@ -110,7 +105,7 @@ Still, fun dive - but I skipped the next one and called it a day.

14.02 - 57.2 + 14.0 00000 0.0 0.0 @@ -120,7 +115,7 @@ Still, fun dive - but I skipped the next one and called it a day.

16.76 - 57.2 + 14.0 00000 0.0 0.0 @@ -130,7 +125,7 @@ Still, fun dive - but I skipped the next one and called it a day.

19.51 - 57.2 + 14.0 00000 0.0 0.0 @@ -140,7 +135,7 @@ Still, fun dive - but I skipped the next one and called it a day.

22.86 - 57.2 + 14.0 00000 0.0 0.0 @@ -150,7 +145,7 @@ Still, fun dive - but I skipped the next one and called it a day.

24.69 - 50.0 + 10.0 00000 0.0 0.0 @@ -160,7 +155,7 @@ Still, fun dive - but I skipped the next one and called it a day.

23.77 - 50.0 + 10.0 00000 0.0 0.0 @@ -170,7 +165,7 @@ Still, fun dive - but I skipped the next one and called it a day.

23.16 - 50.0 + 10.0 00000 0.0 0.0 @@ -180,7 +175,7 @@ Still, fun dive - but I skipped the next one and called it a day.

23.47 - 50.0 + 10.0 00000 0.0 0.0 @@ -190,7 +185,7 @@ Still, fun dive - but I skipped the next one and called it a day.

22.25 - 50.0 + 10.0 00000 0.0 0.0 @@ -200,7 +195,7 @@ Still, fun dive - but I skipped the next one and called it a day.

21.64 - 50.0 + 10.0 00000 0.0 0.0 @@ -210,7 +205,7 @@ Still, fun dive - but I skipped the next one and called it a day.

21.95 - 50.0 + 10.0 00000 0.0 0.0 @@ -220,7 +215,7 @@ Still, fun dive - but I skipped the next one and called it a day.

21.03 - 50.0 + 10.0 00000 0.0 0.0 @@ -230,7 +225,7 @@ Still, fun dive - but I skipped the next one and called it a day.

21.03 - 50.0 + 10.0 00000 0.0 0.0 @@ -240,7 +235,7 @@ Still, fun dive - but I skipped the next one and called it a day.

18.90 - 50.0 + 10.0 00000 0.0 0.0 @@ -250,7 +245,7 @@ Still, fun dive - but I skipped the next one and called it a day.

17.98 - 50.0 + 10.0 00000 0.0 0.0 @@ -260,7 +255,7 @@ Still, fun dive - but I skipped the next one and called it a day.

17.07 - 50.0 + 10.0 00000 0.0 0.0 @@ -270,7 +265,7 @@ Still, fun dive - but I skipped the next one and called it a day.

16.46 - 50.0 + 10.0 00000 0.0 0.0 @@ -280,7 +275,7 @@ Still, fun dive - but I skipped the next one and called it a day.

15.85 - 50.0 + 10.0 00000 0.0 0.0 @@ -290,7 +285,7 @@ Still, fun dive - but I skipped the next one and called it a day.

15.54 - 50.0 + 10.0 00000 0.0 0.0 @@ -300,7 +295,7 @@ Still, fun dive - but I skipped the next one and called it a day.

14.63 - 50.0 + 10.0 00000 0.0 0.0 @@ -310,7 +305,7 @@ Still, fun dive - but I skipped the next one and called it a day.

13.72 - 50.0 + 10.0 00000 0.0 0.0 @@ -320,7 +315,7 @@ Still, fun dive - but I skipped the next one and called it a day.

12.50 - 50.0 + 10.0 00000 0.0 0.0 @@ -330,7 +325,7 @@ Still, fun dive - but I skipped the next one and called it a day.

11.89 - 50.0 + 10.0 00000 0.0 0.0 @@ -340,7 +335,7 @@ Still, fun dive - but I skipped the next one and called it a day.

11.58 - 50.0 + 10.0 00000 0.0 0.0 @@ -350,7 +345,7 @@ Still, fun dive - but I skipped the next one and called it a day.

11.58 - 50.0 + 10.0 00000 0.0 0.0 @@ -360,7 +355,7 @@ Still, fun dive - but I skipped the next one and called it a day.

11.89 - 50.0 + 10.0 00000 0.0 0.0 @@ -370,7 +365,7 @@ Still, fun dive - but I skipped the next one and called it a day.

11.28 - 50.0 + 10.0 00000 0.0 0.0 @@ -380,7 +375,7 @@ Still, fun dive - but I skipped the next one and called it a day.

11.28 - 50.0 + 10.0 00000 0.0 0.0 @@ -390,7 +385,7 @@ Still, fun dive - but I skipped the next one and called it a day.

11.89 - 50.0 + 10.0 00000 0.0 0.0 @@ -400,7 +395,7 @@ Still, fun dive - but I skipped the next one and called it a day.

11.89 - 50.0 + 10.0 00000 0.0 0.0 @@ -410,7 +405,7 @@ Still, fun dive - but I skipped the next one and called it a day.

11.58 - 50.0 + 10.0 00000 0.0 0.0 @@ -420,7 +415,7 @@ Still, fun dive - but I skipped the next one and called it a day.

10.36 - 50.0 + 10.0 00000 0.0 0.0 @@ -430,7 +425,7 @@ Still, fun dive - but I skipped the next one and called it a day.

10.67 - 50.0 + 10.0 00000 0.0 0.0 @@ -440,7 +435,7 @@ Still, fun dive - but I skipped the next one and called it a day.

10.67 - 50.0 + 10.0 00000 0.0 0.0 @@ -450,7 +445,7 @@ Still, fun dive - but I skipped the next one and called it a day.

11.28 - 50.0 + 10.0 00000 0.0 0.0 @@ -460,7 +455,7 @@ Still, fun dive - but I skipped the next one and called it a day.

11.28 - 50.0 + 10.0 00000 0.0 0.0 @@ -470,7 +465,7 @@ Still, fun dive - but I skipped the next one and called it a day.

10.67 - 50.0 + 10.0 00000 0.0 0.0 @@ -480,7 +475,7 @@ Still, fun dive - but I skipped the next one and called it a day.

11.28 - 50.0 + 10.0 00000 0.0 0.0 @@ -490,7 +485,7 @@ Still, fun dive - but I skipped the next one and called it a day.

11.28 - 50.0 + 10.0 00000 0.0 0.0 @@ -500,7 +495,7 @@ Still, fun dive - but I skipped the next one and called it a day.

10.97 - 50.0 + 10.0 00000 0.0 0.0 @@ -510,7 +505,7 @@ Still, fun dive - but I skipped the next one and called it a day.

9.75 - 50.0 + 10.0 00000 0.0 0.0 @@ -520,7 +515,7 @@ Still, fun dive - but I skipped the next one and called it a day.

8.84 - 50.0 + 10.0 00000 0.0 0.0 @@ -530,7 +525,7 @@ Still, fun dive - but I skipped the next one and called it a day.

7.92 - 50.0 + 10.0 00000 0.0 0.0 @@ -540,7 +535,7 @@ Still, fun dive - but I skipped the next one and called it a day.

8.23 - 50.0 + 10.0 00000 0.0 0.0 @@ -550,7 +545,7 @@ Still, fun dive - but I skipped the next one and called it a day.

7.01 - 50.0 + 10.0 00000 0.0 0.0 @@ -560,7 +555,7 @@ Still, fun dive - but I skipped the next one and called it a day.

5.79 - 50.0 + 10.0 00000 0.0 0.0 @@ -570,7 +565,7 @@ Still, fun dive - but I skipped the next one and called it a day.

6.10 - 50.0 + 10.0 00000 0.0 0.0 @@ -580,7 +575,7 @@ Still, fun dive - but I skipped the next one and called it a day.

5.49 - 50.0 + 10.0 00000 0.0 0.0 @@ -590,7 +585,7 @@ Still, fun dive - but I skipped the next one and called it a day.

5.79 - 50.0 + 10.0 00000 0.0 0.0 @@ -600,7 +595,7 @@ Still, fun dive - but I skipped the next one and called it a day.

3.96 - 50.0 + 10.0 00000 0.0 0.0 @@ -610,7 +605,7 @@ Still, fun dive - but I skipped the next one and called it a day.

5.18 - 50.0 + 10.0 00000 0.0 0.0 @@ -620,7 +615,7 @@ Still, fun dive - but I skipped the next one and called it a day.

5.18 - 50.0 + 10.0 00000 0.0 0.0 @@ -630,7 +625,7 @@ Still, fun dive - but I skipped the next one and called it a day.

5.49 - 50.0 + 10.0 00000 0.0 0.0 @@ -640,7 +635,7 @@ Still, fun dive - but I skipped the next one and called it a day.

5.18 - 50.0 + 10.0 00000 0.0 0.0 @@ -650,7 +645,7 @@ Still, fun dive - but I skipped the next one and called it a day.

5.18 - 50.0 + 10.0 00000 0.0 0.0 @@ -660,7 +655,7 @@ Still, fun dive - but I skipped the next one and called it a day.

3.96 - 50.0 + 10.0 00000 0.0 0.0 @@ -670,7 +665,7 @@ Still, fun dive - but I skipped the next one and called it a day.

3.35 - 50.0 + 10.0 00000 0.0 0.0 @@ -680,7 +675,7 @@ Still, fun dive - but I skipped the next one and called it a day.

2.44 - 50.0 + 10.0 00000 0.0 0.0 @@ -690,7 +685,7 @@ Still, fun dive - but I skipped the next one and called it a day.

2.13 - 50.0 + 10.0 00000 0.0 0.0 @@ -700,7 +695,7 @@ Still, fun dive - but I skipped the next one and called it a day.

0.00 - 50.0 + 10.0 00000 0.0 0.0 @@ -712,23 +707,23 @@ Still, fun dive - but I skipped the next one and called it a day. 182.02 - 11.65 - - + 12.02 + + + + 15-20ft - - - - + A + K Alex - 0 + 4 32.00 False diff --git a/dives/TestDiveDivingLog5.08allmetric.zip b/dives/TestDiveDivingLog5.08allmetric.zip new file mode 100755 index 000000000..62a58f376 Binary files /dev/null and b/dives/TestDiveDivingLog5.08allmetric.zip differ