summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-07-14Location completer: give distance if knownGravatar Dirk Hohndel
If both the displayed dive and the dive site which is shown as a potential completion have a GPS fix, indicate the distance. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-13Geo taxonomy: correctly store / update the categoriesGravatar Dirk Hohndel
Don't throw away data unless new data has been received. And don't store multiple copies of the same category. And most importantly, never write past the end of the array. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-13Wait until the BT scanning process is done on Android platformsGravatar Claudiu Olteanu
Block the Save button on Android platforms until the scanning for remote Bluetooth devices is finished. The reason we do that is because there is a bug on the Android platform or on the QtBluetooth library which stops the downloading process and blocks the devices on the Download mode. Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-13Use SPP's uuid to connect to a device on Android platformGravatar Claudiu Olteanu
On Android, a Bluetooth connection to a service cannot be established using a port. Therefore we use the uuid of the Serial Port Profile service to connect to the remote BT device. Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-13OSTCTools - Improve error management (II)Gravatar Salvador Cuñat
Have just found a .dive file in H&W forum which is not correctly parsed by libdivecomputer due (I think) to a bug in OSTC3 FW 1.77 (corrected). If libdc fails to parse a file (whatever is the reason) and the header hasn't been parsed, strcmp(ptr->key, "Serial") will segfault, so avoid comparison if there is no ostcdive->dc.extra_data but set the serial data as we know it from ostctools. Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-13Divinglog import: stop (deco) time addedGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-13Divinglog import: include NDL informationGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-13Divinglog import: show stop depth / ceilingGravatar Miika Turkia
This shows the ceiling as stored by Divinglog. (I am not sure if it is DC reported ceiling, or just a calculated one.) Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-13Divinglog test diveGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-13Divinglog import: include heartbeat infoGravatar Miika Turkia
Note, that this patch is not tested with real data as I do not have log that would include heartbeat available. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-13Update Android build scriptGravatar Dirk Hohndel
This now includes OpenSSL so we can actually use cloud storage (which requires https transport). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-13Android build: statically link against libssl and libcryptoGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-13Cloud storage: recognize our server certificate and accept itGravatar Dirk Hohndel
On some platforms like Android the installed root certificates are rather inconsistent. Same goes for older Windows machines. Instead of trying to figure out how to get the user to install the right root certificates (just kidding) we explicitly recognize our own server certificate and allow that to override the validity assessment by the OS. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-13Cloud storage: provide more information in debug buildsGravatar Dirk Hohndel
It makes sense to hide git URLs from the end user in release builds, but while developing and testing it's better to get more detailed information. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-13Fix memory handling for taxonomy dataGravatar Dirk Hohndel
The way we freed things and cleared out the variables potentially left dangling data behind and could end up calling free on garbage data, leading to random crashes. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12QML UI: implement a message area to show information to the userGravatar Dirk Hohndel
This is just a quick first stab to do this, but it at least allows us to share some information with the user. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12QML UI: explicitly reference the button for sizeGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Whitespace cleanupGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12OSTCTools - change management of model and dc familyGravatar Salvador Cuñat
H&W introduced some changes in dc's data structures with FROG and OSTC3 families (types 0x22 and 0x23 in H&W's terms) that I didn't take into account as we lacked of .dive files to test. BTW I previously set the model to "0" as it was not stored in the file but wasn't relevant for the data parsing in MK2, OSTC and OSTC2N/2C models. Thanks to Anton's advice we have got some OSTC3 dives to test, so this patch takes into account the different data structures for different families, and try to stablish a model number based on device's serial number, as libdc does. Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12OSTCTools - Improve error managementGravatar Salvador Cuñat
- Introduce an exit point to cowardly run away from the file if something goes wrong (undefined dc family, inconsistent family/model pair, etc), without crashing subsurface. - Simplifies (user point of view) and makes translatables the error messages shown in the status bar. - Modifies ostc_prepare_data() to emit a return code to manage posible failures. Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Use git pull with rebase in build scriptGravatar Henrik Brautaset Aronsen
Without rebase, the build script would stop because it couldn't complete a merge. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: generate gaschange eventsGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: adding pressure samplesGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: grab information for cylinder 0Gravatar Miika Turkia
Cylinder 0 is stored on the Logbook table along with other dive metadata (not in Tank table). Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: use dive ID as identifierGravatar Miika Turkia
Since mapping cylinders requires use of dive ID, we might as well use the ID to map the profile also. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: get cylinder informationGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: import temperature graphGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: add workload warningGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: deco stop ignored event addedGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: ascent warning addedGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: RBT warning event addedGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: in deco?Gravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: parse depth from databaseGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: import a bit more data from DBGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: basic dive info for DB importGravatar Miika Turkia
This parses the basic metadata of a dive when importing Divinglog database. (Discarding deleted dives is my best guess as I do not have that in my sample dive.) Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: hook up processing of .sql filesGravatar Miika Turkia
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: add .sql extension for importGravatar Miika Turkia
Generic divelog might come with the .sql extension, thus adding that to the file filter. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12QML UI: use stackView to show sub windowsGravatar Dirk Hohndel
QML on Android doesn't support multiple windows, so dialogs that work on the desktop are not a good solution on Android. A much more natural way to present sub windows is a stackView. In order to do this Preferences needs to be an item and the structure of the ApplicationWindow needs to change a bit. This also removes the hard coded sizes and instead tries to design this in a resolution independent manner. The diff appears larger than the actual change because of an increase of indentation for the ApplicationWindow content. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12QML UI: improve preferences layoutGravatar Dirk Hohndel
And make it resolution independent. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12QML UI: start making things resolution independentGravatar Dirk Hohndel
Don't hard code sizes as devices tend to have much higher pixel density than desktop computers. Instead make sizes relative to the content. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12QML UI: set window size on desktop devicesGravatar Dirk Hohndel
On Android the app figures out the size by itself. Also change the name to match our naming scheme (Subsurface mobile for the QML UI). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Globe: Remove workarounds for ancient Marble versionsGravatar Dirk Hohndel
We build against our own Marble, anyway. So this isn't needed anymore. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-10Don't show the update messages in the mobile appGravatar Dirk Hohndel
Android provides update notifications already. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-10Cmake: use the mobile icon for Android apkGravatar Dirk Hohndel
The first attempt missed the second spot where this was set. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-10Geo taxonomy: add higher level notion of cityGravatar Dirk Hohndel
This renames the local name for the location as town and adds the concept of a city as the level 3 admin category. In some regions (e.g. at times in Italy) the local hamlet name is shown as toponymName but the name of the actual city is given as adminName3. With this change "city" will always reflect our best guess: adminName3 if it exists, otherwise the toponymName. Whereas "town" is always the toponymName. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-10Git storage: only show geo cat if there is a valueGravatar Dirk Hohndel
Otherwise we could get mangled data since the newline isn't printed. Now a good question would be "why do we have empty values in our data", but either way, we should write invalid data to the git repository. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-10QML UI: whitespace fixGravatar Grace Karanja
Fix some whitespace issues in the QMLManager and DiveListModel classes. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
2015-07-10QML UI: show dive details in TextBoxesGravatar Grace Karanja
Show the dive details in editable text boxes. This will make it easier for the user to edit the displayed information. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
2015-07-10QML UI: move the dive list to a separate fileGravatar Grace Karanja
Move the dive list qml code to a separate file for easier management. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
2015-07-10QML UI: Load dives from cloudGravatar Grace Karanja
Load dives from the Subsurface cloud service using the user's saved credentials. This will display the dives in the same way as loading them from a local file. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>