aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-06-09mobile: add DCDeviceData properties to qmlmanagerGravatar jan Iversen
add DCDeviceData qml properties etc. to qmlmanager Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09core: remove qml properties from desktop compileGravatar jan Iversen
add #ifdef SUBSURFACE_MOBILE to secure qml macros are not compiled with desktop Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09mobile: remove context iconsGravatar jan Iversen
Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09mobile: remove png/svg icons not usedGravatar jan Iversen
Delete icons that are taken from kirigami Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09build-system: download libzip from our own serverGravatar Dirk Hohndel
The libzip.org server often times out and causes build failures. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-06-09ios: concentrate build dirsGravatar jan Iversen
update build.sh to make all builds in build-ios to keep the git dir as clean as possible Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09ios: share clones with desktopGravatar jan Iversen
Change src dir for clones to subsurface/.. in order to share with desktop Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09profile: make profile self containedGravatar jan Iversen
move qmlprofile.* to profile dir, to keep all parts of the widget in one place. Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09profile: clean double calls on mobile versionGravatar jan Iversen
Expanded #ifdef MOBILE with #else so that settings are only called once. Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09mobile: clean use of DiveId in qmlprofileGravatar jan Iversen
Remove unused signal and simplify qml access to m_diveId Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09mobile: do not call plotDive during startupGravatar jan Iversen
Check in profile if visible before calling plotDive Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09mobile: white space clean in DiveDetailsView.qmlGravatar jan Iversen
Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09Cleanup: make lastUsedDir() functions static and non-slot, respectivelyGravatar Berthold Stoeger
The lastUsedDir() functions of MainWindow and Smrtk2ssrfcWindow don't use any member-objects and are only used in their respective translation units. Therefore, remove them from the class and made of static linkage. The lastUsedImageDir() function was declared as a slog, which makes no sense. Make it a normal static function (though one might argue why it is assiociated with the DiveListView class in the first place). Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-06-08mobile: decoupled ssrf.qrc and mobile.qrcGravatar jan Iversen
remove /subsurface.qrc from .pro copy missing mapwidget icon references to mobile-resources.pro Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-08mobile: main.qml, change load of dive.jpgGravatar jan Iversen
change load of dive.jpg to reflect new location. Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-08mobile: mobile unreferenced ic iconsGravatar jan Iversen
Remove 24px icons not referenced. update README.license Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-08mobile: remove unneeded alias from mobile-resourcesGravatar jan Iversen
remove alias where alias == file rename *24px* icons and remove alias Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-08mobile: clean qml dir (move dive.jpg to icons)Gravatar jan Iversen
Cleanup qml dir by moving dive.jpg to the icon dir Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-08mobile: sort mobile-resources.qrcGravatar jan Iversen
Sort to make it easier to read. Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-08Provide correct cylinder pressures for bailout divesGravatar Willem Ferguson
Calculate the correct cylinder pressures for rebreather dives with bailout. Currently the cylinder pressures for a dive are calculated assuming a single dive mode for that dive. Bailout indroduces more than one dive mode for a single dive, i.e. transitions from CCR or PSCR to OC and back. Currently the start and end pressures for each cylinder are used to interpolate cylinder pressures while that cylinder is used. However, the different gas consumption rates for OC, PSCR and CCR are not taken into account in this interpolation and the cylinder pressure is indicated by an averaged interpolation accross the rebreather and OC legs of the dive. Consequently the increased drop in cylinder pressure during OC is not shown. This PR allows differentiation between CCR/PSCR legs of the dive and the OC bailout segments, showing realistic interpolation that indicate the increased rate of gas use during OC. Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
2018-06-07mobile: correct comboProduct if model changesGravatar jan Iversen
update onModelChanged in comboProduct to read the current index Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-07iOS: move get-dep-lib outside ARCH loopGravatar jan Iversen
Fetch all 3rd party libs before entering ARCH loop Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-07Dive pictures: remove cache_picture() call in dive_add_picture()Gravatar Berthold Stoeger
When adding a picture to a dive, cache_picture() was called, which calculated the hash of the picture in a background-thread. This made tests occasionally fail, because the tests depended on the filename-to-localfilename being overwritten in a call running in a different thread. Depending on which thread finished first, the test succeeded or failed. The easiest way to circumvent this problem is to remove the cache_picture() call. The hash will be calculated anyway with the thumbnails. And the only function of the hash is the "find moved images" function. Which is not an issue here, because the user just loaded the images from disk. Reported-by: Jan Iversen <jani@apache.org> Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-06-06Bugfix: Load PSC dive logsGravatar Willem Ferguson
The code changes to standardise the named of divemodes and to separate internal divemode names and UI divemode names introduced a bug that caused non-backward compatability with existing dive logs. The reason for this is the definition of the divemode_text strings in dive.c This change reverses that definition and brings about correct loading of PSCR dive logs as well as correct parsing of bailout events involving PSCR. Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
2018-06-05core: remove "static void copyPath" unusedGravatar jan Iversen
Remove copyPath since it is static and not called to avoid clang warning Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-04Dive picture: fix toggling of picture-visibilityGravatar Berthold Stoeger
In a recent commit, the profile widget was changed to reuse DivePictureItems. This made toggling of picture-visibility disfunctional, because the visibility was set in the constructor. Only on change of dive would the setting take effect. Therefore, move the setting of the visibility up to the ProfileWidget2::plotPictures() call. This is more consistent anyway, since at this level pixmap and fileUrl are set. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-06-04core: remove unused function getDetectedDeviceAddress()Gravatar jan Iversen
getDetectedDeviceAddress is not used in mobile or desktop version Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-04mobile: delay combobox selection for download.Gravatar jan Iversen
Set index of comboboxes in Download screen when the page becomes visible instead of when it is created. The pages is created before QBluetoothDeviceDiscoveryAgent on iOS and desktop, therefore combobox indexes cannot be set during page creation. Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-04Cleanup: fold core/helpers.h into core/qthelper.hGravatar Berthold Stoeger
helpers.h included qthelper.h and all functions declared in helpers.h were defined in qthelper.h. Therefore fold the former into the latter, since the split seems completely arbitrary. While doing so, change the return-type of get_dc_nichname from "const QString" to "QString". Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-06-04Cleanup: make copyPath() function of static linkageGravatar Berthold Stoeger
The function was only used in core/qthelper.cpp Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-06-04Profile: open pictures using local file pathGravatar Berthold Stoeger
Make the behavior of the profile-pictures consistent with the pictures in the photos-tab: Use the local file path to open the picture in the system viewer instead of the canonical filename (which might point to a non-existing location). Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-06-01user-manual: add note that some Grantlee variables need '|safe'Gravatar Lubomir I. Ivanov
Grantlee variables need the '|safe' extension, so that they can use HTML tags. Without it, tags like '<br>' would not be converted to line breaks - e.g. when exporting planned dive notes. Add a note about that in the user manual. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2018-05-31Desktop: Derive UserManual from QDialogGravatar Berthold Stoeger
In commit d21d42b69117aae04b68ecc9cc2139e034bde146 helpView was made a child-object of MainWindow, which is Qt's idiomatic way of having helpView deleted with MainWindow. As an unintended consequence, the helpView didn't show. The reason is that UserManual derives directly from QObject. In contrast, UserSurvey derives from QDialog and is correctly shown. Therefore also derive UserManual from QDialog. Reported-by: Willem Ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-05-31User Manual: add text for bailout using PSCRGravatar Willem Ferguson
As the title says. A few tiny other changes to the user manual as well. Corrected a some typos (Thanks, @neolit123). Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
2018-05-30mobile: add timer to measure startup.Gravatar jan Iversen
Subsurface-mobile has a long startup time; in order to isolate the problem(s) a timer is added to see where time is "lost". The collected startup times are added to the clipboard together with the other logs, allowing test users to report back. All this is only enabled when compiling with -DENABLE_STARTUP_TIMING Closes #1340 [Dirk Hohndel: collapsed multiple commits and minor white space cleanups, added missing QMutex variable] Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-29desktop: use QElapsedTimer to measure timeGravatar jan Iversen
QElapsedTimer is the preferred timer for measuring time so lets use it. Signed-off-by: Jan Iversen <jani@apache.org>
2018-05-28User manual: Add text for dive planning CCR with bailoutGravatar Willem Ferguson
Three images added as well as text. Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
2018-05-28Planner: Don't store a setpoint unless we are in CCR modeGravatar Robert C. Helling
Signed-off-by: Robert C. Helling <helling@atdotde.de>
2018-05-28Don't compute SAC if total gas use is unknownGravatar Robert C. Helling
If we breathe from a cylinder with invalid start or end pressures, we cannot reliably compute the total gas use and thus the SAC. So we should not pretend to do so. A better fix would compute the total SAC for only those segements that have valid start and end pressures. Reported-by: Stefan Fuchs <sfuchs@gmx.de> Signed-off-by: Robert C. Helling <helling@atdotde.de>
2018-05-28Rename confusing variable nameGravatar Robert C. Helling
This is a struct dive pointer not a divepoint. Signed-off-by: Robert C. Helling <helling@atdotde.de>
2018-05-28Distinguish between user and internal divemode namesGravatar Robert C. Helling
The former should be translated but not those that go to xml/git. ... and fix capitalization of pSCR. Suggested-by: Stefan Fuchs <sfuchs@gmx.de> Signed-off-by: Robert C. Helling <helling@atdotde.de>
2018-05-27mobile: make list action buttons appear againGravatar Murillo Bernardes
Dive list: on holding an item, the delete button was not showing the icon. Show GPS fixes: when swiping an item icons were not being shown. Partial for bug #1267 Signed-off-by: Murillo Bernardes <mfbernardes@gmail.com>
2018-05-27Remove unnecessary {}Gravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2018-05-27Shearwater import: avoid running atoi multiple timesGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2018-05-27changelogGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2018-05-27Shearwater import: support for DC reported ceilingGravatar Miika Turkia
This adds support for DC reported ceiling when importing the Shearwater Desktop database. Both AI and non-AI versions are tested, but not all possible paths. For non-AI the DC reported ceiling was from firstStopDepth and for the AI version it was from the decoCeiling field. I do not currently know when each of these fields are used, but at least this works on my test data. Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2018-05-27Shearwater import: add support for DC reported ceilingGravatar Miika Turkia
This adds stopdepth, stoptime and in_deco attributes on Shearwater XML import. The output from the XSLT is very verbose (these values are printed for each sample), but as Subsurface cleans things up, there is no need to do any more magic on XSLT side. Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2018-05-27Shearwater import: include NDL only if not zeroGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2018-05-27Shearwater import: new format for DC infoGravatar Miika Turkia
Include the DC info into settings and refer to that in each dive. Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2018-05-27Dive pictures: automatically recalculate thumbnailsGravatar Berthold Stoeger
If a thumbnail and the original picture can be accessed and the modification date of the thumbnail is before the modification date of the picture, recalculate the thumbnail. This causes more disk access and might give strange effects for picture files with messed up file timestamps (i.e. lying in the future) or messed up computer clocks (i.e. running in the past). Therefore, add a preference option to disable the new behavior. Default is set to enabled. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>