Commit graph

6133 commits

Author SHA1 Message Date
Dirk Hohndel
1d0193c62e Small whitespace fix
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-07-01 09:29:01 -07:00
Dirk Hohndel
6548773ad6 Implement a cache for the scaled images
No point in scaling them every time the user looks at the dive. Over time
this may waste some memory (especially if people have a ton of pictures
and let the process run a very long time). For now I won't worry about
that.

Fixes #577

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-07-01 09:02:10 -07:00
Anton Lundin
2af7aefd73 Clarify the gaschange icon
This removes the white circle in the backround of the gaschange icon.
This makes it stand out a bit less but looks better to me.

This also fills in the black part on the cylinder neck.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-07-01 07:10:38 -07:00
Robert C. Helling
496f658838 Show subsurface logo in dive plan print out
A little bit of CI: Print our logo on the print out dive plan.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-07-01 07:05:12 -07:00
Robert C. Helling
1b7abab9b9 Show ascent gas consumption separately in planner
In the worst gase you have to provide gas for your buddy during all the
ascent. So you should have the amount of gas used in ascent as a reserve.
This patch makes the planner notes display that value separately.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-07-01 07:05:01 -07:00
Joakim Bygdell
2766ed8093 fix tab step order in planner settings.
--f46d04426a604016a404fd1cd218
Content-Type: text/plain; charset=UTF-8

Tab step order should follow a logical order, top to bottom, left to right
and not jump around.

--
//Jocke

<div dir="ltr">Tab step order should follow a logical order, top to bottom, left to right and not jump around.<br><br clear="all"><div><br>-- <br><div>//Jocke</div>
</div></div>

From e8ff7986f858403fb4f5277741c9fa528962f9bc Mon Sep 17 00:00:00 2001
From: Joakim Bygdell <j.bygdell@gmail.com>
Date: Tue, 1 Jul 2014 09:28:23 +0200
Subject: [PATCH] Fix tab step order in planner settings.

Tab step order should follow a logical order, top to bottom
left to right.

Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-07-01 07:01:44 -07:00
Dirk Hohndel
37ee0baf58 Main Window: start showing dive list and globe
Fixes #571

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 20:53:53 -07:00
Tomaz Canabrava
1ac0b00662 Only replot the dive if maxDepth > oldMaxDepth on plan / add mode.
This fixes the "impossible to work with" planner with the mouse
now the dive will only grow and not shrink untill you release
the mouse.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 16:06:53 -07:00
Tomaz Canabrava
4da7dee8cf Better colors for Add and Plan modes.
Those are ligther colors and it should be a better choice
a way better choice is to ask for a designer wich color to use
but most of my minions are busy.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 16:06:41 -07:00
Tomaz Canabrava
f610662edb Revert Date widget to default in Qt
The new one, while it's prettier, doesn't fit into the
current layout in a good way, we need a better layout for
it. So it's code will continue as dead code for a while.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 16:06:32 -07:00
Tomaz Canabrava
a17537ed50 Selects the dive date before showing it up.
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 16:06:18 -07:00
Tomaz Canabrava
274f2bf124 Added a shortcut 'ESC' to close the calendar widget
This hides the calendar widget when the user press esc
when it's running.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 16:06:05 -07:00
Tomaz Canabrava
facf6e4b59 Calendar widget should hide when clicking somewhere else
This patch adds a event filter to hide the calendar
widget when it loses focus

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 16:05:43 -07:00
Tomaz Canabrava
927bc5d601 Fixed SearchBar layout and icons
This is almost a rewrite of the Search function on the WebView
the old code had a few uneeded things, mostly being a subclass
of QMainWindow instead of the QWebView - this makes the code
use a tiny bit less ram.

The SearchBox was also moved to an own class ( we can use it
later to filter the contents of the DiveList for instance )

and a forced use of the pixmaps for the Mac and Windows platform
was added.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 16:04:24 -07:00
Tomaz Canabrava
4c7ea24921 Align the texts on the Left inside of Right for the DiveList
The Qt Framework adds a visual 'tab' on the children of a
node, but if we forced a right alignment on them, it will
lose that.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 16:03:46 -07:00
Dirk Hohndel
fd22e8123b User survey: detect the machine the app is running on
We build 32bit Windows binaries - but we really want to know if the OS is
x86_64 or i386. This little hack should give us that information.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 15:54:49 -07:00
Dirk Hohndel
5149bc0df8 User survey: don't ask more than once per invocation
Otherwise when the user selects "Ask Again" they will get asked when they
change preferences.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 14:42:48 -07:00
Dirk Hohndel
8315f44d2c Merge branch 'survey' 2014-06-30 14:06:03 -07:00
Dirk Hohndel
e4a88db7dc Fix Qt4 build
Strangely no problems on Qt5 without those declarations.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 14:05:02 -07:00
Dirk Hohndel
b2f473d927 User survey: actually collect and send the data to the backend
This switches the QTextEdit fields to QPlainTextEdit (I don't see a reason
why we should allow HTML here), no longer tries to have a default text but
instead adds labels for the two fields, connects the UI so th data is
collected and uses a bastardized WebServices subclass to send the data to
our backend.

Fixes #546

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 12:30:46 -07:00
Miika Turkia
5b93c61348 Small white space tune-up on JS file
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 08:01:11 -07:00
Gehad elrobey
3a28507dc1 HTML: Show nice values when pressure is not available
Show nice values instead of the undefined when the pressure is not
available.

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 08:00:59 -07:00
Gehad elrobey
a110b2858d HTML: Fix listlib whitespace errors.
Fix some code style and whitespace errors.

[Dirk Hohndel: one hunk didn't apply as there was no such code...?]

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 07:59:53 -07:00
Gehad elrobey
023187a73e HTML: Use jqplot to draw profile.
Use jqplot to draw dive profile, Depth and pressure curves. add the
library Javascript files under the theme directory and editing the
exporter. Load them to the HTML template dynamically with
synchronization as they are dependant on each other.
Also Adding min version of JQuery that is needed by the library.

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 07:56:47 -07:00
Gehad elrobey
ac46158d65 HTML: some css enhancment
Detailed dive view needs more padding just to view normally.

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 07:56:43 -07:00
Gehad elrobey
f139eff590 HTML: Add temperature and pressure curves to the JSON data.
Add more dive sample details to the JSON data.
This is not so optimized some zero values can be ignored.

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 07:56:35 -07:00
Gehad elrobey
60049941ba HTML: dive list must remember the last dive in display
When switching between dives in detailed view, The dive list must be
switched too.

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 07:56:25 -07:00
Gehad elrobey
10345d62fc HTML: export dive events to detailed view
Add table of dive events to the dive detailed view. This should view
each event, its type and the time this event took place.

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 07:56:12 -07:00
Robert C. Helling
b438158693 Make the planner settings respond well to unit system changes.
[Dirk Hohndel: removed printf/qDebug() debug output]

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 07:27:17 -07:00
Willem Ferguson
bbfe20a412 User manual: Spelling, typos
The user manual was spell-checked against the Oxford Dictionary.
Almost all the joined words, e.g. checkbox, dropdown, were
kept, but divelog was changed to dive log. Quite a few tyops
and spelling errors corrected.

A short section on dive plan evaluation was deleted on Robert's
suggestion.

Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30 07:21:01 -07:00
Dirk Hohndel
bc1e9edd5d Image time shift dialog: remove the silly AM
This is a time offset, not a time of day.

Fixes #579

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29 19:31:42 -07:00
Dirk Hohndel
abb9a6c12d Globe: don't show the location edit message after aborting plan
For some reason the isVisible() check failed, even though the message is,
indeed, visible. But it doesn't seem to hurt to unconditionally hide the
message, so I'm doing that instead.

Fixes #576

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29 17:45:11 -07:00
Linus Torvalds
e92576600b Parse git-format picture data
This adds the loading of picture data from git repositories too.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29 17:18:09 -07:00
Linus Torvalds
5b311abfb5 git-format: save dive picture data
This doesn't actually parse the data at load time yet, but I need a save
file to do that..

The diff looks larger than it is because this moves the "mktree()"
function up earlier to be used by the picture saving code.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29 17:17:57 -07:00
Anton Lundin
537beb319b Only calculate deco stops, TTS and NDL every 30s
This introduces a limiter that we only calculate deco stop, TTS and NDL
with a minimum of 30s intervall and just reused the values from the
previous sample in other cases.

I run my OSTC3 at 2s sample intervall so this is a 15x speedup in that
case.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29 17:16:43 -07:00
Anton Lundin
b2288e1e3d Calculate approx gas bill on dives
This uses a bit of naive gas computations to figure out how much of
different base gases you used up on the dives the statistics is done for.

It's quite useful to get a minimum line about how big your gas bill is
going to be after a dive trip.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29 17:15:09 -07:00
Willem Ferguson
c020cda41b Update of user manual
Several updates are implemented here.

1) Updates to the dive planner section, following excellent
suggestions from Rob.

2) Updates reflecting the date picker, including hitting ESC
to close the calendar.

3) The edit of device names.

4) Several small or typographic edits

Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29 09:44:28 -07:00
Dirk Hohndel
abd4fb0991 MainTab: make the tag widgets play nicer with large fonts
Doing this I noticed that the dive list doesn't like huge fonts, either.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29 09:07:31 -07:00
Dirk Hohndel
4de78729d7 Maintab: make design more fluid
I'm not sure I love the result just yet - the different fields don't quite
stretch in a natural way (i.e., they don't stretch proportionally), but at
least eventually they all stretch.

Fixes #569

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29 09:00:41 -07:00
Willem Ferguson
de8dbf2dad Updates to user manual: Preferences and Main menu
This patch updates the section on Preferences to accommodate
the newer additions to this Panel.
(Three images removed, five images inserted)

The section dealing with the desciption of all the main menu items
is updated.

One small change to the FAQ section.

A few small typo edits elsewhere in manual.

Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29 08:36:07 -07:00
Robert C. Helling
a9b030ed44 Fixed SAC in planner
When I moved the settings for SAC's from the planner to the plannerSettings widget
I forgot to move the corresponding methods from one class to the other.

This fixes the display of the gas consumption in the planner

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29 08:35:37 -07:00
Henrik Brautaset Aronsen
0f535620e4 Don't translate HTML tags
We were sending HTML tags to translate() in worldmap-save.c

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29 08:34:24 -07:00
Anton Lundin
5617f36ed8 Surface pressure is in mbar, not bar
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29 08:33:02 -07:00
Dirk Hohndel
816a78f5ba Profile: show dive computer nickname instead of model
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29 08:31:37 -07:00
Dirk Hohndel
b1e50fb157 Profile: change event icon for gaschange
This is not ideal, but it gets us closer to what we need.

Fixes #556

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28 21:07:39 -07:00
Dirk Hohndel
7f783e2147 Profile: remove old picture event handling code
We now handle pictures differently.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28 20:54:01 -07:00
Willem Ferguson
f1f16b224b User manual: add more about dive log export.
This patch updates the information about dive log export.
Export to Worldmap, as well as to HTML are covered.

Small typo corrections elsewhere in the manual.

Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28 16:01:59 -07:00
Willem Ferguson
dd9d68a359 User manual: Load photographs
This patch adds text and figures to the user manual, explaining how to
add photographs to the dive profile.

A 2-sentence paragraph was added to the dive planner text, detailing
planning for repetitive dives.

Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28 16:01:48 -07:00
Willem Ferguson
2292abd552 User manual: add text for the dive planner
Text for the dive planner has been added to the user manual.
This includes two new images.

Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28 16:01:38 -07:00
Dirk Hohndel
3ef490fe11 Fix crash when cancelling a trip edit
We were comparing the wrong data and freeing things that shouldn't be
freed.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28 13:42:38 -07:00