From 549ad65bcb39e95c4deae0b77eb2476efa53df43 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 12 Dec 2011 09:15:04 -0800 Subject: Add libxslt to Windows packaging file Signed-off-by: Dirk Hohndel --- packaging/windows/subsurface.nsi | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/windows/subsurface.nsi b/packaging/windows/subsurface.nsi index b78c98120..09a6eb0e6 100644 --- a/packaging/windows/subsurface.nsi +++ b/packaging/windows/subsurface.nsi @@ -82,6 +82,7 @@ file /oname=libpixman-1-0.dll dll\libpixman-1-0.dll file /oname=libpng15-15.dll dll\libpng15-15.dll file /oname=libtiff-3.dll dll\libtiff-3.dll file /oname=libxml2-2.dll dll\libxml2-2.dll +file /oname=libxslt-1.dll dll\libxslt-1.dll file /oname=pthreadGC2.dll dll\pthreadGC2.dll file /oname=zlib1.dll dll\zlib1.dll sectionEnd -- cgit v1.2.3-70-g09d2 From 989a70727dfc290cbd23e3d7a484755d14a11d27 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 12 Dec 2011 09:19:58 -0800 Subject: Two test dives I added a couple of months ago ...and never commited Signed-off-by: Dirk Hohndel --- dives/test16.xml | 896 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ dives/test17.xml | 896 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1792 insertions(+) create mode 100644 dives/test16.xml create mode 100644 dives/test17.xml diff --git a/dives/test16.xml b/dives/test16.xml new file mode 100644 index 000000000..004d533f7 --- /dev/null +++ b/dives/test16.xml @@ -0,0 +1,896 @@ + + + + + + 16th test dive - temperatures + Making sure a crazy and wide temperature plot is readable + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dives/test17.xml b/dives/test17.xml new file mode 100644 index 000000000..52b54f41c --- /dev/null +++ b/dives/test17.xml @@ -0,0 +1,896 @@ + + + + + + 17th test dive - silly temperatures + Making sure a crazy but narrow temperature plot is readable + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From 1802487e4ff5bfd62641b1d5a2336999bda38f67 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 12 Dec 2011 10:11:53 -0800 Subject: Make test dive 15 a bit more useful Signed-off-by: Dirk Hohndel --- dives/test15.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dives/test15.xml b/dives/test15.xml index 999e81083..a95dc28c1 100644 --- a/dives/test15.xml +++ b/dives/test15.xml @@ -5,8 +5,11 @@ 15th test dive - trimix Nothing of value, just getting something for the divelist + - + + + -- cgit v1.2.3-70-g09d2 From d7482356fd8feeb2ab2d3fc8106d0a6c2a5ee0cf Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 12 Dec 2011 10:12:29 -0800 Subject: Add three more trimix test dives This allows us to check what we display in the dive list and how we sort it. Signed-off-by: Dirk Hohndel --- dives/test18.xml | 21 +++++++++++++++++++++ dives/test19.xml | 22 ++++++++++++++++++++++ dives/test20.xml | 22 ++++++++++++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 dives/test18.xml create mode 100644 dives/test19.xml create mode 100644 dives/test20.xml diff --git a/dives/test18.xml b/dives/test18.xml new file mode 100644 index 000000000..7380e04d0 --- /dev/null +++ b/dives/test18.xml @@ -0,0 +1,21 @@ + + + + + + 18th test dive - trimix + Nothing of value, just getting something for the divelist + + + + + + + + + + + + + + diff --git a/dives/test19.xml b/dives/test19.xml new file mode 100644 index 000000000..276124682 --- /dev/null +++ b/dives/test19.xml @@ -0,0 +1,22 @@ + + + + + + 19th test dive - trimix + Nothing of value, just getting something for the divelist + + + + + + + + + + + + + + + diff --git a/dives/test20.xml b/dives/test20.xml new file mode 100644 index 000000000..7f9040191 --- /dev/null +++ b/dives/test20.xml @@ -0,0 +1,22 @@ + + + + + + 20th test dive - trimix + Manly dive with two trimix plus deco (no air anywhere) + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From 4e4e3cc43a8510c73883e88cbfb03aedda9eaaf1 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 12 Dec 2011 10:13:03 -0800 Subject: Small improvement to plot info debugging code Signed-off-by: Dirk Hohndel --- profile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/profile.c b/profile.c index 5d5aff518..822e30c0e 100644 --- a/profile.c +++ b/profile.c @@ -168,9 +168,10 @@ static void dump_pi (struct plot_info *pi) pi->maxpressure, pi->mintemp, pi->maxtemp); for (i = 0; i < pi->nr; i++) printf(" entry[%d]:{same_cylinder:%d cylinderindex:%d sec:%d pressure:{%d,%d}\n" - " temperature:%d depth:%d smoothed:%d}\n", + " time:%d:%02d temperature:%d depth:%d smoothed:%d}\n", i, pi->entry[i].same_cylinder, pi->entry[i].cylinderindex, pi->entry[i].sec, pi->entry[i].pressure[0], pi->entry[i].pressure[1], + pi->entry[i].sec / 60, pi->entry[i].sec % 60, pi->entry[i].temperature, pi->entry[i].depth, pi->entry[i].smoothed); printf(" }\n"); } -- cgit v1.2.3-70-g09d2