Some bugs fixed.
authorTito Eritja <jtitoo@gmail.com>
Mon, 1 Aug 2011 08:58:10 +0000 (10:58 +0200)
committerTito Eritja <jtitoo@gmail.com>
Mon, 1 Aug 2011 08:58:10 +0000 (10:58 +0200)
0 distance error fixed
Elevation corrections

18 files changed:
GPSSniffer.pro
GPSSniffer.pro.user
activityinfo.cpp
activityinfo.ui
constants.h
loadtracksWindow.cpp
qtc_packaging/debian_fremantle/COPYING.txt [deleted file]
qtc_packaging/debian_fremantle/README
qtc_packaging/debian_fremantle/changelog
qtc_packaging/debian_fremantle/control
qtc_packaging/debian_fremantle/copyright
qtc_packaging/debian_fremantle/rules
settingsWindow.cpp
track.cpp
track.h
utils.cpp
utils.h
windowMap.cpp

index 1bf6812..1e2c526 100755 (executable)
@@ -67,12 +67,6 @@ include(deployment.pri)
 qtcAddDeployment()
 
 OTHER_FILES += \
-    qtc_packaging/debian_fremantle/rules \
-    qtc_packaging/debian_fremantle/README \
-    qtc_packaging/debian_fremantle/copyright \
-    qtc_packaging/debian_fremantle/control \
-    qtc_packaging/debian_fremantle/compat \
-    qtc_packaging/debian_fremantle/changelog \
     qtc_packaging/meego.spec \
     qtc_packaging/debian_harmattan/rules \
     qtc_packaging/debian_harmattan/README \
@@ -81,8 +75,13 @@ OTHER_FILES += \
     qtc_packaging/debian_harmattan/compat \
     qtc_packaging/debian_harmattan/changelog \
     qtc_packaging/meego.spec \
-    qtc_packaging/debian_fremantle/COPYING.txt \
-    qtc_packaging/debian_harmattan/COPYING.txt
+    qtc_packaging/debian_harmattan/COPYING.txt \
+    qtc_packaging/debian_fremantle/rules \
+    qtc_packaging/debian_fremantle/README \
+    qtc_packaging/debian_fremantle/copyright \
+    qtc_packaging/debian_fremantle/control \
+    qtc_packaging/debian_fremantle/compat \
+    qtc_packaging/debian_fremantle/changelog
 
 RESOURCES += \
     gpssniffer.qrc
index 71c736a..74bf66a 100755 (executable)
  <data>
   <variable>ProjectExplorer.Project.Target.1</variable>
   <valuemap type="QVariantMap">
-   <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Maemo</value>
-   <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
+   <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Maemo5</value>
+   <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Maemo5</value>
    <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Target.MaemoDeviceTarget</value>
    <value key="ProjectExplorer.Target.ActiveBuildConfiguration" type="int">0</value>
    <value key="ProjectExplorer.Target.ActiveDeployConfiguration" type="int">0</value>
     <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
     <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
     <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
-    <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Release</value>
+    <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Qt for Fremantle PR1.3 Devices (Qt SDK) Release</value>
     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
     <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
     <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
     <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
-    <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Debug</value>
+    <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Qt for Fremantle PR1.3 Devices (Qt SDK) Debug</value>
     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
     <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
       <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MaemoPackageCreationStep</value>
      </valuemap>
      <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
-      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Deploy to Maemo device</value>
+      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Deploy to Maemo5 device</value>
       <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
       <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MaemoDeployStep</value>
-      <value key="Qt4ProjectManager.MaemoRunConfiguration.DeployToSysroot" type="bool">true</value>
+      <value key="Qt4ProjectManager.MaemoRunConfiguration.DeployToSysroot" type="bool">false</value>
       <value key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId" type="qulonglong">2</value>
       <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles" type="QVariantList">
        <value type="QString">/home/tito/development/GPSSniffer-build-maemo/gpssniffer_0_1_0_armel.deb</value>
        <value type="QString"></value>
       </valuelist>
       <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes" type="QVariantList">
-       <value type="QDateTime">2011-07-20T15:22:58</value>
+       <value type="QDateTime">2011-08-01T10:07:23</value>
       </valuelist>
      </valuemap>
      <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">2</value>
      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Deploy</value>
     </valuemap>
     <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">1</value>
-    <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Deploy to Maemo device</value>
-    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
-    <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.DefaultDeployConfiguration</value>
-   </valuemap>
-   <value key="ProjectExplorer.Target.DeployConfigurationCount" type="int">1</value>
-   <valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap">
-    <valuelist key="Analyzer.Valgrind.AddedSupressionFiles" type="QVariantList"/>
-    <value key="Analyzer.Valgrind.FilterExternalIssues" type="bool">true</value>
-    <value key="Analyzer.Valgrind.NumCallers" type="int">25</value>
-    <valuelist key="Analyzer.Valgrind.RemovedSupressionFiles" type="QVariantList"/>
-    <value key="Analyzer.Valgrind.TrackOrigins" type="bool">true</value>
-    <value key="Analyzer.Valgrind.ValgrindExecutable" type="QString">valgrind</value>
-    <valuelist key="Analyzer.Valgrind.VisibleErrorKinds" type="QVariantList">
-     <value type="int">0</value>
-     <value type="int">1</value>
-     <value type="int">2</value>
-     <value type="int">3</value>
-     <value type="int">4</value>
-     <value type="int">5</value>
-     <value type="int">6</value>
-     <value type="int">7</value>
-     <value type="int">8</value>
-     <value type="int">9</value>
-     <value type="int">10</value>
-     <value type="int">11</value>
-     <value type="int">12</value>
-     <value type="int">13</value>
-     <value type="int">14</value>
-    </valuelist>
-    <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">GPSSniffer</value>
-    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
-    <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MaemoRunConfiguration</value>
-    <value key="Qt4ProjectManager.MaemoRunConfiguration.Arguments" type="QString"></value>
-    <value key="Qt4ProjectManager.MaemoRunConfiguration.BaseEnvironmentBase" type="int">1</value>
-    <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.ExportedLocalDirs" type="QVariantList"/>
-    <value key="Qt4ProjectManager.MaemoRunConfiguration.ProFile" type="QString">GPSSniffer.pro</value>
-    <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.RemoteMountPoints" type="QVariantList"/>
-    <value key="Qt4ProjectManager.MaemoRunConfiguration.UseRemoteGdb" type="bool">false</value>
-    <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.UserEnvironmentChanges" type="QVariantList"/>
-    <value key="RunConfiguration.QmlDebugServerPort" type="uint">3768</value>
-    <value key="RunConfiguration.UseCppDebugger" type="bool">true</value>
-    <value key="RunConfiguration.UseQmlDebugger" type="bool">false</value>
-   </valuemap>
-   <value key="ProjectExplorer.Target.RunConfigurationCount" type="int">1</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Target.2</variable>
-  <valuemap type="QVariantMap">
-   <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Meego</value>
-   <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Meego</value>
-   <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Target.MeegoDeviceTarget</value>
-   <value key="ProjectExplorer.Target.ActiveBuildConfiguration" type="int">0</value>
-   <value key="ProjectExplorer.Target.ActiveDeployConfiguration" type="int">0</value>
-   <value key="ProjectExplorer.Target.ActiveRunConfiguration" type="int">0</value>
-   <valuemap key="ProjectExplorer.Target.BuildConfiguration.0" type="QVariantMap">
-    <value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">Qt4ProjectManager.ToolChain.Maemo:/usr/lib/madde/linux-i686/targets/meego-core-armv7l-1.1/bin/gcc.arm-linux-generic-elf-32bit.</value>
-    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
-     <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
-      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>
-      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
-      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
-      <value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>
-      <value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString"></value>
-      <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
-     </valuemap>
-     <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
-      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
-      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
-      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
-      <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
-      <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>
-      <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
-     </valuemap>
-     <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">2</value>
-     <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
-     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
-     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
-     <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
-      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
-      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
-      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
-      <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
-      <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>
-      <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
-     </valuemap>
-     <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
-     <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
-     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
-     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
-    <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
-    <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
-    <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">MeeGo 1.2 armv7l Release</value>
-    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
-    <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/tito/development/GPSSniffer-build-meego</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">8</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">Qt4ProjectManager.ToolChain.Maemo:/usr/lib/madde/linux-i686/targets/meego-core-armv7l-1.1/bin/gcc.arm-linux-generic-elf-32bit.</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
-   </valuemap>
-   <valuemap key="ProjectExplorer.Target.BuildConfiguration.1" type="QVariantMap">
-    <value key="ProjectExplorer.BuildCOnfiguration.ToolChain" type="QString">Qt4ProjectManager.ToolChain.Maemo:/usr/lib/madde/linux-i686/targets/meego-core-armv7l-1.1/bin/gcc.arm-linux-generic-elf-32bit.</value>
-    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
-     <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
-      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>
-      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
-      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
-      <value key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary" type="bool">false</value>
-      <value key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QString"></value>
-      <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
-     </valuemap>
-     <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
-      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
-      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
-      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
-      <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
-      <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString"></value>
-      <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
-     </valuemap>
-     <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">2</value>
-     <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
-     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
-     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
-     <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
-      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
-      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
-      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
-      <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
-      <value key="Qt4ProjectManager.MakeStep.MakeArguments" type="QString">clean</value>
-      <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
-     </valuemap>
-     <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
-     <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
-     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
-     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
-    <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
-    <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
-    <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">MeeGo 1.2 armv7l Debug</value>
-    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
-    <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/tito/development/GPSSniffer-build-meego</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">8</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="QString">Qt4ProjectManager.ToolChain.Maemo:/usr/lib/madde/linux-i686/targets/meego-core-armv7l-1.1/bin/gcc.arm-linux-generic-elf-32bit.</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
-   </valuemap>
-   <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">2</value>
-   <valuemap key="ProjectExplorer.Target.DeployConfiguration.0" type="QVariantMap">
-    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
-     <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
-      <value key="Packaging Enabled" type="bool">true</value>
-      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Packaging for Maemo</value>
-      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
-      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MaemoPackageCreationStep</value>
-     </valuemap>
-     <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
-      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Deploy to Meego device</value>
-      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
-      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MaemoDeployStep</value>
-      <value key="Qt4ProjectManager.MaemoRunConfiguration.DeployToSysroot" type="bool">true</value>
-      <value key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId" type="qulonglong">17</value>
-      <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles" type="QVariantList"/>
-      <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts" type="QVariantList"/>
-      <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths" type="QVariantList"/>
-      <valuelist key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes" type="QVariantList"/>
-     </valuemap>
-     <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">2</value>
-     <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Deploy</value>
-     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
-     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Deploy</value>
-    </valuemap>
-    <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">1</value>
-    <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Deploy to Meego device</value>
+    <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Deploy to Maemo5 device</value>
     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.DefaultDeployConfiguration</value>
    </valuemap>
  </data>
  <data>
   <variable>ProjectExplorer.Project.TargetCount</variable>
-  <value type="int">3</value>
+  <value type="int">2</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
index d875d08..b6b0eb9 100755 (executable)
@@ -53,17 +53,18 @@ void ActivityInfo::getSummary(Track* trk){
     // this is for yesterday... so it has to be
     // corrected some day!
 
-    if(trk->getNumPoints()<=0)
+        if(trk->getNumPoints()<=0)
         return;
 
 
-    setWindowTitle(trk->getName());
+    setWindowTitle(nameFromFile(trk->getFileName()));
     //ui->windowTitle(trk->getName());
 
     ui->startTimeValue->setText(trk->getStartTime().toString(CLEAN_DATE_FORMAT));
 
     double duration=trk->getDuration();
     double duration_2=trk->getStartTime().secsTo(trk->getEndTime());
+
     ui->timeValue->setText(stringDateFromSeconds(duration));
     ui->distanceValue->setText(QString::number(trk->getDistance(),'f',2).append(" m"));
     ui->elevationValue->setText(QString::number(trk->getElevationGain(),'f',2).append(" m"));
@@ -77,6 +78,7 @@ void ActivityInfo::getSummary(Track* trk){
     ui->elevationLossValue->setText(QString::number(trk->getElevationLoss(),'f',2).append(" m"));
     ui->minElevationValue->setText(QString::number(trk->getMinElevation(),'f',2).append(" m"));
     ui->maxElevationValue->setText(QString::number(trk->getMaxElevation(),'f',2).append(" m"));
+    ui->lastElevationValue->setText(QString::number(trk->getLastElevation(),'f',2).append(" m"));
 
 }
 
index 06b1843..9e446c4 100755 (executable)
@@ -7,13 +7,13 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>335</height>
+    <height>482</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
-  <widget class="QTabWidget" name="tabWidget">
+  <widget class="QTabWidget" name="newActivity">
    <property name="enabled">
     <bool>true</bool>
    </property>
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>791</width>
+     <width>771</width>
      <height>281</height>
     </rect>
    </property>
    <property name="currentIndex">
     <number>0</number>
    </property>
-   <widget class="QWidget" name="summaryTab">
+   <widget class="QWidget" name="newActivityTab">
     <attribute name="title">
      <string>Summary</string>
     </attribute>
@@ -614,24 +614,678 @@ color: rgb(0, 0, 0);
           </property>
          </widget>
         </item>
+        <item row="5" column="0">
+         <widget class="QLabel" name="label_18">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Last elevation</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="1">
+         <widget class="QLabel" name="lastElevationValue">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(170, 255, 255);
+color: rgb(0, 0, 0);
+</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </widget>
+   <widget class="QWidget" name="referenceActivityTab">
+    <property name="enabled">
+     <bool>true</bool>
+    </property>
+    <attribute name="title">
+     <string>Summari2</string>
+    </attribute>
+    <widget class="QWidget" name="horizontalLayoutWidget_2">
+     <property name="geometry">
+      <rect>
+       <x>0</x>
+       <y>0</y>
+       <width>781</width>
+       <height>381</height>
+      </rect>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <property name="sizeConstraint">
+       <enum>QLayout::SetMaximumSize</enum>
+      </property>
+      <item>
+       <widget class="Line" name="line_4">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QFormLayout" name="formLayout_4">
+        <property name="fieldGrowthPolicy">
+         <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+        </property>
+        <item row="0" column="0">
+         <widget class="QLabel" name="label_19">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Total</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="label_20">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Time:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QLabel" name="timeValue_2">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(170, 255, 255);
+color: rgb(0, 0, 0);
+</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="label_21">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Distance</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="QLabel" name="distanceValue_2">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(170, 255, 255);
+color: rgb(0, 0, 0);
+</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="0">
+         <widget class="QLabel" name="label_22">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Elevation gain</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="1">
+         <widget class="QLabel" name="elevationValue_2">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(170, 255, 255);
+color: rgb(0, 0, 0);
+</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_23">
+          <property name="font">
+           <font>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Start time:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLabel" name="startTimeValue_2">
+          <property name="font">
+           <font>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(170, 255, 255);
+color: rgb(0, 0, 0);
+</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="Line" name="line_5">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QFormLayout" name="formLayout_5">
+        <property name="fieldGrowthPolicy">
+         <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+        </property>
+        <item row="0" column="0">
+         <widget class="QLabel" name="label_24">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Timing</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_25">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Moving time</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLabel" name="movingTimeValue_2">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(170, 255, 255);
+color: rgb(0, 0, 0);
+</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="label_26">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Elapsed time</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QLabel" name="elapsedTimeValue_2">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(170, 255, 255);
+color: rgb(0, 0, 0);
+</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="label_27">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Avg speed</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="QLabel" name="avgSpeedValue_2">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(170, 255, 255);
+color: rgb(0, 0, 0);
+</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="0">
+         <widget class="QLabel" name="label_28">
+          <property name="styleSheet">
+           <string notr="true">font: 14pt &quot;Ubuntu&quot;;</string>
+          </property>
+          <property name="text">
+           <string>Max speed</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="0">
+         <widget class="QLabel" name="label_29">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Avg pace</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="1">
+         <widget class="QLabel" name="avgPaceLabel_2">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(170, 255, 255);
+color: rgb(0, 0, 0);
+</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="0">
+         <widget class="QLabel" name="label_30">
+          <property name="styleSheet">
+           <string notr="true">font: 14pt &quot;Ubuntu&quot;;</string>
+          </property>
+          <property name="text">
+           <string>Best pace</string>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="1">
+         <widget class="QLabel" name="bestPaceValue_2">
+          <property name="font">
+           <font>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(170, 255, 255);
+color: rgb(0, 0, 0);
+</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="1">
+         <widget class="QLabel" name="maxSpeedValue_2">
+          <property name="font">
+           <font>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(170, 255, 255);
+color: rgb(0, 0, 0);
+</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="Line" name="line_6">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QFormLayout" name="formLayout_6">
+        <property name="fieldGrowthPolicy">
+         <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+        </property>
+        <item row="0" column="0">
+         <widget class="QLabel" name="label_31">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>Elevation</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_32">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Elevation gain</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLabel" name="elevationGainValue_2">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(170, 255, 255);
+color: rgb(0, 0, 0);
+</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="label_33">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Elevation loss</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QLabel" name="elevationLossValue_2">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(170, 255, 255);
+color: rgb(0, 0, 0);
+</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="label_34">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Min elevation</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="QLabel" name="minElevationValue_2">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(170, 255, 255);
+color: rgb(0, 0, 0);
+</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="0">
+         <widget class="QLabel" name="label_35">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Max elevation</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="1">
+         <widget class="QLabel" name="maxElevationValue_2">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(170, 255, 255);
+color: rgb(0, 0, 0);
+</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="0">
+         <widget class="QLabel" name="label_36">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Last elevation</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="1">
+         <widget class="QLabel" name="lastElevationValue_2">
+          <property name="font">
+           <font>
+            <family>Ubuntu</family>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(170, 255, 255);
+color: rgb(0, 0, 0);
+</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
      </layout>
     </widget>
    </widget>
-   <widget class="QWidget" name="chartsTab">
-    <property name="enabled">
-     <bool>true</bool>
-    </property>
-    <attribute name="title">
-     <string>Charts</string>
-    </attribute>
-   </widget>
   </widget>
   <widget class="QDialogButtonBox" name="buttonBox">
    <property name="geometry">
     <rect>
-     <x>610</x>
+     <x>590</x>
      <y>290</y>
      <width>176</width>
      <height>27</height>
@@ -641,6 +1295,19 @@ color: rgb(0, 0, 0);
     <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
    </property>
   </widget>
+  <widget class="QScrollBar" name="verticalScrollBar">
+   <property name="geometry">
+    <rect>
+     <x>780</x>
+     <y>30</y>
+     <width>16</width>
+     <height>441</height>
+    </rect>
+   </property>
+   <property name="orientation">
+    <enum>Qt::Vertical</enum>
+   </property>
+  </widget>
  </widget>
  <resources/>
  <connections/>
index 47630b4..2567702 100755 (executable)
@@ -158,11 +158,15 @@ const int tdim=256;
 #endif
 
 #ifndef ACCURACY_V_MIN
-#define ACCURACY_V_MIN 10000
+#define ACCURACY_V_MIN 100
+#endif
+
+#ifndef ACCURACY_V_GAIN
+#define ACCURACY_V_GAIN 20
 #endif
 
 #ifndef ACCURACY_H_MIN
-#define ACCURACY_H_MIN 20000
+#define ACCURACY_H_MIN 100
 #endif
 
 enum MapType {  MapTypeCloudMade=0,
index 3584500..046b6ba 100755 (executable)
@@ -125,7 +125,7 @@ void LoadTracksWindow::accept(){
         log->debug("XML readed without problem");
         windowMap->setTrackToSniff(toSniff);
         settings->setIsCache(ui->mapCacheOn->isChecked());
-
+        windowMap->setWindowTitle("Activity -> " + nameFromFile(fileName));
 
         if(windowMap->getMode()==Mode_LoadTracksWindow){
             settings->setMapType((MapType)ui->mapsType->currentIndex());
diff --git a/qtc_packaging/debian_fremantle/COPYING.txt b/qtc_packaging/debian_fremantle/COPYING.txt
deleted file mode 100644 (file)
index 94a9ed0..0000000
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
index 20aa85c..47d313e 100644 (file)
@@ -3,4 +3,4 @@ The Debian Package gpssniffer
 
 Comments regarding the Package
 
- -- Tito Eritja Real <jtitoo@gmail.com>  Fri, 20 May 2011 16:55:23 +0200
+ -- tito <tito@unknown>  Thu, 21 Jul 2011 18:35:45 +0200
index 9387b41..9c7e20d 100644 (file)
@@ -2,4 +2,4 @@ gpssniffer (0.1.0) unstable; urgency=low
 
   * Initial Release.
 
- -- Tito Eritja Real <jtitoo@gmail.com>  Fri, 20 May 2011 16:55:23 +0200
+ -- tito <tito@unknown>  Thu, 21 Jul 2011 18:35:45 +0200
index 3434087..e76356b 100644 (file)
@@ -1,7 +1,7 @@
 Source: gpssniffer
 Section: user/hidden
 Priority: optional
-Maintainer: Tito Eritja Real <jtitoo@gmail.com>
+Maintainer: tito <tito@unknown>
 Build-Depends: debhelper (>= 5), libqt4-dev
 Standards-Version: 3.7.3
 Homepage: <insert the upstream URL, if relevant>
@@ -11,4 +11,5 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: <insert up to 60 chars description>
  <insert long description, indented with spaces>
-XB-Maemo-Icon-26: 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
+XB-Maemo-Display-Name: GPSSniffer
+XB-Maemo-Icon-26: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAOxAAADsQBlSsOGwAABQ1JREFUaIHtWV1oHFUU/m5NwdaHRLSRkFhb0yRlBRNFBNOC+tQXf6CIhoIgmEbIgzYVU4KxQhIIEUxajT8PKZWIfdIISsAfKAhpYtJFrRStyaatVSsUf1K1gTl3c48Pd+7szM7sZmZnsvQhBzY7P+d+55x7fu45G2Cd1ikWiXIJkqTYSBMAKjZuSER2RRIgq9G1a1kmqSAgwIxEt60sHlj6SzKEFmb0ZwBVN2+MLb8sHiBSEELklOfkdq4sBkgJgJW+EcK2IBkTyuYBABAMsNC5vK3+xus3ied/WGaAnWDfXr9J6GcAwGhM3ZRY7iVuwNnv/mOSyputABpTm9ekYGxIGlASg4ghJUNaDEmMb0//y0nLMZSoB2an/mET74DtACEgsGb6J3cOTJ1cYqdGumFdl7sfrko8jBLxwMnP/vbsvAl8R1tXLiRNsXfk80/+5FzGulDdCrvu9zx2S6JeiA326Yd/uFQ1lxr20SduFT4ewRDOncAjNk+pFKsKTZy4wpIYkpT+SF11JClHeQDO+6xUTpXSH4WJE1diBVcsA4gUiFbsbwVpaaWkJx+AvfuqhVHalFayjd27rzqWB2IlsSTv5ulMYDzdUeNTqu2Z266/g4yIQVYuHCQpEDGOjV5eu8KfR7EMkObEJYYk+54YUiq8O/xbWYyI7dY3Bn9xRkVP/2N/P99z+5oOTYmBv953iRmcB6jHsBdf2bpmRkQGHuz9mQFGz8A239rBly/mW+BQEL8XV6/t6S/Ol0+hmPteusAQdmQ4f/RyBvDqa9sdnL7u83kDo46nwy4eN/V3X2BP5+0KwcNDwWsiGdD7wmKusWFg4Gi9AIDeA4sMFmbMwsDROz1YvQcW2VEq8P15Z+gRDPQfceECELZA87wkA7o7M2w2e+idHYG8hzoXmCEg2MtzqDPjMXzo7YB38D734maccBx6K5inqAFdz84zC+DIWOOqXupqn3fmxxGbv6t9gWGSmoHhY/r5wfYFNgfecAjsg/sXmBkYGWsI5C14DhAxsla4Uj4y1ih0v5N7pu8ZltRtg4Mr9YEXRnkAkJa/NXFToAH7nzrHkhij7zeFrgij402CaAUdbecYMH2S3gSyW46Oth9ZWgqj4+Fx3xxvElIynrNx8ymwF8qaoTwikas3yvVJQc+i4ipXC+6lQA8QKRz/OBX5jHhvIiUkrdgYDLJWdK9kh6Kk3HUUOv5RSrjD0E2BBkgrsgzfWqdllgpS6hgmYnwweVdJp7IkhSf3nPVZ4Quhxx88kzffRhRkKyst5YvCOLjac34v+AzISoARV5CuNuakNlteag4AgAwbQpPTzaKUODVkdnlyukWQpSAt5SQ3WaVvjGWpwPWBOZAtYG0YMiEEwMmBL9Mtwrx76O5vSgLPSsYX6Xt8+RNYRslSaG1K8/RP90VKuNadaSbXYfbV9/d61pPFKFgPi9CunWkuFBXBBpCO36gkLQUu8ru/juPoBujcibiuuXaOm2tnQ69qrgvH31w3xy21c9Fw6wrjFumFdPKltny9qrDUllkmS4WqMmd+vV+QVEhVr44L6N3PUuH3ReNkR+WMbufBWLzaGshbXznDplhmrj4QKu4aKmeY7VkgsxSM21A14ww6C0uFcVcVuHXTKc5NSa7/bzF7EC4t74qUNHdsPqUBDK5HIba3RODicrCBoQ0AgJobpoy6rgVaxO8ru2MN7DUVUyzsTcmXcTkbD3ud1ikE/Q/9QOu8p5xSNAAAAABJRU5ErkJggg==
index 5aeff22..11f18d0 100644 (file)
@@ -1,22 +1,23 @@
 This package was debianized by tito <tito@unknown> on
-Fri, 20 May 2011 16:55:23 +0200.
+Thu, 21 Jul 2011 18:35:45 +0200.
 
 It was downloaded from <url://example.com>
 
 Upstream Author(s):
 
-    Tito Eritja Real <jtitoo@gmail.com>
+    <put author's name and email here>
+    <likewise for another author>
 
 Copyright:
 
-    Copyright (C) 2011 Tito Eritja Real
-    Tito Eritja Real <jtitoo@gmail.com>
+    <Copyright (C) YYYY Name OfAuthor>
+    <likewise for another author>
 
 License:
 
     This package is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
+    the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This package is distributed in the hope that it will be useful,
@@ -31,7 +32,7 @@ License:
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
-The Debian packaging is (C) 2011, Tito Eritja Real <jtitoo@gmail.com> and
+The Debian packaging is (C) 2011, tito <tito@unknown> and
 is licensed under the GPL, see above.
 
 
index 70d3a19..f756932 100755 (executable)
@@ -16,7 +16,7 @@
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-       # Add here commands to configure the package.
+       # qmake PREFIX=/usr# Uncomment this line for use without Qt Creator
 
        touch configure-stamp
 
@@ -27,7 +27,7 @@ build-stamp: configure-stamp
        dh_testdir
 
        # Add here commands to compile the package.
-       $(MAKE)
+       # $(MAKE) # Uncomment this line for use without Qt Creator
        #docbook-to-man debian/gpssniffer.sgml > gpssniffer.1
 
        touch $@
@@ -76,13 +76,13 @@ binary-arch: build install
 #      dh_installinfo
        dh_installman
        dh_link
-       # dh_strip
+       dh_strip
        dh_compress
        dh_fixperms
 #      dh_perl
 #      dh_makeshlibs
        dh_installdeb
-       # dh_shlibdeps                      # Uncomment this line for publishing!
+       # dh_shlibdeps # Uncomment this line for use without Qt Creator
        dh_gencontrol
        dh_md5sums
        dh_builddeb
index d37fb58..8dda226 100755 (executable)
@@ -242,12 +242,15 @@ void SettingsWindow::accept(){
         log->debug("going to add activity:" + activitySettings->getActivity());
 
         activityMap->setTrack(activitySettings->getXmlFile(),activitySettings->getActivity());
+        activityMap->setWindowTitle(nameFromFile(activitySettings->getXmlFile()));
 
 
         activitySettings->setIsConfigured(true);
         log->debug("starting services");
         activityMap->startServices();
         activityMap->changeMapType(activitySettings->getMapType());
+
+
         log->debug("done");
 
         //activityMap->startSPositioningTimer();
@@ -257,6 +260,8 @@ void SettingsWindow::accept(){
             Track* toDo = readFromXML(activitySettings->getXmlFile());
             //Track* toDo = readFromXML("/home/user/MyDocs/FitxersGPXiTCX/PobletLaPena.tcx");
             log->debug("XML readed without problem");
+
+
             activityMap->setTrackToSimulate(toDo->getGpsPoints());
             activityMap->changeUpdateInterval(activitySettings->getGpsInterval());
 
@@ -267,6 +272,7 @@ void SettingsWindow::accept(){
             activityMap->startAutosaveTimer(60000*TIME_MIN_TIMEAUTOSAVE);
 
         }
+        activityMap->setWindowTitle("Activity -> " + (activitySettings->getXmlFile()));
         log->debug("accept done");
 
     }else{
index 3d3b7a7..571ff95 100755 (executable)
--- a/track.cpp
+++ b/track.cpp
@@ -40,8 +40,11 @@ Summarized::Summarized(){
     elevationLoss=0.0;
     minElevation=0.0;
     maxElevation=0.0;
+    lastElevation=0.0;
     avgPace=0.0;
     bestPace=0.0;
+    lastElevationAccuracy=ACCURACY_V_GAIN+1;
+
 }
 
 QString Summarized::toSumString(){
@@ -52,21 +55,28 @@ QString Summarized::toSumString(){
 void Summarized::addSummary(Summarized summary){
 
     duration+=summary.getDuration();
-    distance=distance+summary.getDistance();
+    distance+=summary.getDistance();
+
     // avgSpeed of summary is not Avg, is speed of last point!
     if(summary.getAvgPace()!=-1)
         avgSpeed=((avgSpeed*numPoints)+summary.getAvgSpeed())/(numPoints+1);
 
-    elevationGain+=summary.getElevationGain();
-    elevationLoss+=summary.getElevationLoss();
+    if(summary.lastElevationAccuracy<=ACCURACY_V_GAIN){
+
+        elevationGain+=summary.getElevationGain();
+        elevationLoss+=summary.getElevationLoss();
 
-    if(minElevation!=0 && summary.minElevation!=0){
-        minElevation=min(minElevation,summary.minElevation);
-    }else if(minElevation==0 && summary.minElevation!=0){
-        minElevation=summary.minElevation;
+        if(minElevation!=0 && summary.minElevation!=0){
+            minElevation=min(minElevation,summary.minElevation);
+        }else if(minElevation==0 && summary.minElevation!=0){
+            minElevation=summary.minElevation;
+        }
+
+        maxElevation=max(maxElevation,summary.maxElevation);
+        lastElevation=summary.lastElevation;
+        lastElevationAccuracy=summary.lastElevationAccuracy;
     }
 
-    maxElevation=max(maxElevation,summary.maxElevation);
     maxSpeed=max(maxSpeed,summary.maxSpeed);
 
     if(bestPace!=0 && summary.avgPace!=0){
@@ -75,7 +85,9 @@ void Summarized::addSummary(Summarized summary){
         bestPace=summary.avgPace;
     }
 
-    avgPace=(1000*duration)/(60*distance);
+    if(distance>0)
+        avgPace=(1000*duration)/(60*distance);
+
     numPoints++;
 }
 
@@ -90,8 +102,15 @@ Summarized& Summarized::account(GpsPoint point){
     endTime=point.getTime();
     maxSpeed=point.getSpeed();
     avgSpeed=point.getSpeed();
-    minElevation=point.getElevation();
-    maxElevation=point.getElevation();
+
+    lastElevationAccuracy = point.getVerticalAccuracy();
+
+
+    if(lastElevationAccuracy<=ACCURACY_V_GAIN){
+        minElevation=point.getElevation();
+        maxElevation=point.getElevation();
+        lastElevation=point.getElevation();
+    }
 
     return (*this);
 }
@@ -103,46 +122,67 @@ Summarized& Summarized::account(GpsPoint first, GpsPoint last){
     // data in here is not secure and not controlled.
 
     numPoints++;
+
+    qDebug() << "first:" << first.toString();
+    qDebug() << "last:" << last.toString();
+
     distance=first.distance(last);
     duration=first.getTime().secsTo(last.getTime());
     startTime=first.getTime();
     endTime=last.getTime();
     double lastEle=last.getElevation();
     double firstEle=first.getElevation();
-    if(lastEle>=firstEle)
-        elevationGain=lastEle-firstEle;
-    else
-        elevationLoss=firstEle-lastEle;
+
+    lastElevationAccuracy = last.getVerticalAccuracy();
+
+    qDebug() <<"firstElevation:" << firstEle;
+    qDebug() <<"lastElevation:" << lastEle;
+    qDebug() << "vertical accuracy:" << lastElevationAccuracy;
+
+
+    if(lastElevationAccuracy<=ACCURACY_V_GAIN){
+        if(lastEle>=firstEle){
+            elevationGain=lastEle-firstEle;
+        }else{
+            elevationLoss=firstEle-lastEle;
+        }
+
+        minElevation=min(first.getElevation(),last.getElevation());
+        maxElevation=max(first.getElevation(),last.getElevation());
+        lastElevation = last.getElevation();
+    }
 
     maxSpeed=max(first.getSpeed(),last.getSpeed());
     // keep speed of last point, will be usefull
     // in add function
     avgSpeed=last.getSpeed();
-    minElevation=min(first.getElevation(),last.getElevation());
-    maxElevation=max(first.getElevation(),last.getElevation());
-    avgPace=(1000*duration)/(60*distance);
+
+
+    if(distance>0)
+        avgPace=(1000*duration)/(60*distance);
 
     return (*this);
 }
 
 
-GpsPoint::GpsPoint(double latitude, double longitude, int elevation)
+GpsPoint::GpsPoint(double latitude, double longitude, double elevation)
     :latitude(latitude),
     longitude(longitude),
       elevation(elevation),speed(0),direction(0),magneticVariation(0),horizontalAccuracy(0),verticalAccuracy(0){
 }
 
-GpsPoint::GpsPoint(double latitude, double longitude, int elevation,QDateTime time,
-                   qreal speed, qreal direction, qreal magneticVariation, qreal horizontalAccuracy, qreal verticalAccuracy)
-:latitude(latitude),longitude(longitude),elevation(elevation),time(time),
+GpsPoint::GpsPoint(double latitude, double longitude, double elevation,QDateTime time,
+                   double speed, double direction, double magneticVariation, double horizontalAccuracy, double verticalAccuracy)
+:latitude(latitude),longitude(longitude),elevation(elevation), time(time),
   speed(speed), direction(direction), magneticVariation(magneticVariation),
   horizontalAccuracy(horizontalAccuracy),verticalAccuracy(verticalAccuracy){
 
+    //qDebug() << "elevation:" << elevation;
 }
 
-GpsPoint::GpsPoint(double latitude, double longitude, int elevation,QDateTime time,
-                   qreal speed, qreal direction, qreal magneticVariation, qreal horizontalAccuracy, qreal verticalAccuracy,
-                   qreal distancePrev, QTime timeToPrev)
+GpsPoint::GpsPoint(double latitude, double longitude, double elevation,QDateTime time,
+                   double speed, double direction, double magneticVariation, double horizontalAccuracy, double verticalAccuracy,
+                   double distancePrev, QTime timeToPrev)
 :latitude(latitude),longitude(longitude),elevation(elevation),time(time),
   speed(speed), direction(direction), magneticVariation(magneticVariation),
   horizontalAccuracy(horizontalAccuracy),verticalAccuracy(verticalAccuracy),distancePrev(distancePrev), timeToPrev(timeToPrev){
@@ -178,16 +218,22 @@ GpsPoint& GpsPoint::operator= (const GpsPoint &p){
 
 double GpsPoint::distance(GpsPoint p){
 
+    double dist=0;
+
     double latitude1 = toRad(latitude);
     double longitude1 = toRad(longitude);
 
     double latitude2 = toRad(p.latitude);
     double longitude2 = toRad(p.longitude);
 
-    double temp = sin(latitude1)*sin(latitude2)+cos(latitude1)*cos(latitude2)*cos(longitude2-longitude1);
+    if(latitude1==latitude2 && longitude1==longitude2){
+        dist=0;
+    }else{
 
-    double dist= acos(temp)*EARTH_RADIUS*1000;
-    //qDebug() << "distance between points: " << QString::number(dist,'f',10);
+        double temp = sin(latitude1)*sin(latitude2)+cos(latitude1)*cos(latitude2)*cos(longitude2-longitude1);
+        dist= acos(temp)*EARTH_RADIUS*1000;
+    }
+    qDebug() << "distance between points: " << QString::number(dist,'f',10);
     return dist;
 }
 
diff --git a/track.h b/track.h
index 4c0b61a..530059c 100755 (executable)
--- a/track.h
+++ b/track.h
@@ -44,14 +44,16 @@ protected:
     QDateTime endTime;
     double duration;
     double distance;
-    qreal avgSpeed;
-    qreal maxSpeed;
-    qreal elevationGain;
-    qreal elevationLoss;
-    qreal minElevation;
-    qreal maxElevation;
-    qreal avgPace;
-    qreal bestPace;
+    double avgSpeed;
+    double maxSpeed;
+    double elevationGain;
+    double elevationLoss;
+    double minElevation;
+    double maxElevation;
+    double lastElevation;
+    double lastElevationAccuracy;
+    double avgPace;
+    double bestPace;
 
 public:
 
@@ -61,14 +63,14 @@ public:
     /*
     inline double getDuration(){return duration;}
     inline double getDistance(){return distance;}
-    inline qreal getAvgSpeed(){return avgSpeed;}
-    inline qreal getMaxSpeed(){return maxSpeed;}
-    inline qreal getElevationGain(){return elevationGain;}
-    inline qreal getElevationLoss(){return elevationLoss;}
-    inline qreal getMinElevation(){return minElevation;}
-    inline qreal getMaxElevation(){return maxelevation;}
-    inline qreal getAvgPace(){return avgPace;}
-    inline qreal getBestPace(){return bestPace;}
+    inline double getAvgSpeed(){return avgSpeed;}
+    inline double getMaxSpeed(){return maxSpeed;}
+    inline double getElevationGain(){return elevationGain;}
+    inline double getElevationLoss(){return elevationLoss;}
+    inline double getMinElevation(){return minElevation;}
+    inline double getMaxElevation(){return maxelevation;}
+    inline double getAvgPace(){return avgPace;}
+    inline double getBestPace(){return bestPace;}
     */
 
     void addSummary(Summarized summary);
@@ -111,17 +113,23 @@ public:
     inline int getMaxSpeed(){return maxSpeed;}
     inline void setMaxSpeed(int speed){maxSpeed=speed;}
 
-    inline int getElevationGain(){return elevationGain;}
-    inline void setElevationGain(int elevation){elevationGain=elevation;}
+    inline double getElevationGain(){return elevationGain;}
+    inline void setElevationGain(double elevation){elevationGain=elevation;}
 
-    inline int getElevationLoss(){return elevationLoss;}
-    inline void setElevationLoss(int elevation){elevationLoss=elevation;}
+    inline double getElevationLoss(){return elevationLoss;}
+    inline void setElevationLoss(double elevation){elevationLoss=elevation;}
 
-    inline int getMinElevation(){return minElevation;}
-    inline void setMinElevation(int elevation){minElevation=elevation;}
+    inline double getMinElevation(){return minElevation;}
+    inline void setMinElevation(double elevation){minElevation=elevation;}
 
-    inline int getMaxElevation(){return maxElevation;}
-    inline void setMaxElevation(int elevation){maxElevation=elevation;}
+    inline double getMaxElevation(){return maxElevation;}
+    inline void setMaxElevation(double elevation){maxElevation=elevation;}
+
+    inline double getLastElevation(){return lastElevation;}
+    inline void setLastElevation(double elevation){lastElevation=elevation;}
+
+    inline double getLastElevationAccuracy(){return lastElevationAccuracy;}
+    inline void setLastElevationAccuracy(double elevation){lastElevationAccuracy=elevation;}
 
     inline int getAvgPace(){return avgPace;}
     inline void setAvgPace(int time){avgPace=time;}
@@ -140,19 +148,19 @@ private:
     double elevation;
 
     QDateTime time;
-    qreal speed;
-    qreal direction;
-    qreal magneticVariation;
-    qreal horizontalAccuracy;
-    qreal verticalAccuracy;
-    qreal distancePrev;
+    double speed;
+    double direction;
+    double magneticVariation;
+    double horizontalAccuracy;
+    double verticalAccuracy;
+    double distancePrev;
     QTime timeToPrev;
 public:
-    explicit GpsPoint(double latitude, double longitude, int elevation);
-    explicit GpsPoint(double latitude, double longitude, int elevation,QDateTime time, qreal speed,
-                      qreal direction, qreal magneticVariation,qreal horizontalAccuracy, qreal verticalAccuracy);
-    explicit GpsPoint(double latitude, double longitude, int elevation,QDateTime time, qreal speed,
-                      qreal direction, qreal magneticVariation,qreal horizontalAccuracy, qreal verticalAccuracy, qreal distancePrev, QTime timeToPrev);
+    explicit GpsPoint(double latitude, double longitude, double elevation);
+    explicit GpsPoint(double latitude, double longitude, double elevation,QDateTime time, double speed,
+                      double direction, double magneticVariation,double horizontalAccuracy, double verticalAccuracy);
+    explicit GpsPoint(double latitude, double longitude, double elevation,QDateTime time, double speed,
+                      double direction, double magneticVariation,double horizontalAccuracy, double verticalAccuracy, double distancePrev, QTime timeToPrev);
 
     //virtual ~GpsPoint();
 
@@ -168,20 +176,20 @@ public:
     inline QDateTime getTime(){return time;}
     inline void setTime(QDateTime time_p){time=time_p;}
 
-    inline qreal getSpeed(){return speed;}
-    inline void setSpeed(qreal speed_p){speed=speed_p;}
+    inline double getSpeed(){return speed;}
+    inline void setSpeed(double speed_p){speed=speed_p;}
 
-    inline qreal getDirection(){return direction;}
-    inline void setDirection(qreal direction_p){direction=direction_p;}
+    inline double getDirection(){return direction;}
+    inline void setDirection(double direction_p){direction=direction_p;}
 
-    inline qreal getMagneticVariation(){return magneticVariation;}
-    inline void setMagneticVariation(qreal magneticVariation_p){magneticVariation=magneticVariation_p;}
+    inline double getMagneticVariation(){return magneticVariation;}
+    inline void setMagneticVariation(double magneticVariation_p){magneticVariation=magneticVariation_p;}
 
-    inline qreal getHorizontalAccuracy(){return horizontalAccuracy;}
-    inline void setHorizontalAccuracy(qreal horizontalAccuracy_p){horizontalAccuracy=horizontalAccuracy_p;}
+    inline double getHorizontalAccuracy(){return horizontalAccuracy;}
+    inline void setHorizontalAccuracy(double horizontalAccuracy_p){horizontalAccuracy=horizontalAccuracy_p;}
 
-    inline qreal getVerticalAccuracy(){return verticalAccuracy;}
-    inline void setVerticalAccuracy(qreal verticalAccuracy_p){verticalAccuracy=verticalAccuracy_p;}
+    inline double getVerticalAccuracy(){return verticalAccuracy;}
+    inline void setVerticalAccuracy(double verticalAccuracy_p){verticalAccuracy=verticalAccuracy_p;}
 
     inline double getDistancePrev(){return distancePrev;}
     inline void setDistancePrev(double distance){distancePrev=distance;}
index 9b58ba7..e2c0110 100755 (executable)
--- a/utils.cpp
+++ b/utils.cpp
@@ -305,3 +305,16 @@ GpsPoint* parseTCXGpsPoint(QXmlStreamReader& xml){
     return point;
 }
 
+QString nameFromFile(QString fileName){
+
+    QString sep = "/";
+    int indexName = fileName.lastIndexOf(sep);
+    if(indexName<0){
+        return fileName;
+    }else{
+        int cont = fileName.length()-indexName-1;
+        QString stringName = fileName.right(cont);
+        return stringName;
+    }
+
+}
diff --git a/utils.h b/utils.h
index b64fec3..58c3fb4 100755 (executable)
--- a/utils.h
+++ b/utils.h
@@ -40,5 +40,6 @@ GpsPoint* parseTCXGpsPoint(QXmlStreamReader& xml);
 GpsPoint* parseGPXGpsPoint(QXmlStreamReader& xml);
 QString stringDateFromSeconds(qreal);
 int calculateZoom(Track t);
+QString nameFromFile(QString);
 
 #endif // UTILS_H
index 8c388d6..2050c4d 100755 (executable)
@@ -631,8 +631,9 @@ void WindowMap::chooseDisplay(){
 
     if(mode==Mode_NewActivityMode && !settings->getIsConfigured()){
         checkGPS();
+        setWindowTitle(track->getName());
         settingsWindow->show();
-        //setWindowTitle(settings->getActivity());
+
     }else if(mode==Mode_LoadTracksWindow && !settings->getIsConfigured()){
         setWindowTitle(QString("Load Tracks ->").append(trackToSniff->getName()));
         loadTracksWindow->show();