subsurface.git/qt-models, branch v4.8.0

Dive pictures: adjust rowDDEnd and rowDDStart on picture deletion

2018-06-29T05:30:48Z

In DivePictureModel, rowDDEnd and rowDDStart specify the range of pictures in the profile plot. Obviously, these have to be adjusted when pictures are deleted. Signed-off-by: Berthold Stoeger

QML UI: correctly update the model

2018-06-25T12:20:35Z

In order to trigger the redraw of an edited dive we need to make sure the model realizes that it has been updated. So far the only way to make sure this happens reliably appears to be to remove the item and re-insert it. Seems weird, but with this the bug of not redrawing the profile after an edit appears fixed. Fixes #1419 Signed-off-by: Dirk Hohndel

Localization: remove gettextFromC::instance()

2018-06-24T18:31:14Z

There were a handfull instances of the kind 1) gettextFromC::instance()->tr(...) 2) gettextFromC::instance()->trGettext(...) 1) is pointless, as tr is a static function. All instances of 2) were likewise pointless, because trGettext() returns a C-string, which was then immediately converted to a QString. Thus, replace both constructs by gettextFromC::tr(...). After this change there was only one user of gettextFromC::instance() left, viz. the C-interface funtion trGettext(). Therefore, remove gettextFromC::instance() and do all the caching / translating directly in the global trGettext(). Signed-off-by: Berthold Stoeger

Fix interpretation of dive mode changes upon replan

2018-06-24T07:35:55Z

... by taking into acount that dive planner points refer to the sement before the waypoint (while change mode events are concerned with the future of a waypoint). Signed-off-by: Robert C. Helling

When adding new waypoints, use previous setpoint.

2018-06-24T07:35:55Z

Signed-off-by: Robert C. Helling

Planner: Change segment setpoint according to divemode

2018-06-24T07:35:55Z

When making a segment non-CCR, its setpoint should be 0. OTOH, when it becomes CCR, use the default setpoint (or should we try to find the last previous setpoint?) Signed-off-by: Robert C. Helling

Copy divemode to Replan

2018-06-24T07:35:55Z

this needs copying the divemode from the dive to the plan. Signed-off-by: Robert C. Helling

equipment: sanitize 'ws_info' loop limits

2018-06-20T00:30:58Z

Instead of a constant or a macro for the maximum number of 'ws_info' elements the 100 literal was used. Define MAX_WS_INFO in dive.h and use it everywhere. Also clamp loops that iterate `ws_info' to MAX_WS_INFO. Prevents potential out-of-bounds reading, similarly to the previous commit about 'tank_info'. Signed-off-by: Lubomir I. Ivanov

equipment: sanitize 'tank_info' loop limits

2018-06-20T00:30:58Z

In a number of places the global 'tank_info' array is being iterated based on a 'tank_info[idx].name != NULL' condition. This is dangerous because if the user has added a lot of tanks, such loops can reach 'tank_info[MAX_TANK_INFO]'. This is an out of bounds read and if the 'name' pointer there happens to be non-NULL, passing that address to a peace of code that tries to read it (like strlen()) would either SIGSEGV or have undefined behavior. Clamp all loops that iterate 'tank_info' to MAX_TANK_INFO. Signed-off-by: Lubomir I. Ivanov

Change from gettextFromC::instance()->tr() to gettextFromC::tr();

2018-06-18T05:42:39Z

Code cleanup. Suggested-by: Berthold Stoeger Signed-off-by: Stefan Fuchs