Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: master
Commits on Sep 6, 2011
  1. @torvalds

    Tweak the "show depth in text" heuristic a bit

    torvalds authored
    Use a 10-minute window *or* when the depth has reversed sufficiently to
    make the max we've found interesting.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. @torvalds

    Plot some numerical depth markers

    torvalds authored
    Add some actual numbers to the depth plot too.  Do it by finding the
    deepest points (within a five-minute rolling window), and show the
    depths of those points.
    
    Sure, we could have just labeled the depth markers, but this seems
    nicer. But what do I know - I'm not exactly famous for my GUI design.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @dirkhh @torvalds

    Fix drawing artifact with UEMIS xml data

    dirkhh authored torvalds committed
    Only draw the pressure line to the final data point
    (duration / end.mbar) if we haven't already drawn samples
    past that point (as the UEMIS records pressure data for a
    number of additional samples after the actual dive has ended)
    
    Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
    [ Changed to use 'last actual drawn sample time that had pressure
      data' instead of 'last sample time'  - Linus ]
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @torvalds

    Repaint the dives in dive_list_update_dives() instead of in callers

    torvalds authored
    Each caller ends up needing it, and I missed another one.  So rather
    than update the other caller, just do it in dive_list_update_dives() and
    we can stop worrying about it.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @dirkhh @torvalds

    update UEMIS date_time parsing

    dirkhh authored torvalds committed
    Looks like Linus misinterpreted the first UEMIS xml files I sent him.
    
    The date_time appears to be in local time - so the time zone info can be
    ignored (that seems strange, but it worked for the dives I tested it
    with)
    
    Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @torvalds

    Update dive info and profile after loading files

    torvalds authored
    We did this when loading from the command line, but not when loading
    through the file load menu item.
    
    Reported-by: Dirk Hohndel <dirk@hohndel.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Sep 5, 2011
  1. @torvalds

    Merge branch 'open-files' of git://github.com/nathansamson/diveclog

    torvalds authored
    * 'open-files' of git://github.com/nathansamson/diveclog:
      Report errors when opening files
      Make it possible to load multiple files at once.
      Open File works. I refactored the code and introduced a new type. I never used it as a pointer (their was no real reason), but I'm not really satisfied.
  2. @torvalds

    Add support from importing from Diving Log xml files

    torvalds authored
    This is just a very rough draft.  It imports all the main stuff I
    noticed, but I'm sure it drops a ton of other stuff.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. @torvalds

    Make the import source an enumeration

    torvalds authored
    Instead of having each import source recognition routine set a separate
    flag for that import source, just enumerate them and set them in one
    variable.
    
    I'm adding yet another xml importer - divinglog.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. Report errors when opening files

    Nathan Samson authored
    Signed-off-by: Nathan Samson <nathansamson@gmail.com>
  5. Make it possible to load multiple files at once.

    Nathan Samson authored
    Signed-off-by: Nathan Samson <nathansamson@gmail.com>
  6. Open File works. I refactored the code and introduced a new type. I n…

    Nathan Samson authored
    …ever used it as a pointer (their was no real reason), but I'm not really satisfied.
    
    Signed-off-by: Nathan Samson <nathansamson@gmail.com>
  7. @torvalds

    Parse Uemis cylinder data correctly.

    torvalds authored
    There's a big comment there now about what is going on.  It took me a
    while to understand how the crazy seven-tank uemis dive computer
    information actually works.
    
    So the Uemis computer has 4 different "tank profiles":
     - single tank air (0)
     - single tank nitrox (1)
     - two-tank nitrox (2)
     - three-tank nitrox (3)
    and the computer always lists all seven tank cases (because that's how
    you fill them in).
    
    Depending on the "gas.template" you are supposed to then *use* just one
    particular profile.  Why the computer doesn't just give you the tanks
    for that one profile, who knows? It seems to be more of the same "Uemis
    dive data isn't so much about the dive, it's about dive computer state"
    mentality.
    
    So we first get the profile information, and then based on that we need
    to pick the right tanks from the set of seven that we're presented with.
    
    All clear?
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. @torvalds

    Turn dive depth, temperature and duration into xml attributes

    torvalds authored
    This makes the xml save-file look way nicer: it's both smaller and
    better organized.  Using individual xml nodes for random small details
    is silly.
    
    The duration even parses exactly the same, because it still ends up
    being '.depth.duration' (now it's the 'duration' attribute of the dive
    node, it used to be the 'duration' child node of the dive node).
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. @torvalds

    Sanitize and fix cylinder pressure overview

    torvalds authored
    Doing per-dive cylinder start/end pressures is insane, when we can have
    up to eight cylinders.  The cylinder start/end pressure cannot be per
    dive, it needs to be per cylinder.
    
    This makes the save format cleaner too, we have all the cylinder data in
    just one place.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. @kotnik

    Comment typo fix

    kotnik authored
    Signed-off-by: Nikola Kotur <kotnick@gmail.com>
Commits on Sep 4, 2011
  1. @torvalds

    Zebra-color the divelist

    torvalds authored
    ..as suggested by Nathan:
    
      "I also wanted to "zebra" color the divelist by setting the rules-hint
       to TRUE.  but I noticed it was already set explicitly to FALSE (even
       if this is the default).
    
       If this is just an accidental copy paste from some tutorial you can
       experiment (set it to TRUE) and see what you like most."
    
    It was indeed just copy-paste from some tutorial, and the zebra-coloring
    does look nicer, doesn't it?
    
    Suggested-by: Nathan Samson <nathansamson@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. @torvalds
  3. @torvalds

    Save milli-units with variable precision

    torvalds authored
    Instead of always using three decimal digits, use 1-3 digits.  But do
    use at least one, even for integer numbers, just because it makes it so
    much clearer that we're dealing with potential fractional values.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @torvalds

    Use common helper for printing milli-units

    torvalds authored
    I don't necessarily want to show three decimal digits when one or two
    would do. So prepare for that by using a helper. This doesn't actually
    change the printout yet.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @torvalds

    Properly save/restore cylinder description string

    torvalds authored
    We saved it under the wrong name, and didn't restore it at all. Fix.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @torvalds

    Parse uemis cylinder data

    torvalds authored
    This is some seriously crazy stuff.  Instead of making sense as a
    divelog, the uemis xml makes more sense as a "dive computer settings
    dump".
    
    And I guess I can see why they'd do that.  But it makes parsing it just
    incredibly annoying.  The thing is more of a "these are the
    configurations I support as a dive computer thing" than a "this was the
    tank you were diving with".
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. Right align the numbers

    Nathan Samson authored
    Signed-off-by: Nathan Samson <nathansamson@gmail.com>
  8. @torvalds
  9. @torvalds

    Make a guess at the cylinder description from the size and pressure

    torvalds authored
    I'll want to also add a way to override/set the cylinder type: both
    manually by just setting a size in liters, and by picking from some list
    of standard cylinder sizes.
    
    For example, it looks like most of my dives are marked as having
    12-liter cylinders.  That is probably some default from Suunto Dive
    Manager, or from whatever Dirk did.  It's almost certainly not right for
    any of them: as far as I know, the standard cylinders for Lahaina Divers
    (which is likely most of the warm water dives) are AL72's for air, and
    AL80's for Nitrox.
    
    That would be a 10L and a 11.1L tank respectively, afaik.  I don't know
    what a 12-liter tank would be or where that size comes from.
    
    Anyway, the LP85+ tank designation for some of the dives looks more
    likely: that's one of the common sizes I've used for local dives.  So
    the size of that thing is much more probably correct.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. Merge hbonse's UI tweaks, but fixing the compile warnings. Also bring…

    Nathan Samson authored
    …ing it up to date with the master (and my own UI improvements)
    
    Signed-off-by: Nathan Samson <nathansamson@gmail.com>
  11. @torvalds

    Clean up 'fixup_dive()' a bit

    torvalds authored
    We don't want to override potentially more exact values for water
    temperature etc either.  The sample save interval may be longer than
    some internally kept state of key per-dive values like that.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. @torvalds

    Generate date string for the dive list dynamically

    torvalds authored
    .. and sort based on the 'time_t' value itself.
    
    This allows us to use a more compact date format that doesn't need to
    sort alphabetically, because sorting by date is always based on the date
    value.  So we can use just a two-digit year, and skip the seconds, to
    keep the column narrow, while still sorting correctly.
    
    Also, "Depth" is a nice header string, but it is wider than the column
    itself, which makes the whole column wider than necessary.  So put the
    units in the header instead of in the string, keeping things narrow.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. @torvalds

    Merge branch 'ui-improvements' of https://github.com/nathansamson/div…

    torvalds authored
    …eclog
    
    * 'ui-improvements' of https://github.com/nathansamson/diveclog:
      Split the dive list in columns. Columns are sortable now (name = date, depth, duration)
      Remove the redundant frames in the notebook. Closes #9
      Use a pane so the dive list can be made wider or smaller to the users wishes
  14. @torvalds

    Merge branch 'compiler-warning' of https://github.com/nathansamson/di…

    torvalds authored
    …veclog
    
    * 'compiler-warning' of https://github.com/nathansamson/diveclog:
      Removed the unused startemp and enttemp calculations. This fixes a compiler warning too.
    
    Fix up trivial conflict in dive.c due to the temperature simplification
    (commit 9961c7f: "Remove redundant temperature readings").
  15. @torvalds

    Add placeholder for cylinder type description

    torvalds authored
    So we don't want to save working pressure, but cylinder type knowledge
    would be lovely and useful.  And we can probably make a good initial
    guess, or at least let people fill it in later.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. @torvalds

    Don't save cylinder working pressure

    torvalds authored
    It was a mistake to save it - and I did it just because other dive
    managers did.  It's a totally nonsensical measure, and nobody cares.
    The only thing that matters is the size of the cylinder, and the
    *actual* pressures.  Those give actual air consumption numbers, and are
    meaningful and unambiguous.
    
    So the "working pressure" for a cylinder is pointless except for two
    things:
    
     - if you don't know the actual physical size, you need the "working
       pressure" along with the air size (eg "85 cuft") in order to compute
       the physical size.  So we do use the working pressure on *input* from
       systems that report cylinder sizes that way.
    
     - People may well want to know what kind of cylinder they were diving,
       and again, you can make a good guess about this from the working
       pressure.  So saving information like "HP100+" for the cylinder would
       be a good thing.
    
    But notice how in neither case do we actually want to save the working
    pressure itself.  And in fact saving it actually makes the output format
    ambiguous: if we give both size and working pressure, what does 'size'
    mean? Is it physical size in liters, or air size in cu ft?
    
    So saving working pressure is just wrong. Get rid of it.
    
    I'm going to add some kind of "cylinder description" thing, which we can
    save instead (and perhaps guess standard cylinders from input like the
    working pressure from dive logs that don't do this sanely - which is all
    of them, as far as I can tell).
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  17. @torvalds

    Remove redundant temperature readings

    torvalds authored
    I'm aiming to really differentiate in dive log software by making my XML
    export files be *clean*, dammit.
    
    That means that we don't have random names, we don't have crazy random
    units, and we don't have redundant information.
    
    So when the temperature doesn't change, just don't report it.  That's
    already what "no sample" means, just clean things up.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18. Split the dive list in columns. Columns are sortable now (name = date…

    Nathan Samson authored
    …, depth, duration)
    
    Signed-off-by: Nathan Samson <nathansamson@gmail.com>
  19. @hbons

    Some UI beauty patches:

    hbons authored
    Uppercase first letter for each label word
    Tweak the paddings for easier reading
    Rename File menu to Log menu
    Add a separator before Quit in the Log menu
    Remove frame in extended diving info and add 6px padding
    
    Signed-off-by: Hylke Bons <hylkebons@gmail.com>
Something went wrong with that request. Please try again.