mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/core
History
Michael Keller 528532572f Planner: Fix Editing of Plans in Multi-Divecomputer Dives. 
Currently editing of planned dives that have been merged with actual
(logged) dives only works if the 'Planned dive' divecomputer is the
first divecomputer, and this divecomputer is selected when clicking
'Edit planned dive'. In other cases the profile of the first
divecomputer is overlaid with the profile of the planned dive, and the
first divecomputer's profile is overwritten when saving the dive plan.
Fix this problem.

Triggered by @SeppoTakalo's comment (https://github.com/subsurface/subsurface/issues/1913#issuecomment-2075562119): Users don't like that planned dives show up as their own entries in the dive list, so being able to merge them with the actual dive after it has been executed is a good feature - but this wasn't working well until now.

Signed-off-by: Michael Keller <github@ike.ch>
2024-05-11 12:51:45 +12:00
..
settings Equipment: Include Unused Tanks in Merge if Preference is Enabled. 2023-07-25 11:19:03 +12:00
subsurface-qt selection: move dive selection, current dive and dc through signals 2023-04-16 20:23:59 +02:00
android.cpp core: use C++ std::strings for default directory and filename 2023-06-03 12:54:24 +02:00
btdiscovery.cpp Replace qDebug() by report_info() in bluetooth code 2024-04-23 07:47:11 +07:00
btdiscovery.h bluetooth discovery: report more information about progress 2020-09-30 16:40:41 -07:00
checkcloudconnection.cpp Replace qDebug() by report_info in checkcloudconnection.cpp 2024-04-23 07:47:11 +07:00
checkcloudconnection.h cloudstorage: try alternative server if first connection fails 2021-04-19 12:51:01 -07:00
cloudstorage.cpp Replace qDebug() by report_info() in core/cloudstorage.cpp 2024-04-23 07:47:11 +07:00
cloudstorage.h mobile: add ability to delete cloud account 2022-08-13 14:08:37 -07:00
CMakeLists.txt core: use std::string instead of strndup() 2024-04-23 07:47:11 +07:00
cochran.cpp Cleanup: Fix Problems Raised by Coverity Scan. 2024-03-14 11:42:09 +13:00
cochran.h
color.cpp profile: rename GF_LINE color to DURATION_LINE 2021-05-08 13:40:24 +02:00
color.h cleanup: prevent distracing conversion warnings 2022-03-12 08:28:32 -08:00
compressibility.r
configuredivecomputer.cpp core: make logfile_name and dumpfile_name std::string 2024-03-24 17:53:19 +01:00
configuredivecomputer.h computer configuration: use value semantics for DeviceDetails 2024-03-24 17:53:19 +01:00
configuredivecomputerthreads.cpp computer configuration: use value semantics for DeviceDetails 2024-03-24 17:53:19 +01:00
configuredivecomputerthreads.h computer configuration: use value semantics for DeviceDetails 2024-03-24 17:53:19 +01:00
connectionlistmodel.cpp core/bt: ensure that BT/BLE addresses with name sort first 2020-05-15 04:05:06 +03:00
connectionlistmodel.h
datatrak.cpp core: use C++-primitives for g_tag_list 2024-04-23 07:47:11 +07:00
datatrak.h core: turn a memblock in the parser to std::string 2024-03-10 11:01:42 +13:00
deco.cpp cleanup: replace MIN and MAX macrors by standard versions 2024-04-23 07:47:11 +07:00
deco.h planner: encapsulate deco state cache in a struct 2024-04-23 07:47:11 +07:00
device.cpp Replace remaining qDebug()s by report_info() 2024-04-23 07:47:11 +07:00
device.h core: make fp_get_data return an std::string 2024-03-10 11:01:42 +13:00
devicedetails.cpp computer configuration: use value semantics for DeviceDetails 2024-03-24 17:53:19 +01:00
devicedetails.h computer configuration: use value semantics for DeviceDetails 2024-03-24 17:53:19 +01:00
dive.cpp Planner: Fix Editing of Plans in Multi-Divecomputer Dives. 2024-05-11 12:51:45 +12:00
dive.h Planner: Fix Editing of Plans in Multi-Divecomputer Dives. 2024-05-11 12:51:45 +12:00
divecomputer.c profile: register event names on creation of events 2023-02-17 06:46:46 -08:00
divecomputer.h core: add make_manually_added_dc() function 2022-10-21 16:51:57 -07:00
divefilter.cpp cleanup: silence std::move()-related Coverity warnings 2024-01-15 15:11:36 -08:00
divefilter.h filter: set dive selection at once 2023-04-16 20:23:59 +02:00
divelist.c Refactoring: Improve Naming of FRACTION and SIGNED_FRAC defines. 2024-05-02 20:36:26 +02:00
divelist.h core: use divelog in importDives() and process_imported_dives() 2023-04-14 21:20:23 +02:00
divelog.cpp Import: Fix Application Hang when Cancelling the Download Dialogue. 2024-05-05 19:15:26 +02:00
divelog.h core: use divelog struct in downloader code 2023-04-14 21:20:23 +02:00
divelogexportlogic.cpp core: enable compiler warngings for report_error and report_info 2024-03-12 10:31:07 -04:00
divelogexportlogic.h
divemode.h
divesite-helper.cpp
divesite.c cleanup: replace fprintf to stderr by report_info() 2024-04-23 07:47:11 +07:00
divesite.h core: convert parse-xml.c and parse.c to C++ 2024-03-10 11:01:42 +13:00
divesitehelpers.cpp Replace remaining qDebug()s by report_info() 2024-04-23 07:47:11 +07:00
divesitehelpers.h [Bug #2934] Geo Lookup - support for remote dive sites 2020-09-05 17:34:15 +02:00
downloadfromdcthread.cpp Replace qDebug() by report_info() in downloadfromdcthread.cpp 2024-04-23 07:47:11 +07:00
downloadfromdcthread.h core: fix downloader builds 2024-03-16 18:21:52 +01:00
equipment.c cleanup: replace fprintf to stderr by report_info() 2024-04-23 07:47:11 +07:00
equipment.h desktop: unglobalize ComboBox-models 2024-04-16 08:56:49 +12:00
errorhelper.cpp core: port errorhelper.c to C++ 2024-04-23 07:47:11 +07:00
errorhelper.h core: replace SSRF_INFO macro by report_info() 2024-03-12 10:31:07 -04:00
event.c events: make event severity explicit 2024-02-23 09:46:16 -08:00
event.h profile: make event hiding persistent across change of dive 2024-02-23 09:46:16 -08:00
eventtype.cpp profile: make event hiding persistent across change of dive 2024-02-23 09:46:16 -08:00
eventtype.h profile: make event hiding persistent across change of dive 2024-02-23 09:46:16 -08:00
exif.cpp
exif.h
extradata.h cleanup: split out divecomputer functions from dive.c 2020-10-25 13:59:52 -07:00
file.cpp cleanup: replace fprintf to stderr by report_info() 2024-04-23 07:47:11 +07:00
file.h core: turn a memblock in the parser to std::string 2024-03-10 11:01:42 +13:00
filterconstraint.cpp Desktop: Fix 'planned' and 'logged' Filters. 2024-04-30 12:25:31 +12:00
filterconstraint.h core: convert filter_constraint_data_to_string to C++ 2024-03-10 11:01:42 +13:00
filterpreset.cpp core: remove alloc_filter_preset() and free_filter_preset() 2024-03-10 11:01:42 +13:00
filterpreset.h core: remove alloc_filter_preset() and free_filter_preset() 2024-03-10 11:01:42 +13:00
format.cpp core: add compile time format check to format_string_std 2024-04-23 07:47:11 +07:00
format.h core: add compile time format check to format_string_std 2024-04-23 07:47:11 +07:00
fulltext.cpp core: use C++-primitives for g_tag_list 2024-04-23 07:47:11 +07:00
fulltext.h fulltext: remember original query 2020-09-29 16:13:03 -07:00
gas-model.c Show correct gas density in CCR mode 2022-11-08 10:43:47 -08:00
gas.c cleanup: replace fprintf to stderr by report_info() 2024-04-23 07:47:11 +07:00
gas.h Show correct gas density in CCR mode 2022-11-08 10:43:47 -08:00
gaspressures.c Refactoring: Improve Naming of FRACTION and SIGNED_FRAC defines. 2024-05-02 20:36:26 +02:00
gaspressures.h cleanup: constify populate_pressure_information() 2021-01-20 10:01:50 -08:00
gettext.h core: make translate() accessible from C++ 2024-03-10 11:01:42 +13:00
gettextfromc.cpp
gettextfromc.h
git-access.cpp core: use std::string instead of strndup() 2024-04-23 07:47:11 +07:00
git-access.h core: convert git_info to std::string 2024-04-23 07:47:11 +07:00
globals.cpp core: add class that collects global objects to be deleted on exit 2022-03-16 13:06:06 -07:00
globals.h core: add class that collects global objects to be deleted on exit 2022-03-16 13:06:06 -07:00
imagedownloader.cpp Replace remaining qDebug()s by report_info() 2024-04-23 07:47:11 +07:00
imagedownloader.h
import-cobalt.cpp cleanup: replace fprintf to stderr by report_info() 2024-04-23 07:47:11 +07:00
import-csv.cpp cleanup: replace fprintf to stderr by report_info() 2024-04-23 07:47:11 +07:00
import-csv.h core: turn a memblock in the parser to std::string 2024-03-10 11:01:42 +13:00
import-divinglog.cpp cleanup: replace fprintf to stderr by report_info() 2024-04-23 07:47:11 +07:00
import-seac.cpp cleanup: replace fprintf to stderr by report_info() 2024-04-23 07:47:11 +07:00
import-shearwater.cpp cleanup: replace fprintf to stderr by report_info() 2024-04-23 07:47:11 +07:00
import-suunto.cpp cleanup: replace fprintf to stderr by report_info() 2024-04-23 07:47:11 +07:00
interpolate.h cleanup: move interpolate inline function to its own header file 2020-10-25 13:59:52 -07:00
ios.cpp core: use C++ std::strings for default directory and filename 2023-06-03 12:54:24 +02:00
libdivecomputer.cpp Refactoring: Improve Naming of FRACTION and SIGNED_FRAC defines. 2024-05-02 20:36:26 +02:00
libdivecomputer.h core: make logfile_name and dumpfile_name std::string 2024-03-24 17:53:19 +01:00
liquivision.cpp core: use std::string instead of strndup() 2024-04-23 07:47:11 +07:00
load-git.cpp core: add compile time format check to format_string_std 2024-04-23 07:47:11 +07:00
macos.cpp Build: Fix build warning on MacOS. 2023-06-12 08:04:30 -07:00
membuffer.cpp Refactoring: Improve Naming of FRACTION and SIGNED_FRAC defines. 2024-05-02 20:36:26 +02:00
membuffer.h core: C++-ify membuffer 2021-07-23 11:22:43 -07:00
metadata.cpp cleanup: fix SkipEmptyParts warning for mobile 2021-11-24 10:53:26 -08:00
metadata.h
metrics.cpp core: remove DPR from IconMetrics class 2021-12-17 11:54:23 -08:00
metrics.h core: remove DPR from IconMetrics class 2021-12-17 11:54:23 -08:00
namecmp.h Qt6: deal with changes from QStringRef to QStringView 2022-03-12 08:28:32 -08:00
ostctools.c core: introduce divelog structure 2023-04-14 21:20:23 +02:00
owning_ptrs.h core: make owning pointers a top-level features 2023-04-16 20:23:59 +02:00
parse-gpx.cpp cleanup: replace fprintf to stderr by report_info() 2024-04-23 07:47:11 +07:00
parse-gpx.h cleanup: more Coverity silencing 2024-01-17 14:23:19 -08:00
parse-xml.cpp cleanup: replace fprintf to stderr by report_info() 2024-04-23 07:47:11 +07:00
parse.cpp core: turn extra_data key/value pair in parser to std::string 2024-03-10 11:01:42 +13:00
parse.h core: turn extra_data key/value pair in parser to std::string 2024-03-10 11:01:42 +13:00
picture.c pictures: make delta-time a 64-bit int 2024-01-15 15:11:36 -08:00
picture.h pictures: make delta-time a 64-bit int 2024-01-15 15:11:36 -08:00
pictureobj.cpp media: add small C++ helper describing a picture struct 2020-05-06 13:58:09 -07:00
pictureobj.h media: add small C++ helper describing a picture struct 2020-05-06 13:58:09 -07:00
planner.cpp Planner: Fix Editing of Plans in Multi-Divecomputer Dives. 2024-05-11 12:51:45 +12:00
planner.h Planner: Fix Editing of Plans in Multi-Divecomputer Dives. 2024-05-11 12:51:45 +12:00
plannernotes.cpp Refactoring: Improve Naming of FRACTION and SIGNED_FRAC defines. 2024-05-02 20:36:26 +02:00
pref.c Equipment: Include Unused Tanks in Merge if Preference is Enabled. 2023-07-25 11:19:03 +12:00
pref.h Mobile: Fix Configuration of Ceiling Display. 2024-02-06 11:58:49 +13:00
profile.cpp Refactoring: Improve Naming of FRACTION and SIGNED_FRAC defines. 2024-05-02 20:36:26 +02:00
profile.h profile: use C++ string functions to format plot data 2024-04-23 07:47:11 +07:00
qt-ble.cpp Replace qDebug() by report_info() in bluetooth code 2024-04-23 07:47:11 +07:00
qt-ble.h Qt6: Bluetooth API changes 2022-03-12 08:28:32 -08:00
qt-gui.h mobile/UI: remember the system default font size 2021-01-19 12:35:29 -08:00
qt-init.cpp Replace qDebug() by report_info() in qt-init.cpp 2024-04-23 07:47:11 +07:00
qthelper.cpp core: use C++-primitives for g_tag_list 2024-04-23 07:47:11 +07:00
qthelper.h core: use C++-primitives for g_tag_list 2024-04-23 07:47:11 +07:00
qtserialbluetooth.cpp Replace qDebug() by report_info() in bluetooth code 2024-04-23 07:47:11 +07:00
range.h cleanup: use range based for in download code 2023-04-14 21:20:23 +02:00
sample.cpp core: convert sample.c to C++ and add default constructor 2024-03-10 11:01:42 +13:00
sample.h core: convert sample.c to C++ and add default constructor 2024-03-10 11:01:42 +13:00
save-git.cpp Refactoring: Improve Naming of FRACTION and SIGNED_FRAC defines. 2024-05-02 20:36:26 +02:00
save-html.cpp Refactoring: Improve Naming of FRACTION and SIGNED_FRAC defines. 2024-05-02 20:36:26 +02:00
save-html.h
save-profiledata.c Refactoring: Improve Naming of FRACTION and SIGNED_FRAC defines. 2024-05-02 20:36:26 +02:00
save-profiledata.h
save-xml.cpp Refactoring: Improve Naming of FRACTION and SIGNED_FRAC defines. 2024-05-02 20:36:26 +02:00
selection.cpp cleanup: replace fprintf to stderr by report_info() 2024-04-23 07:47:11 +07:00
selection.h selection: move current dc logic to profile widget 2023-04-16 20:23:59 +02:00
serial_ftdi.c cleanup: replace fprintf to stderr by report_info() 2024-04-23 07:47:11 +07:00
serial_usb_android.cpp
serial_usb_android.h
sha1.c
sha1.h core: convert git-access.c to C++ 2024-03-10 11:01:42 +13:00
ssrf.h
statistics.c Equipment: Fix 'used' Gas Selection for CCR Dives. 2023-07-25 12:05:51 +12:00
statistics.h cleanup: move minute formating to format-string.cpp 2022-09-03 13:49:02 -07:00
string-format.cpp Refactoring: Improve Naming of FRACTION and SIGNED_FRAC defines. 2024-05-02 20:36:26 +02:00
string-format.h profile: make event hiding persistent across change of dive 2024-02-23 09:46:16 -08:00
strtod.c
structured_list.h core: convert dive.c to C++ 2024-03-10 11:01:42 +13:00
subsurface-float.h core: move floating point functions to own header file 2022-08-30 22:34:38 +02:00
subsurface-string.cpp Use std::vector<string> instead of QStringList in main() 2024-04-23 07:47:11 +07:00
subsurface-string.h Replace qDebug() by report_info in qthelper.cpp 2024-04-23 07:47:11 +07:00
subsurface-time.h core: convert filter_constraint_data_to_string to C++ 2024-03-10 11:01:42 +13:00
subsurfacestartup.cpp core: make getCloudURL() return an std::string 2024-04-23 07:47:11 +07:00
subsurfacestartup.h mobile: turn testqml into a std::string 2024-03-10 11:01:42 +13:00
subsurfacesysinfo.cpp cleanup: refactor subsurfacesysinfo.cpp 2020-10-27 16:18:09 -07:00
subsurfacesysinfo.h cleanup: refactor subsurfacesysinfo.cpp 2020-10-27 16:18:09 -07:00
table.h core: fix memory leak in tables code 2024-03-07 07:55:23 -05:00
tag.cpp core: use C++-primitives for g_tag_list 2024-04-23 07:47:11 +07:00
tag.h core: use C++-primitives for g_tag_list 2024-04-23 07:47:11 +07:00
taxonomy.c cleanup: make taxonomy_index_for_category() local to taxonomy.c 2020-09-06 12:59:54 -07:00
taxonomy.h cleanup: make taxonomy_index_for_category() local to taxonomy.c 2020-09-06 12:59:54 -07:00
time.cpp core: convert filter_constraint_data_to_string to C++ 2024-03-10 11:01:42 +13:00
timer.c
timer.h
trip.c core: replace SSRF_INFO macro by report_info() 2024-03-12 10:31:07 -04:00
trip.h selection: avoid select_dive() and deselect_dive calls in dive list 2023-04-16 20:23:59 +02:00
uemis-downloader.cpp uemis-downloader: convert strings to std::string 2024-05-07 22:34:00 +12:00
uemis.c Refactoring: Improve Naming of FRACTION and SIGNED_FRAC defines. 2024-05-02 20:36:26 +02:00
uemis.h
units.c core: convert parse-xml.c and parse.c to C++ 2024-03-10 11:01:42 +13:00
units.h Refactoring: Improve Naming of FRACTION and SIGNED_FRAC defines. 2024-05-02 20:36:26 +02:00
unix.cpp core: use range based for and std::string in enumerate_devices() 2023-06-03 12:54:24 +02:00
uploadDiveLogsDE.cpp Replace remaining qDebug()s by report_info() 2024-04-23 07:47:11 +07:00
uploadDiveLogsDE.h export: clean up temp file after divelogs.de upload 2021-08-06 11:05:06 -07:00
uploadDiveShare.cpp core: enable compiler warngings for report_error and report_info 2024-03-12 10:31:07 -04:00
uploadDiveShare.h
version.c Complete redesign of Subsurface version numbers 2024-01-06 10:55:24 -08:00
version.h retire the mobile version 2024-01-06 10:55:24 -08:00
videoframeextractor.cpp core: enable compiler warngings for report_error and report_info 2024-03-12 10:31:07 -04:00
videoframeextractor.h
webservice.h
windows.cpp cleanup: replace fprintf to stderr by report_info() 2024-04-23 07:47:11 +07:00
windowtitleupdate.cpp
windowtitleupdate.h
worldmap-options.h
worldmap-save.cpp core: add compile time format check to format_string_std 2024-04-23 07:47:11 +07:00
worldmap-save.h
xmlparams.cpp core: add a small helper-struct that keeps track of xml-parameters 2020-10-23 18:17:02 -07:00
xmlparams.h core: add a small helper-struct that keeps track of xml-parameters 2020-10-23 18:17:02 -07:00
xmp_parser.cpp
xmp_parser.h