summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-11-17CCR test diveGravatar Dirk Hohndel
This is an anonymized version of a real dive. With the latest changes the SAC calculations now make "mostly sense". What's clearly still broken is the tank pressure graph. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17Translation updatesGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17Fix per_cylinder_mean_depth calculation for CCRGravatar Dirk Hohndel
This patch is bigger than necessary because I also renamed the get_cylinder_use() function to the much more accurate get_cylinder_idx_by_use(). If we have no gas changes (except for a possible explicit first gas), (which in the CCR case also means no bailout), this code will give you correct per cylinder depth and duration for oxygen and diluent and therefore create more reasonable gas consumption data for CCR dives. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17In a CCR dive the diluent and oxygen cylinders are both usedGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16Load and save the dc type for CCR divesGravatar Dirk Hohndel
Oddly we already had code to load this from XML, but nothing else. This makes the load from XML work like the rest of our code and adds the save to XML plus the load and save for the git format. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16Save CCR cylinder use in XML and gitGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16Some gas handling improvementsGravatar Robert C. Helling
Add a time linear gas interpolation strategy. Some minor changes. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16Latest strings and translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16Remove bogus strings and add tooltips to filter buttonsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16Divelist trip text includes the number of dives shown with current filterGravatar Dirk Hohndel
But only if not all dives in the trip are shown. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16Remove unused DivesFilteredOut variableGravatar Dirk Hohndel
It's kinda redundant, anyway, given that we know the total number of dives. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16Improve the filter logicGravatar Dirk Hohndel
The MultiFilter itself should walk the dives in a trip. This way the logic (OR within a category, but AND between categories) is correctly applied and the flags in the dives are set correctly (which makes the overall counts for dives filtered work correctly. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16Improve the filter message and placementGravatar Dirk Hohndel
This makes the text easier to translate (and more meaningful). Also modifies its position to be centereed in order to look less "squeezed into the corner". Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16Addded a min / max layout for the filter, and a filter countGravatar Tomaz Canabrava
But the filter count seems to be broken for some reason and I really don't know why. It seems to work for tags, but not for everything else. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16User manual: Using CCR equipment with Subsurface.Gravatar Willem Ferguson
This is a first stab at some text detailing the import and handling of CCR dives within Subsurface. Three figures added. Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za>Kind regards, willem From da16229327331731794b356b8e8504a4cd160634 Mon Sep 17 00:00:00 2001 From: willem ferguson <willemferguson@zoology.up.ac.za> Date: Sun, 16 Nov 2014 15:50:44 +0200 Subject: [PATCH] Update user manual with CCR instructions This is a first stab at some text detailing the import and handling of CCR dives within Subsurface. Three figures added. Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-15Revert "Save cylinder pressure from samples"Gravatar Dirk Hohndel
This reverts commit 763dfef31573fdda9c5a4e26cb3446f53f704fea. I didn't pay enough attention when accepting this - it saves redundant data. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-15More strings and translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-15Initial support for Suunto DM5 importGravatar Miika Turkia
This implements import from Suunto DM5 database, but there is something wrong with some of the sample dives in the database I received as sample. It seems that we should detect missing/bogus data and treat it properly as divelogs.de does with the same dives. Anyway, when we have proper data, this import appears to produce sensible results. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-15Consistently have a space between file type and extensionGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-15Updated strings and translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-15Fix parsing of Windows new lines on Mk6 importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-15Save the diluent pressures to XMLGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-15Save cylinder pressure from samplesGravatar Miika Turkia
If start and end cylinder pressure is not explicitly set for secondary cylinders, we must store the start and end pressures from the sample_{start,end} attribute. Faulty behavior is obvious at least when importing Poseidon logs. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-15Mark string for translationGravatar Salvo 'LtWorf' Tomaselli
An error string was left untranslated. Signed-off-by: Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-14Make sure we always have copies of equipment descriptionsGravatar Dirk Hohndel
Having pointers copied around that might get freed elsewhere could be a problem. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-14Fix memleak on Pixmap cacheGravatar Tomaz Canabrava
as we load dives and dives, new DiveEvents will be created but the transparent pixmap never deleted, also this makes the transparent pixmap only for the correct event, not for all of them. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-14Don't show a pixmap for heading eventGravatar Dirk Hohndel
Some dive computers appear to have heading data in every sample. In order to avoid a completely cluttered dive profile we no longer show a flag for every heading event but instead show a basically transparent pixmap (which is invisible to the user) that allows us to report the heading information in the tooltip but leaves the profile uncluttered. Fixes #586 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-14First stab at README and ReleaseNotes for 4.3Gravatar Dirk Hohndel
It's never too early to start... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-14Add .txt as dive log fileGravatar Miika Turkia
Add the .txt to the list of all dive log files as this is the file we expect to be opened for Poseidon Mk6 log files. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-14Print: support margin saving for older Qt versionsGravatar Lubomir I. Ivanov
Seems like QMarginsF and QPageLayout were added quite recently - in Qt5.3! We attempt to support older versions by using something found in the Qt4.7 documentation. Patch also fixes small ordering issue where top / left margins were swapped. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13Latest strings and translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13Print: add the support to store margins and printer optionsGravatar Lubomir I. Ivanov
All the print options will be stored after the user closes or "cancels" the print dialog. There seems to be no good way to store the last selected page size, because print dialogs are different and some just list them as strings - A4, A3, etc. The patch also applies the following changes: - renames display.h's 'struct options' to 'struct print_options' as these were really just for the print dialog - the print_options dialog now stores more options as 'bool' - demote PrintDialog's 'printOptions' to 'private' Fixes #653 Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13Better menu entry for filterGravatar Dirk Hohndel
This is no longer just a tag filter. Also, since we use this entry (and its shortcut) like a toggle we should mark the menu entry accordingly. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13When closing filter dialog via menu / shortcut, also reset themGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13When closing the filter window also clear the filterGravatar Dirk Hohndel
The tooltip already pretended that that's what it did... Also make the tooltip wording consistent. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13Random whitespace cleanupGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13Adjust the counter function for filter with "none of the above"Gravatar Dirk Hohndel
So this should count dives with neither buddy nor divemaster, without a location, with no tags, etc. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13Add a function to count dives with a specific suitGravatar Dirk Hohndel
Checking against the location field probably wasn't the best way to do this... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13Fix use of QStringGravatar Tomaz Canabrava
We should use references when we are not wanting to make a copy of it. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13Fix QString useGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13Suits Widget created and working.Gravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13This is already checked in doFilterGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13Create the doFilter for the Suits.Gravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13Suits filterRow method done.Gravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13Suits update method done.Gravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13Added skeleton of the Suits Filter.Gravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13Last one: Common 'data' method for StringList based Filters.Gravatar Tomaz Canabrava
This is the last of the series of Macros that I'll do to ease the creation of a QStringListModel based filter. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13Call all common methods once per class in an easy way.Gravatar Tomaz Canabrava
New method to simplify the creation of 4 of the common methods for each filter in an easy way. There are a few other methods that I'm also thinking on how to do this. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13Create a common macro for flagsGravatar Tomaz Canabrava
samething as the other commits, use common code. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-13Clear filter is always the same for a filter based on stringlistGravatar Tomaz Canabrava
So, let's always use the same codebasee Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>