Changeset dcf2542 in subsurface


Ignore:
Timestamp:
Mar 11, 2017, 8:09:07 AM (7 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
95d5771
Parents:
bdb83fd
git-author:
Martin Měřinský <mermar@…> (03/06/17 04:27:39)
git-committer:
Dirk Hohndel <dirk@…> (03/11/17 08:09:07)
Message:

Use abbreviations with dots.

Files:
18 edited

Legend:

Unmodified
Added
Removed
  • Documentation/user-manual.txt

    raf96ec5 rdcf2542  
    33203320   factors of 20/60 are considered conservative and values of 70/90 are considered
    33213321   harsh.
    3322    In addition decide whether to check the _GFLow at max depth_ box. If checked, GF_Low is used for the
     3322   In addition decide whether to check the _GFLow at max. depth_ box. If checked, GF_Low is used for the
    33233323   deepest dive depth and linearly increased up to the GF_High value at the surface. If unchecked,
    33243324   GF_Low is used between the deepest dive depth and the first deco stop, after which the
     
    45574557contains the names (or titles) of each column and the information for each dive is stored in a single row.
    45584558_Subsurface_ supports many data items (Dive number, Date,
    4559 Time, Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight and Tags).
     4559Time, Duration, Location, GPS, Max. Depth, Mean Depth, Buddy, Notes, Weight and Tags).
    45604560Organize dive data following a few simple rules:
    45614561
  • Documentation/user-manual_fr.txt

    r869a7fc rdcf2542  
    34993499   factors of 20/60 are considered conservative and values of 70/90 are considered
    35003500   harsh.
    3501    In addition decide whether to check the _GFLow at max depth_ box. If checked, GF_Low is used for the
     3501   In addition decide whether to check the _GFLow at max. depth_ box. If checked, GF_Low is used for the
    35023502   deepest dive depth and linearly increased up to the GF_High value at the surface. If unchecked,
    35033503   GF_Low is used between the deepest dive depth and the first deco stop, after which the
  • core/deco.c

    rbd89e33e rdcf2542  
    4444        double gf_low;                  //! gradient factor low (at bottom/start of deco calculation).
    4545        double gf_low_position_min;     //! gf_low_position below surface_min_shallow.
    46         bool gf_low_at_maxdepth;        //! if true, gf_low applies at max depth instead of at deepest ceiling.
     46        bool gf_low_at_maxdepth;        //! if true, gf_low applies at max. depth instead of at deepest ceiling.
    4747};
    4848
  • core/dive.c

    reae4bd8 rdcf2542  
    664664 *
    665665 * Why? Because a dive computer may well actually track the
    666  * max depth and mean depth at finer granularity than the
     666 * max. depth and mean depth at finer granularity than the
    667667 * samples it stores. So it's possible that the max and mean
    668668 * have been reported more correctly originally.
     
    24412441 *
    24422442 * So for example, we'd expect different dive computers to give different
    2443  * max depth readings. You might have them on different arms, and they
     2443 * max. depth readings. You might have them on different arms, and they
    24442444 * have different pressure sensors and possibly different ideas about
    24452445 * water salinity etc.
  • core/units.h

    r7be962b rdcf2542  
    5454 * valid value in a "normal" system without conversion. If the max
    5555 * depth of a dive is '20000', you probably didn't convert from mm on
    56  * output, or if the max depth gets reported as "0.2ft" it was either
     56 * output, or if the max. depth gets reported as "0.2ft" it was either
    5757 * a really boring dive, or there was some missing input conversion,
    5858 * and a 60-ft dive got recorded as 60mm.
  • desktop-widgets/configuredivecomputerdialog.ui

    r46e956a rdcf2542  
    16941694             <widget class="QLabel" name="label_18">
    16951695              <property name="text">
    1696                <string>Max depth</string>
     1696               <string>Max. depth</string>
    16971697              </property>
    16981698             </widget>
  • desktop-widgets/maintab.cpp

    rd36f056 rdcf2542  
    10871087        if (editMode == ADD || editMode == MANUALLY_ADDED_DIVE) {
    10881088                // we just added or edited the dive, let fixup_dive() make
    1089                 // sure we get the max depth right
     1089                // sure we get the max. depth right
    10901090                current_dive->maxdepth.mm = current_dc->maxdepth.mm = 0;
    10911091                fixup_dive(current_dive);
  • desktop-widgets/preferences/preferences_graph.ui

    rc25ca18 rdcf2542  
    254254       <widget class="QCheckBox" name="gf_low_at_maxdepth">
    255255        <property name="text">
    256          <string>GFLow at max depth</string>
     256         <string>GFLow at max. depth</string>
    257257        </property>
    258258       </widget>
  • printing_templates/Flowlayout.html

    rde73cf8a rdcf2542  
    130130                                                        <tr>
    131131                                                                <td class="fieldTitle">
    132                                                                         <h1> Max depth </h1>
     132                                                                        <h1> Max. depth </h1>
    133133                                                                </td>
    134134                                                                <td class="fieldData">
  • printing_templates/One Dive.html

    r869a7fc rdcf2542  
    143143                                                        <tr>
    144144                                                                <td class="fieldTitle">
    145                                                                         <h1> Max depth </h1>
     145                                                                        <h1> Max. depth </h1>
    146146                                                                </td>
    147147                                                                <td class="fieldData">
  • printing_templates/Six Dives.html

    r1d4075f rdcf2542  
    137137                                                                        <td>
    138138                                                                                <h1> Dive # {{ dive.number }} - {{ dive.date }} {{ dive.time }}</h1>
    139                                                                                 <p style="float:right;"> Max depth: {{ dive.depth }} </p>
     139                                                                                <p style="float:right;"> Max. depth: {{ dive.depth }} </p>
    140140                                                                        </td>
    141141                                                                </tr>
  • printing_templates/Two Dives.html

    r869a7fc rdcf2542  
    152152                                                        <tr>
    153153                                                                <td class="fieldTitle">
    154                                                                         <h1> Max depth </h1>
     154                                                                        <h1> Max. depth </h1>
    155155                                                                </td>
    156156                                                                <td class="fieldData">
  • printing_templates/statistics/Default.html

    r4553155 rdcf2542  
    6060                <td>Dives</td>
    6161                <td>Total Time</td>
    62                 <td>Avg Time</td>
     62                <td>Avg. Time</td>
    6363                <td>Shortest Time</td>
    6464                <td>Longest Time</td>
    65                 <td>Avg Depth</td>
    66                 <td>Min Depth</td>
    67                 <td>Max Depth</td>
    68                 <td>Avg SAC</td>
    69                 <td>Min SAC</td>
    70                 <td>Max SAC</td>
    71                 <td>Min Temp</td>
    72                 <td>Max Temp</td>
     65                <td>Avg. Depth</td>
     66                <td>Min. Depth</td>
     67                <td>Max. Depth</td>
     68                <td>Avg. SAC</td>
     69                <td>Min. SAC</td>
     70                <td>Max. SAC</td>
     71                <td>Min. Temp</td>
     72                <td>Max. Temp</td>
    7373        </tr>
    7474{% block main_rows %}
  • profile-widget/profilewidget2.cpp

    reae4bd8 rdcf2542  
    640640                maxtime = newMaxtime;
    641641
    642         /* Only update the max depth if it's bigger than the current ones
     642        /* Only update the max. depth if it's bigger than the current ones
    643643         * when we are dragging the handler to plan / add dive.
    644644         * otherwhise, update normally.
  • qt-models/cylindermodel.cpp

    rb8e044d rdcf2542  
    257257                        break;
    258258                case MOD:
    259                         ret = tr("Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max depth.");
     259                        ret = tr("Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.");
    260260                        break;
    261261                case MND:
    262                         ret = tr("Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max depth.");
     262                        ret = tr("Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.");
    263263                        break;
    264264                }
     
    384384                        if (QString::compare(vString.toUtf8().data(), "*") == 0) {
    385385                                cyl->bestmix_o2 = true;
    386                                 // Calculate fO2 for max depth
     386                                // Calculate fO2 for max. depth
    387387                                cyl->gasmix.o2 = best_o2(displayed_dive.maxdepth, &displayed_dive);
    388388                        } else {
     
    401401                        if (QString::compare(vString.toUtf8().data(), "*") == 0) {
    402402                                cyl->bestmix_he = true;
    403                                 // Calculate fO2 for max depth
     403                                // Calculate fO2 for max. depth
    404404                                cyl->gasmix.he = best_he(displayed_dive.maxdepth, &displayed_dive);
    405405                        } else {
  • qt-models/diveplannermodel.cpp

    reae4bd8 rdcf2542  
    153153}
    154154
    155 // Update the dive's maximum depth.  Returns true if max depth changed
     155// Update the dive's maximum depth.  Returns true if max. depth changed
    156156bool DivePlannerPointsModel::updateMaxDepth()
    157157{
  • qt-models/divetripmodel.cpp

    rbdb83fd rdcf2542  
    247247                        break;
    248248                case MAXCNS:
    249                         retVal = tr("Max CNS");
     249                        retVal = tr("Max. CNS");
    250250                        break;
    251251                case PHOTOS:
  • theme/dive_export.html

    rf551089 rdcf2542  
    215215                <div id="location_header" onClick="change_sort_col('6')" class="item_large">Location</div>
    216216                <div id="duration_header" onClick="change_sort_col('4')" class="item">Duration</div>
    217                 <div id="maxdepth_header" onClick="change_sort_col('5')" class="item">Max Depth</div>
     217                <div id="maxdepth_header" onClick="change_sort_col('5')" class="item">Max. Depth</div>
    218218        </div>
    219219        <div id="diveslist">
Note: See TracChangeset for help on using the changeset viewer.