From: Linus Torvalds Date: Mon, 12 Dec 2011 19:20:36 +0000 (-0800) Subject: Merge branch 'forlinus' of git://git.hohndel.org/subsurface X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=827c1e352121af96708f0414248e57d735e3dea8;hp=393c437772fab75e1ebf88a85521b680fe3b927b;p=ext%2Fsubsurface.git Merge branch 'forlinus' of git://git.hohndel.org/subsurface * 'forlinus' of git://git.hohndel.org/subsurface: Small improvement to plot info debugging code Add three more trimix test dives Make test dive 15 a bit more useful Two test dives I added a couple of months ago Add libxslt to Windows packaging file --- diff --git a/dives/test15.xml b/dives/test15.xml index 999e810..a95dc28 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 + - + + + diff --git a/dives/test16.xml b/dives/test16.xml new file mode 100644 index 0000000..004d533 --- /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 0000000..52b54f4 --- /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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dives/test18.xml b/dives/test18.xml new file mode 100644 index 0000000..7380e04 --- /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 0000000..2761246 --- /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 0000000..7f90401 --- /dev/null +++ b/dives/test20.xml @@ -0,0 +1,22 @@ + + + + + + 20th test dive - trimix + Manly dive with two trimix plus deco (no air anywhere) + + + + + + + + + + + + + + + diff --git a/packaging/windows/subsurface.nsi b/packaging/windows/subsurface.nsi index b78c981..09a6eb0 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 diff --git a/profile.c b/profile.c index 5d5aff5..822e30c 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"); }