Changeset 2b4bce8 in subsurface for dives


Ignore:
Timestamp:
Feb 25, 2014, 12:28:49 PM (4 years ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
Mtest, android_test, dcDownload, foratdotde, gitMerge, gitdebug, gitpictures, ios, master, mergeKirigamiPort, pictimeshift, resolutionIndependence, spinner, testTomaz, testing, v4.2-branch, v4.4-branch, v4.5-branch
Children:
eb5cbf6
Parents:
c0e489c
git-author:
Miika Turkia <miika.turkia@…> (02/24/14 23:59:08)
git-committer:
Dirk Hohndel <dirk@…> (02/25/14 12:28:49)
Message:

Removing MacRoman? encoding from sample dive

MacRoman? encoding is poorly supported, and there is nothing that needs
any special encodings in the sample file. Thus removing the whole
encoding directive.

Fixes #441

Signed-off-by: Miika Turkia <miika.turkia@…>
Signed-off-by: Dirk Hohndel <dirk@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • dives/TestDiveJDiveLog.jlb

    r41e704b r2b4bce8  
    1 <?xml version="1.0" encoding="MacRoman" ?>
     1<?xml version="1.0"?>
    22<JDiveLog><Version>2.13</Version><ExportSettings><indexTitle></indexTitle><footerLinkName></footerLinkName><footerLink></footerLink><indexImages>0</indexImages><indexGroupByYear>false</indexGroupByYear><indexDate>true</indexDate><indexTime>false</indexTime><indexLocation>true</indexLocation><indexCity>true</indexCity><indexCountry>true</indexCountry><indexDepth>false</indexDepth><indexDuration>false</indexDuration><indexPictureCount>true</indexPictureCount><detailVisible>true</detailVisible><detailDate>true</detailDate><detailTime>true</detailTime><detailLocation>true</detailLocation><detailCountry>true</detailCountry><detailWaters>true</detailWaters><detailDepth>true</detailDepth><detailDuration>true</detailDuration><detailEquipment>false</detailEquipment><detailBuddy>false</detailBuddy><detailVisibility>false</detailVisibility><detailComment>false</detailComment><detailProfile>true</detailProfile><detailProfileWidth>600</detailProfileWidth><detailProfileHeight>400</detailProfileHeight><pictureVisible>true</pictureVisible><pictureImageMaxWidth>800</pictureImageMaxWidth><pictureImageMaxHeight>600</pictureImageMaxHeight><pictureThumbnailMaxWidth>100</pictureThumbnailMaxWidth><pictureThumbnailMaxHeight>100</pictureThumbnailMaxHeight><imageQuality>80</imageQuality><watermarkEnabled>false</watermarkEnabled><watermarkText></watermarkText><skinFile>bluebubbles</skinFile><fullExport>false</fullExport><keepImages>true</keepImages><exportDirectory>public_html</exportDirectory><pictureName>true</pictureName><pictureDescription>true</pictureDescription><scpEnabled>false</scpEnabled><scpHost></scpHost><scpDirectory></scpDirectory><scpUser></scpUser></ExportSettings><StatisticSettings><buddyStatistic><type>bar</type><orientation>horizontal</orientation></buddyStatistic><divePlaceStatistic><type>bar</type><orientation>horizontal</orientation></divePlaceStatistic><countryStatistic><type>bar</type><orientation>horizontal</orientation></countryStatistic><diveTypeStatistic><type>bar</type><orientation>horizontal</orientation></diveTypeStatistic><diveActivityStatistic><type>bar</type><orientation>horizontal</orientation></diveActivityStatistic><watersStatistic><type>bar</type><orientation>horizontal</orientation></watersStatistic></StatisticSettings><Masterdata><Buddys></Buddys><Divetypes></Divetypes><Diveactivities></Diveactivities><Suits></Suits><GloveTypes></GloveTypes><EquipmentSets></EquipmentSets><DiveSites><DiveSite><privateId>1</privateId><publicId></publicId><ownerId></ownerId><publish>false</publish><published>false</published><spot>Yellow House</spot><city>Hoodsport</city><state>WA</state><country>USA</country><longitude>N47 24,01200</longitude><latitude>W123 8.53794</latitude><minDepth></minDepth><avgDepth></avgDepth><maxDepth></maxDepth><waters>Hood Canal</waters><timezone></timezone><description></description><directions></directions><altitude>0</altitude><warnings></warnings><privateRemarks></privateRemarks><siteType>0</siteType><mainDiveActivity></mainDiveActivity><evaluation>7</evaluation></DiveSite></DiveSites><favoriteMixes></favoriteMixes></Masterdata><ComputerDriver>OSTC</ComputerDriver><ComputerSettings><property name="ostc.commport" value="/dev/tty.SLAB_USBtoUART (RXTX-2.1)"/></ComputerSettings><ComputerDownloadInterval>0</ComputerDownloadInterval><JDive><DiveNum>1</DiveNum><UNITS>metric</UNITS><DATE><YEAR>2011</YEAR><MONTH>5</MONTH><DAY>17</DAY></DATE><TIME><HOUR>11</HOUR><MINUTE>1</MINUTE></TIME><PLACE></PLACE><Country></Country><diveSiteId>1</diveSiteId><htmlExported>false</htmlExported><amv>16.21051</amv><Depth>24.691848000000004</Depth><Average_Depth>11.652504</Average_Depth><Duration>32.0</Duration><Visibility>Bad</Visibility><TEMPERATURE>10.0</TEMPERATURE><surfaceTemperature></surfaceTemperature><Buddy>Linus</Buddy><DiveType>JDivelog Divetype</DiveType><DiveActivity>JDiveLog Dive Activity</DiveActivity><Comment>This is a JDiveLog Comment</Comment><Equipment><Tanks><Tank><Name></Name><Volume>0.0</Volume><WorkingPressure>0</WorkingPressure><Weight>0.0</Weight><Type>Steel</Type><MIX><MIXNAME>NX 32</MIXNAME><TANK><TANKVOLUME>11.699778092399999</TANKVOLUME><PSTART>165.0</PSTART><PEND>69.0</PEND></TANK><O2>0.32</O2><N2>0.6799999999999999</N2><HE>0.0</HE></MIX></Tank></Tanks><Weight>36lbs</Weight><Suit>dry Whites Fusion</Suit><Gloves>dry</Gloves><Comment></Comment></Equipment><Pictures></Pictures><DIVE><DATE><YEAR>2011</YEAR><MONTH>5</MONTH><DAY>17</DAY></DATE><TIME><HOUR>11</HOUR><MINUTE>1</MINUTE></TIME><SURFACEINTERVAL>infinity</SURFACEINTERVAL><TEMPERATURE>10.0</TEMPERATURE><surfaceTemperature></surfaceTemperature><DENSITY>1030.0</DENSITY><ALTITUDE>0.0</ALTITUDE><GASES><MIX><MIXNAME>RealAir</MIXNAME><TANK><TANKVOLUME>11.7</TANKVOLUME><PSTART>165.0</PSTART><PEND>69.0</PEND></TANK><O2>0.21</O2><N2>0.79</N2><HE>0.0</HE></MIX></GASES><DELTAMODE/><SAMPLES><DELTA>0.5</DELTA><SWITCH>RealAir</SWITCH><D>0.0</D><D>2.74</D><D>4.88</D><D>8.53</D><D>12.19</D><D>14.02</D><D>16.76</D><D>19.51</D><D>22.86</D><D>24.69</D><D>23.77</D><D>23.16</D><D>23.47</D><D>22.25</D><D>21.64</D><D>21.95</D><D>21.03</D><D>21.03</D><D>18.9</D><D>17.98</D><D>17.07</D><D>16.46</D><D>15.85</D><D>15.54</D><D>14.63</D><D>13.72</D><D>12.5</D><D>11.89</D><D>11.58</D><D>11.58</D><D>11.89</D><D>11.28</D><D>11.28</D><D>11.89</D><D>11.89</D><D>11.58</D><D>10.36</D><D>10.67</D><D>10.67</D><D>11.28</D><D>11.28</D><D>10.67</D><D>11.28</D><D>11.28</D><D>10.97</D><D>9.75</D><D>8.84</D><D>7.92</D><D>8.23</D><D>7.01</D><D>5.79</D><D>6.1</D><D>5.49</D><D>5.79</D><D>3.96</D><D>5.18</D><D>5.18</D><D>5.49</D><D>5.18</D><D>5.18</D><D>3.96</D><D>3.35</D><D>2.44</D><D>2.13</D><D>0.0</D></SAMPLES></DIVE></JDive><SlideshowSettings><cycletime>8</cycletime><repeat>false</repeat><displayTitle>false</displayTitle><displayDescription>false</displayDescription></SlideshowSettings>
    33<ProfileSettings><backgroundColorCode>#ffffffff</backgroundColorCode><gridColorCode>#c0c0c0ff</gridColorCode><fillDepth>false</fillDepth><showDeco>true</showDeco><decoColorCode>#b31a0033</decoColorCode><showTemperature>true</showTemperature><temperatureLabelColorCode>#404040ff</temperatureLabelColorCode><temperatureColorCodeBegin>#000d1a32</temperatureColorCodeBegin><temperatureColorCodeEnd>#0085ff32</temperatureColorCodeEnd><showPpo2>true</showPpo2><ppo2Color1Code>#d6ff33ff</ppo2Color1Code><ppo2Color2Code>#5cff33ff</ppo2Color2Code><ppo2Color3Code>#33ff85ff</ppo2Color3Code><ppo2Color4Code>#33ffffff</ppo2Color4Code></ProfileSettings>
Note: See TracChangeset for help on using the changeset viewer.