subsurface.git/smtk-import, branch v4.6.4

smtk-import: Add curly braces in nested conditionals

2017-04-21T13:52:13Z

Curly braces are necessary in nested conditionals or results may not be those expected. In this case, the "else" clause applied on second "if", instead of first one. Signed-off-by: Salvador Cuñat

smtk-import reuse pre-existent code and fix leak

2017-04-21T13:52:13Z

Use update_event_name() for bookmarks merge and free temp string. Signed-off-by: Salvador Cuñat

smtk-import: Abort bookmark parsing if table doesn't open

2017-04-21T13:52:13Z

Do not just report the failure but abort parsing or we will get a crash Signed-off-by: Salvador Cuñat

smtk-import Avoid duplicities in bookmarks

2017-04-04T17:54:55Z

SmartTrak's bookmarks work in the same fashion Subsurface's do. The user may set a bookmark while underwater or set it just on the divelog software. At this time we are parsing those set in the DC twice, as we get one from libdivecomputer and another from smarttrak's database. This patch just checks if we have a bookmark event downloaded by libdivecomputer which has the same time that the one parsed from the .slg file. If so, merge the names taking the one from smarttrak. Text from smarttrak is preferred because the user may have entered some interesting note there and libdivecomputer's name is just "bookmark". Signed-off-by: Salvador Cuñat

smtk-import Fix wreck data import

2017-04-04T17:54:55Z

It was assumed that every data field in a wreck table was filled or zeroed. This assumption is actually false, so this patch adds testing for the existence of strings before working with them. Signed-off-by: Salvador Cuñat

smtk-import fix is_same_cylinder()

2017-03-18T15:33:31Z

Add return value to the gasmix condition, and fix the rest of the conditions. Signed-off-by: Salvador Cuñat

smtk-import - Change cylinder import logic

2017-03-18T15:33:31Z

Until now, we did the cylinder import based on its initial pressure (a tank without pressure is an unused tank). Based in this assumption, we just dropped those tanks whose initial press was 0, losing user introduced tank definitions and getting some duplicities due to one cylinder being numbered (e.g.) 2 by libdivecomputer and 3 by SmartTrak. The new workflow is: get every single tank reported by SmartTrak (giving preference to libdivecomputer parsed data), then clean the cylinder table reverse order, dropping tanks without description and init or end pressures, and checkig them against the previous cylinder to do a merge, if they look the same, and try to avoid duplicities. The new logic assumes a heavier workload for the benefit of lower data loss (e.g. a user may get his/her tanks descriptions despite he/she hasn't recorded their pressures because forgot the values or had an issue with the gas transmitter). Suggested-by: Alessandro Volpi Signed-off-by: Salvador Cuñat

smtk-import - Remove tank number limitation

2017-03-18T15:33:31Z

In the past subsurface managed up to 8 tanks, but now it manages up to 20. SmartTrak manages 10 (3 in older no trimix versions) so there is no more need to drop the last tanks. Signed-off-by: Salvador Cuñat

smtk-import rework smtk_build_tank_info()

2017-03-18T15:33:31Z

The cylinder info is built one by one. This way, instead of passing dive and tank number parameters, just passing a pointer to the tank been worked seems preferable. It also introduces lrint() in the function to round the doubles values obtained from libmdb for tank size and workingpressure. Signed-off-by: Salvador Cuñat

smtk-import - Add helper funcs to manage tank info

2017-03-18T15:33:31Z

Framed in a full rework of the cylinders info import management, this funcs will be used in next patches. Functions merge_cylinder_type(), merge_cylinder_mix() and merge_cylinder_info(), have been shamelessly copied from dive.c as they have been removed by 162767aa dated 2017-03-11 just when I was going to use them. Macros MERGE_MAX() and MERGE_MIN() have just been copied from dive.c, but they could be moved to dive.h so they could be used elsewhere if needed. Signed-off-by: Salvador Cuñat