mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 13:10:19 +00:00
This is the official upstream of the Subsurface divelog program
40bdd607c0
Currently the gas pressures stored in structures of pressure are calculated using the gasmix composition of the currently selected cylinder. But with CCR dives the default cylinder is the oxygen cylinder (here, index 0). However, the gas pressures need to be calculated using gasmix data from cylinder 1 (the diluent cylinder). This patch allows setting the appropriate cylinder for calculating the values in the structures of pressure. It also allows for correctly calculating gas pressures for any open circuit cylinders (e.g. bailout) that a CCR diver may use. This is performed as follows: 1) In dive.h create an enum variable {oxygen, diluent, bailout} 2) Within the definition of cylinder_t, add a member: cylinder_use_type This stores an enum variable, one of the above. 3) In file.c where the Poseidon CSV data are read in, assign the appropriate enum values to each of the cylinders. 4) Within the definition of structure dive, add two members: int oxygen_cylinder_index int diluent_cylinder_index This will keep the indices of the two main CCR cylinders. 5) In dive.c create a function get_cylinder_use(). This scans the cylinders for that dive, looking for a cylinder that has a particular cylinder_use_type and returns that cylinder index. 6) In dive.c create a function fixup_cylinder_use() that stores the indices of the oxygen and diluent cylinders in the variables dive->oxygen_cylinder_index and dive->diluent_cylinder_index, making use of the function in 4) above. 7) In profile.c, modify function calculate_gas_information_new() to use the above functions for CCR dives to find the oxygen and diluent cylinders and to calculate partail gas pressures based on the diluent cylinder gas mix. This results in the correct calculation of gas partial pressures in the case of CCR dives, displaying the correct partial pressure graphs in the dive profile widget. Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org> |
||
---|---|---|
.tx | ||
android | ||
appdata | ||
dives | ||
Documentation | ||
icons | ||
marbledata | ||
packaging | ||
qt-ui | ||
scripts | ||
tests | ||
theme | ||
translations | ||
xslt | ||
.clang-format | ||
.gitattributes | ||
.gitignore | ||
android.cpp | ||
CMakeLists.txt | ||
cochran.c | ||
cochran.h | ||
CodingStyle | ||
color.h | ||
configuredivecomputer.cpp | ||
configuredivecomputer.h | ||
configuredivecomputerthreads.cpp | ||
configuredivecomputerthreads.h | ||
deco.c | ||
deco.h | ||
descriptor3.tsv | ||
device.c | ||
device.h | ||
devicedetails.cpp | ||
devicedetails.h | ||
display.h | ||
dive.c | ||
dive.h | ||
divecomputer.cpp | ||
divecomputer.h | ||
divelist.c | ||
divelist.h | ||
equipment.c | ||
exif.cpp | ||
exif.h | ||
file.c | ||
file.h | ||
gaspressures.c | ||
gaspressures.h | ||
gettext.h | ||
gettextfromc.cpp | ||
gettextfromc.h | ||
gpl-2.0.txt | ||
helpers.h | ||
INSTALL | ||
libdivecomputer.c | ||
libdivecomputer.h | ||
linux.c | ||
load-git.c | ||
macos.c | ||
main.cpp | ||
membuffer.c | ||
membuffer.h | ||
parse-xml.c | ||
planner.c | ||
planner.h | ||
pref.h | ||
profile.c | ||
profile.h | ||
qt-gui.cpp | ||
qt-gui.h | ||
qthelper.cpp | ||
qthelper.h | ||
README | ||
Readme.testing | ||
ReleaseNotes.txt | ||
satellite.svg | ||
save-git.c | ||
save-html.c | ||
save-html.h | ||
save-xml.c | ||
sha1.c | ||
sha1.h | ||
statistics.c | ||
statistics.h | ||
strtod.c | ||
subsurface-configure.pri | ||
subsurface-gen-version.pri | ||
subsurface-icon.svg | ||
subsurface-install.pri | ||
subsurface.1 | ||
subsurface.desktop | ||
subsurface.pro | ||
subsurface.qrc | ||
subsurfacestartup.c | ||
subsurfacestartup.h | ||
subsurfacesysinfo.cpp | ||
subsurfacesysinfo.h | ||
SupportedDivecomputers.html | ||
SupportedDivecomputers.txt | ||
terms | ||
time.c | ||
uemis-downloader.c | ||
uemis.c | ||
uemis.h | ||
units.h | ||
webservice.h | ||
windows.c | ||
worldmap-options.h | ||
worldmap-save.c | ||
worldmap-save.h | ||
wreck.jpg |
This is the README file for Subsurface 4.2 Please check the ReleaseNotes.txt for details about new features and changes since Subsurface 4.1 Report bugs and issues at http://trac.hohndel.org License: GPLv2 Subsurface can be found at http://subsurface.hohndel.org You can get the sources to the latest development version from the git repository: git clone git://subsurface.hohndel.org/subsurface.git . You can also browse the sources via gitweb at git.hohndel.org If you want the latest release (instead of the bleeding edge development version) you can either get this via git or the release tar ball. After cloning run the following command: git checkout v4.2 (or whatever the last release is) or download a tar ball from: http://subsurface.hohndel.org/downloads/Subsurface-4.2.tgz Basic Usage: ============ Install and start from the desktop, or you can run it locally from the build directory: On Linux: $ ./subsurface On Mac: $ open Subsurface.app Native builds on Windows are not really supported (the official Windows installers are both cross-built on Linux). You can give a data file as command line argument, or (once you have set this up in the Preferences) Subsurface picks a default file for you when started from the desktop or without an argument. If you have a dive computer supported by libdivecomputer, you can just select "Import from Divecomputer" from the "Import" menu, select which dive computer you have (and where it is connected if you need to), and hit "OK". The latest list of supported dive computers can be found in the file SupportedDivecomputers.txt. Much more detailed end user instructions can be found from inside Subsurface by selecting Help (typically F1). When building from source this is also available as Documentation/user-manual.html. The documentation for the latest release is also available on-line http://subsurface.hohndel.org/documentation/ Contributing: ============= There is a mailing list for developers: subsurface@hohndel.org Go to http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface to subscribe. If you want to contribute code, please either send signed-off patches or a pull request with signed-off commits. If you don't sign off on them, we will not accept them. This means adding a line that says "Signed-off-by: Name <email>" at the end of each commit, indicating that you wrote the code and have the right to pass it on as an open source patch. See: http://developercertificate.org/ Also, please write good git commit messages. A good commit message looks like this: Header line: explain the commit in one line (use the imperative) Body of commit message is a few lines of text, explaining things in more detail, possibly giving some background about the issue being fixed, etc etc. The body of the commit message can be several paragraphs, and please do proper word-wrap and keep columns shorter than about 74 characters or so. That way "git log" will show things nicely even when it's indented. Make sure you explain your solution and why you're doing what you're doing, as opposed to describing what you're doing. Reviewers and your future self can read the patch, but might not understand why a particular solution was implemented. Reported-by: whoever-reported-it Signed-off-by: Your Name <youremail@yourhost.com> where that header line really should be meaningful, and really should be just one line. That header line is what is shown by tools like gitk and shortlog, and should summarize the change in one readable line of text, independently of the longer explanation. Please use verbs in the imperative in the commit message, as in "Fix bug that...", "Add file/feature ...", or "Make Subsurface..." A bit of Subsurface history: ============================ In fall of 2011, when a forced lull in kernel development gave him an opportunity to start on a new endeavor, Linus Torvalds decided to tackle his frustration with the lack of decent divelog software on Linux. Subsurface is the result of the work of him and a team of developers since then. It now supports Linux, Windows and MacOS and allows data import from a large number of dive computers and several existing divelog programs. It provides advanced visualization of the key information provided by a modern dive computer and allows the user to track a wide variety of data about their diving. In fall of 2012 Dirk Hohndel took over as maintainer of Subsurface