From: Tito Eritja Date: Wed, 20 Jul 2011 14:23:27 +0000 (+0200) Subject: Initial version X-Git-Url: http://vcs.maemo.org/git/?p=gpssportsniffer;a=commitdiff_plain;h=d83d54cbe39ffa872c360c017fccfafc3520e392 Initial version --- diff --git a/GPSSniffer.png b/GPSSniffer.png old mode 100755 new mode 100644 index 3b40f8d..24a9cc5 Binary files a/GPSSniffer.png and b/GPSSniffer.png differ diff --git a/GPSSniffer.pro b/GPSSniffer.pro index d5a6883..1bf6812 100755 --- a/GPSSniffer.pro +++ b/GPSSniffer.pro @@ -31,7 +31,6 @@ equals(QT_MAJOR_VERSION, 4):lessThan(QT_MINOR_VERSION, 7) { DEFINES += BEARER_IN_QTNETWORK } SOURCES += main.cpp \ - satellitedialog.cpp \ log.cpp \ track.cpp \ utils.cpp \ @@ -44,7 +43,6 @@ SOURCES += main.cpp \ tilesMap.cpp \ downloadingStatus.cpp HEADERS += \ - satellitedialog.h \ log.h \ track.h \ constants.h \ @@ -81,7 +79,10 @@ OTHER_FILES += \ qtc_packaging/debian_harmattan/copyright \ qtc_packaging/debian_harmattan/control \ qtc_packaging/debian_harmattan/compat \ - qtc_packaging/debian_harmattan/changelog + qtc_packaging/debian_harmattan/changelog \ + qtc_packaging/meego.spec \ + qtc_packaging/debian_fremantle/COPYING.txt \ + qtc_packaging/debian_harmattan/COPYING.txt RESOURCES += \ gpssniffer.qrc diff --git a/GPSSniffer.pro.user b/GPSSniffer.pro.user index 9e19a6a..71c736a 100755 --- a/GPSSniffer.pro.user +++ b/GPSSniffer.pro.user @@ -2,7 +2,7 @@ ProjectExplorer.Project.ActiveTarget - 2 + 1 ProjectExplorer.Project.EditorSettings @@ -32,7 +32,7 @@ ProjectExplorer.Project.Target.0 Desktop - Desktop + Qt4ProjectManager.Target.DesktopTarget 0 0 @@ -78,7 +78,7 @@ 2 false - Desktop Qt 4.7.3 for GCC (Qt SDK) Release + Release Qt4ProjectManager.Qt4BuildConfiguration 0 @@ -87,7 +87,57 @@ ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit. true - 1 + + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit. + + + qmake + + QtProjectManager.QMakeBuildStep + false + + false + + + Make + + Qt4ProjectManager.MakeStep + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + Make + + Qt4ProjectManager.MakeStep + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + /home/tito/development/GPSSniffer-build-desktop + 5 + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit. + true + + 2 0 @@ -145,14 +195,14 @@ ProjectExplorer.Project.Target.1 - Harmattan - Harmattan - Qt4ProjectManager.Target.HarmattanDeviceTarget - 2 + Maemo + + Qt4ProjectManager.Target.MaemoDeviceTarget + 0 0 0 - Qt4ProjectManager.ToolChain.Maemo:/home/tito/QtSDK/Madde/targets/harmattan-platform-api/bin/gcc.arm-linux-generic-elf-32bit. + Qt4ProjectManager.ToolChain.Maemo:/home/tito/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/gcc.arm-linux-generic-elf-32bit. qmake @@ -192,117 +242,17 @@ 2 false - Harmattan Platform API (Qt SDK) Release + Release Qt4ProjectManager.Qt4BuildConfiguration 0 - /home/tito/development/GPSSniffer-build-harmattan - 3 - Qt4ProjectManager.ToolChain.Maemo:/home/tito/QtSDK/Madde/targets/harmattan-platform-api/bin/gcc.arm-linux-generic-elf-32bit. + /home/tito/development/GPSSniffer-build-maemo + 6 + Qt4ProjectManager.ToolChain.Maemo:/home/tito/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/gcc.arm-linux-generic-elf-32bit. true - Qt4ProjectManager.ToolChain.Maemo:/home/tito/QtSDK/Madde/targets/harmattan-platform-api/bin/gcc.arm-linux-generic-elf-32bit. - - - qmake - - QtProjectManager.QMakeBuildStep - false - - false - - - Make - - Qt4ProjectManager.MakeStep - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - Make - - Qt4ProjectManager.MakeStep - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Harmattan Platform API (Qt SDK) Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - /home/tito/development/GPSSniffer-build-harmattan - 3 - Qt4ProjectManager.ToolChain.Maemo:/home/tito/QtSDK/Madde/targets/harmattan-platform-api/bin/gcc.arm-linux-generic-elf-32bit. - true - - - Qt4ProjectManager.ToolChain.Maemo:/home/tito/QtSDK/Madde/targets/harmattan-nokia-meego-api/bin/gcc.arm-linux-generic-elf-32bit. - - - qmake - - QtProjectManager.QMakeBuildStep - false - - false - - - Make - - Qt4ProjectManager.MakeStep - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - Make - - Qt4ProjectManager.MakeStep - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - MeeGo 1.2 Harmattan API (Qt SDK) Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - /home/tito/development/GPSSniffer-build-harmattan - 4 - Qt4ProjectManager.ToolChain.Maemo:/home/tito/QtSDK/Madde/targets/harmattan-nokia-meego-api/bin/gcc.arm-linux-generic-elf-32bit. - true - - - Qt4ProjectManager.ToolChain.Maemo:/home/tito/QtSDK/Madde/targets/harmattan-nokia-meego-api/bin/gcc.arm-linux-generic-elf-32bit. + Qt4ProjectManager.ToolChain.Maemo:/home/tito/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/gcc.arm-linux-generic-elf-32bit. qmake @@ -342,16 +292,16 @@ 2 false - MeeGo 1.2 Harmattan API (Qt SDK) Debug + Debug Qt4ProjectManager.Qt4BuildConfiguration 2 - /home/tito/development/GPSSniffer-build-harmattan - 4 - Qt4ProjectManager.ToolChain.Maemo:/home/tito/QtSDK/Madde/targets/harmattan-nokia-meego-api/bin/gcc.arm-linux-generic-elf-32bit. + /home/tito/development/GPSSniffer-build-maemo + 6 + Qt4ProjectManager.ToolChain.Maemo:/home/tito/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/gcc.arm-linux-generic-elf-32bit. true - 4 + 2 @@ -361,15 +311,23 @@ Qt4ProjectManager.MaemoPackageCreationStep - Deploy to Harmattan device + Deploy to Maemo device Qt4ProjectManager.MaemoDeployStep true - 0 - - - - + 2 + + /home/tito/development/GPSSniffer-build-maemo/gpssniffer_0_1_0_armel.deb + + + 192.168.2.15 + + + + + + 2011-07-20T15:22:58 + 2 Deploy @@ -377,7 +335,7 @@ ProjectExplorer.BuildSteps.Deploy 1 - Deploy to Harmattan device + Deploy to Maemo device ProjectExplorer.DefaultDeployConfiguration @@ -426,14 +384,14 @@ ProjectExplorer.Project.Target.2 - Maemo5 - Maemo5 - Qt4ProjectManager.Target.MaemoDeviceTarget + Meego + Meego + Qt4ProjectManager.Target.MeegoDeviceTarget 0 0 0 - Qt4ProjectManager.ToolChain.Maemo:/home/tito/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/gcc.arm-linux-generic-elf-32bit. + Qt4ProjectManager.ToolChain.Maemo:/usr/lib/madde/linux-i686/targets/meego-core-armv7l-1.1/bin/gcc.arm-linux-generic-elf-32bit. qmake @@ -473,17 +431,17 @@ 2 false - Qt for Fremantle PR1.3 Devices (Qt SDK) Release + MeeGo 1.2 armv7l Release Qt4ProjectManager.Qt4BuildConfiguration 0 - /home/tito/development/GPSSniffer-build-maemo - 6 - Qt4ProjectManager.ToolChain.Maemo:/home/tito/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/gcc.arm-linux-generic-elf-32bit. + /home/tito/development/GPSSniffer-build-meego + 8 + Qt4ProjectManager.ToolChain.Maemo:/usr/lib/madde/linux-i686/targets/meego-core-armv7l-1.1/bin/gcc.arm-linux-generic-elf-32bit. true - Qt4ProjectManager.ToolChain.Maemo:/home/tito/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/gcc.arm-linux-generic-elf-32bit. + Qt4ProjectManager.ToolChain.Maemo:/usr/lib/madde/linux-i686/targets/meego-core-armv7l-1.1/bin/gcc.arm-linux-generic-elf-32bit. qmake @@ -523,13 +481,13 @@ 2 false - Qt for Fremantle PR1.3 Devices (Qt SDK) Debug + MeeGo 1.2 armv7l Debug Qt4ProjectManager.Qt4BuildConfiguration 2 - /home/tito/development/GPSSniffer-build-maemo - 6 - Qt4ProjectManager.ToolChain.Maemo:/home/tito/QtSDK/Maemo/4.6.2/targets/fremantle-pr13/bin/gcc.arm-linux-generic-elf-32bit. + /home/tito/development/GPSSniffer-build-meego + 8 + Qt4ProjectManager.ToolChain.Maemo:/usr/lib/madde/linux-i686/targets/meego-core-armv7l-1.1/bin/gcc.arm-linux-generic-elf-32bit. true 2 @@ -542,31 +500,15 @@ Qt4ProjectManager.MaemoPackageCreationStep - Deploy to Maemo5 device + Deploy to Meego device Qt4ProjectManager.MaemoDeployStep true - 2 - - /home/tito/development/GPSSniffer-build-maemo/gpssniffer_0_1_0_armel.deb - /home/tito/development/GPSSniffer-build-maemo/gpssniffer_0_0_1_armel.deb - /home/tito/development/GPSSniffer-build-maemo/gpssniffer_0_0_1_armel.deb - - - 192.168.2.15 - 10.42.43.100 - 192.168.2.15 - - - - - - - - 2011-07-01T10:36:05 - 2011-06-29T13:45:51 - 2011-07-01T10:15:08 - + 17 + + + + 2 Deploy @@ -574,7 +516,7 @@ ProjectExplorer.BuildSteps.Deploy 1 - Deploy to Maemo5 device + Deploy to Meego device ProjectExplorer.DefaultDeployConfiguration diff --git a/activityinfo.cpp b/activityinfo.cpp index fb06a37..d875d08 100755 --- a/activityinfo.cpp +++ b/activityinfo.cpp @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #include "activityinfo.h" #include "ui_activityinfo.h" #include "track.h" diff --git a/activityinfo.h b/activityinfo.h index 9f4bde6..87409d8 100755 --- a/activityinfo.h +++ b/activityinfo.h @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #ifndef ACTIVITYINFO_H #define ACTIVITYINFO_H diff --git a/constants.h b/constants.h index d9fc9b7..47630b4 100755 --- a/constants.h +++ b/constants.h @@ -1,6 +1,28 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #ifndef CONSTANTS_H #define CONSTANTS_H +// tile size in pixels +const int tdim=256; + #ifndef APPLICATION_NAME #define APPLICATION_NAME GPS Sport Sniffer #endif @@ -18,7 +40,11 @@ #endif #ifndef DEBUG_VERBOSITY -#define DEBUG_VERBOSITY 3 +#define DEBUG_VERBOSITY 0 +#endif + +#ifndef NOLOG_VERBOSITY +#define NOLOG_VERBOSITY -1 #endif #ifndef DATE_FORMAT @@ -107,6 +133,10 @@ #define MIN_ICC_ZOOM 8 #endif +#ifndef MAX_ZOOM_DOWNL +#define MAX_ZOOM_DOWNL 16 +#endif + #ifndef TIME_SECONDS_POSSITIONING_PAN #define TIME_SECONDS_POSSITIONING_PAN 7 #endif @@ -127,11 +157,19 @@ #define HTTP_TIMEOUT 3600 #endif +#ifndef ACCURACY_V_MIN +#define ACCURACY_V_MIN 10000 +#endif + +#ifndef ACCURACY_H_MIN +#define ACCURACY_H_MIN 20000 +#endif -enum MapType { MapTypeGoogleMaps=0, - MapTypeICC=1, - MapTypeOpenCycleMaps=2, - MapTypeOpenStreetMaps=3 +enum MapType { MapTypeCloudMade=0, + MapTypeGoogleMaps=1, + MapTypeICC=2, + MapTypeOpenCycleMaps=3, + MapTypeOpenStreetMaps=4 }; enum XMLFileType{XMLFile_GPX=0, diff --git a/downloadingStatus.cpp b/downloadingStatus.cpp index bff11cd..96ac3a6 100644 --- a/downloadingStatus.cpp +++ b/downloadingStatus.cpp @@ -1,6 +1,28 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #include "downloadingStatus.h" #include "ui_downloadingStatus.h" +#include +#include + DownloadingStatus::DownloadingStatus(QWidget *parent) : QDialog(parent), ui(new Ui::DownloadingStatus) @@ -20,3 +42,25 @@ QProgressBar* DownloadingStatus::getProgressBar(){ void DownloadingStatus::setText(QString text){ ui->label->setText(text); } + +void DownloadingStatus::closeEvent(QCloseEvent *event){ + /* + //event->ignore(); + log->debug("CLOSE EVENT OF LOADTRACKS!!!!!!!!!!!!!!!!!!!"); + QMessageBox::warning(this, tr("GPSSniffer"),QString(tr("No file selected!"))); + this->hide(); + */ + QMessageBox msgBox(this); + msgBox.setText(tr("Are you sure to cancel maps downloading?.")); + msgBox.setIcon(QMessageBox::Warning); + msgBox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); + msgBox.setDefaultButton(QMessageBox::Cancel); + + int ret = msgBox.exec(); + if (ret == QMessageBox::Cancel) { + event->ignore(); + }else{ + + } + +} diff --git a/downloadingStatus.h b/downloadingStatus.h index 5057a3a..2c883e3 100644 --- a/downloadingStatus.h +++ b/downloadingStatus.h @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #ifndef DOWNLOADINGSTATUS_H #define DOWNLOADINGSTATUS_H @@ -21,6 +40,7 @@ public: private: Ui::DownloadingStatus *ui; + void closeEvent(QCloseEvent *event); }; #endif // DOWNLOADINGSTATUS_H diff --git a/loadTracksWindow.h b/loadTracksWindow.h index d053972..1521b87 100755 --- a/loadTracksWindow.h +++ b/loadTracksWindow.h @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #ifndef LOADTRACKS_H #define LOADTRACKS_H diff --git a/loadtracksWindow.cpp b/loadtracksWindow.cpp index 7db2e25..3584500 100755 --- a/loadtracksWindow.cpp +++ b/loadtracksWindow.cpp @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #include "loadTracksWindow.h" #include "ui_loadtracksWindow.h" @@ -71,10 +90,16 @@ void LoadTracksWindow::browse(){ void LoadTracksWindow::closeEvent(QCloseEvent *event){ + /* //event->ignore(); log->debug("CLOSE EVENT OF LOADTRACKS!!!!!!!!!!!!!!!!!!!"); QMessageBox::warning(this, tr("GPSSniffer"),QString(tr("No file selected!"))); this->hide(); + */ + + this->parentWidget()->hide(); + this->parentWidget()->parentWidget()->show(); + this->hide(); } void LoadTracksWindow::showEvent(QShowEvent *){ @@ -91,6 +116,7 @@ void LoadTracksWindow::accept(){ QString fileName = ui->fileCombo->currentText(); //QString fileName=QString("/home/user/MyDocs/FitxersGPXiTCX/VallDelRiuLac.tcx"); + //QString fileName=QString("/home/user/MyDocs/GPSSniffer/12-07-2011_09-09-16_Cycling.tcx"); if(!fileName.endsWith(".gpx",Qt::CaseInsensitive) && !fileName.endsWith(".tcx",Qt::CaseInsensitive) ){ QMessageBox::warning(this, tr("GPSSniffer"),QString(tr("No file selected!"))); @@ -98,6 +124,8 @@ void LoadTracksWindow::accept(){ Track* toSniff = readFromXML(fileName); log->debug("XML readed without problem"); windowMap->setTrackToSniff(toSniff); + settings->setIsCache(ui->mapCacheOn->isChecked()); + if(windowMap->getMode()==Mode_LoadTracksWindow){ settings->setMapType((MapType)ui->mapsType->currentIndex()); @@ -109,6 +137,7 @@ void LoadTracksWindow::accept(){ windowMap->desactivatePossitionPaint(); } } + windowMap->setIsCacheEnabled(ui->mapCacheOn->isChecked()); windowMap->updateSummary(); windowMap->drawFullTrackMaps(toSniff); settings->setIsConfigured(true); diff --git a/loadtracksWindow.ui b/loadtracksWindow.ui index ab022d8..9fdcf6c 100755 --- a/loadtracksWindow.ui +++ b/loadtracksWindow.ui @@ -39,6 +39,11 @@ + CloudMade (World) + + + + GoogleMaps (World) @@ -122,6 +127,43 @@ + + + + + 0 + 0 + + + + Map cache + + + + + + + + + On + + + false + + + + + + + Off + + + true + + + + + @@ -136,9 +178,6 @@ - verticalLayoutWidget - label_2 - colorLabel diff --git a/log.cpp b/log.cpp index a9e8c3c..458622c 100755 --- a/log.cpp +++ b/log.cpp @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #include "log.h" #include #include @@ -7,33 +26,37 @@ Log::Log(QString fileText,int verbosity) :verbosity(verbosity) { - QString name = QString(APPLICATION_PATH); - name.append(QDate::currentDate().toString(DATE_FORMAT)); - file = new QFile(name.append("_" + fileText)); + if(verbosity>NOLOG_VERBOSITY){ + QString name = QString(APPLICATION_PATH); + name.append(QDate::currentDate().toString(DATE_FORMAT)); + file = new QFile(name.append("_" + fileText)); + + if (!file->open(QIODevice::WriteOnly | QIODevice::Text)){ + qDebug() << "Error: Can not write Log file!"; + return; + } + QTextStream out(file); + out << "start logging\n" << file << "out=" << &out << ", verbosity:" << verbosity << "(-1 no log, 0->debug, 1->info, 2->warn, 3->error)\n"; - if (!file->open(QIODevice::WriteOnly | QIODevice::Text)){ - qDebug() << "Error: Can not write Log file!"; - return; } - QTextStream out(file); - out << "start logging\n" << file << "out=" << &out << ", verbosity:" << verbosity << "(0->debug, 1->info, 2->warn, 3->error)\n"; - } Log::Log(QWidget *win, QString fileText,int verbosity) :verbosity(verbosity) { - QString name = QString(APPLICATION_PATH); - name.append(QDate::currentDate().toString(DATE_FORMAT)); + if(verbosity>NOLOG_VERBOSITY){ + QString name = QString(APPLICATION_PATH); + name.append(QDate::currentDate().toString(DATE_FORMAT)); - file = new QFile(name.append("_" + fileText)); - if (!file->open(QIODevice::WriteOnly | QIODevice::Text)){ - QMessageBox::information(win, tr("GPSSniffer"),tr("Error: Can not write Log file!")); + file = new QFile(name.append("_" + fileText)); + if (!file->open(QIODevice::WriteOnly | QIODevice::Text)){ + QMessageBox::information(win, tr("GPSSniffer"),tr("Error: Can not write Log file!")); - return; + return; + } + QTextStream out(file); + out << "start logging\n"<< file << "out=" << &out << ", verbosity:" << verbosity << "(0->debug, 1->info, 2->warn, 3->error)\n"; } - QTextStream out(file); - out << "start logging\n"<< file << "out=" << &out << ", verbosity:" << verbosity << "(0->debug, 1->info, 2->warn, 3->error)\n"; } Log::~Log(){ @@ -52,37 +75,45 @@ int Log::getVerbosity(){ } void Log::debug(QString msg){ - QTextStream out(file); - if(&out!=0){ - if(verbosity==0){ - out << QDateTime::currentDateTime().toString(CLEAN_DATE_FORMAT)<< " [DEBUG] " << msg << "\n"; + if(verbosity>NOLOG_VERBOSITY){ + QTextStream out(file); + if(&out!=0){ + if(verbosity==0){ + out << QDateTime::currentDateTime().toString(CLEAN_DATE_FORMAT)<< " [DEBUG] " << msg << "\n"; + } } } } void Log::info(QString msg){ - QTextStream out(file); - if(&out!=0){ - if(verbosity<=1){ - out << QDateTime::currentDateTime().toString(CLEAN_DATE_FORMAT)<< " [INFO] " << msg << "\n"; - } + if(verbosity>NOLOG_VERBOSITY){ + QTextStream out(file); + if(&out!=0){ + if(verbosity<=1){ + out << QDateTime::currentDateTime().toString(CLEAN_DATE_FORMAT)<< " [INFO] " << msg << "\n"; + } + } } } void Log::warn(QString msg){ - QTextStream out(file); - if(&out!=0){ - if(verbosity<=2){ - out << QDateTime::currentDateTime().toString(CLEAN_DATE_FORMAT)<< " [WARN] " << msg << "\n"; + if(verbosity>NOLOG_VERBOSITY){ + QTextStream out(file); + if(&out!=0){ + if(verbosity<=2){ + out << QDateTime::currentDateTime().toString(CLEAN_DATE_FORMAT)<< " [WARN] " << msg << "\n"; + } } } } void Log::err(QString msg){ - QTextStream out(file); - if(&out!=0){ - if(verbosity<=3){ - out << QDateTime::currentDateTime().toString(CLEAN_DATE_FORMAT)<< " [ERROR] " << msg << "\n"; + if(verbosity>NOLOG_VERBOSITY){ + QTextStream out(file); + if(&out!=0){ + if(verbosity<=3){ + out << QDateTime::currentDateTime().toString(CLEAN_DATE_FORMAT)<< " [ERROR] " << msg << "\n"; + } } } } diff --git a/log.h b/log.h index a58380c..824c60c 100755 --- a/log.h +++ b/log.h @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #ifndef LOG_H #define LOG_H diff --git a/main.cpp b/main.cpp index ab7ea88..e283bcb 100755 --- a/main.cpp +++ b/main.cpp @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #include "mainWindow.h" #include diff --git a/mainWindow.cpp b/mainWindow.cpp index 5956b80..bdd6f85 100755 --- a/mainWindow.cpp +++ b/mainWindow.cpp @@ -1,11 +1,21 @@ -// checksum 0xcf61 version 0x30002 -/* - This file was generated by the Mobile Qt Application wizard of Qt Creator. - MainWindow is a convenience class containing mobile device specific code - such as screen orientation handling. - It is recommended not to modify this file, since newer versions of Qt Creator - may offer an updated version of it. -*/ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ #include "mainWindow.h" #include "windowMap.h" diff --git a/mainWindow.h b/mainWindow.h index 5412860..6ddf2a5 100755 --- a/mainWindow.h +++ b/mainWindow.h @@ -1,11 +1,22 @@ -// checksum 0x9a77 version 0x30002 -/* - This file was generated by the Mobile Qt Application wizard of Qt Creator. - MainWindow is a convenience class containing mobile device specific code - such as screen orientation handling. - It is recommended not to modify this file, since newer versions of Qt Creator - may offer an updated version of it. -*/ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #ifndef MAINWINDOW_H #define MAINWINDOW_H diff --git a/qtc_packaging/debian_fremantle/COPYING.txt b/qtc_packaging/debian_fremantle/COPYING.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/qtc_packaging/debian_fremantle/COPYING.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. + + + Copyright (C) + + 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 . + +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: + + Copyright (C) + 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 +. + + 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 +. diff --git a/qtc_packaging/debian_fremantle/copyright b/qtc_packaging/debian_fremantle/copyright index 0c494c2..5aeff22 100644 --- a/qtc_packaging/debian_fremantle/copyright +++ b/qtc_packaging/debian_fremantle/copyright @@ -5,19 +5,18 @@ It was downloaded from Upstream Author(s): - - + Tito Eritja Real Copyright: - + Copyright (C) 2011 Tito Eritja Real Tito Eritja Real 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 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, @@ -32,7 +31,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 and +The Debian packaging is (C) 2011, Tito Eritja Real and is licensed under the GPL, see above. diff --git a/qtc_packaging/debian_harmattan/COPYING.txt b/qtc_packaging/debian_harmattan/COPYING.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/qtc_packaging/debian_harmattan/COPYING.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. + + + Copyright (C) + + 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 . + +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: + + Copyright (C) + 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 +. + + 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 +. diff --git a/qtc_packaging/debian_harmattan/copyright b/qtc_packaging/debian_harmattan/copyright index c4d8b32..846b950 100644 --- a/qtc_packaging/debian_harmattan/copyright +++ b/qtc_packaging/debian_harmattan/copyright @@ -5,19 +5,17 @@ It was downloaded from Upstream Author(s): - - + Tito Eritja Real Copyright: - - + Copyright (C) 2011 Tito Eritja Real 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 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, diff --git a/qtc_packaging/meego.spec b/qtc_packaging/meego.spec new file mode 100644 index 0000000..00827f5 --- /dev/null +++ b/qtc_packaging/meego.spec @@ -0,0 +1,34 @@ +Name: gpssniffer +Summary: +Version: 0.1.0 +Release: 1 +License: +Group: +%description + + +%prep +%setup -q + +%build +# You can leave this empty for use with Qt Creator. +%install +rm -rf %{buildroot} +make INSTALL_ROOT=%{buildroot} install + +%clean +rm -rf %{buildroot} + +BuildRequires: +# %define _unpackaged_files_terminate_build 0 +%files +%defattr(-,root,root,-)/usr +/opt +# Add additional files to be included in the package here. +%pre +# Add pre-install scripts here.%post +/sbin/ldconfig # For shared libraries +%preun +# Add pre-uninstall scripts here.%postun +# Add post-uninstall scripts here. \ No newline at end of file diff --git a/satellitedialog.cpp b/satellitedialog.cpp deleted file mode 100755 index b347f95..0000000 --- a/satellitedialog.cpp +++ /dev/null @@ -1,498 +0,0 @@ -/**************************************************************************** - ** - ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). - ** All rights reserved. - ** Contact: Nokia Corporation (qt-info@nokia.com) - ** - ** This file is part of the examples of the Qt Mobility Components. - ** - ** $QT_BEGIN_LICENSE:BSD$ - ** You may use this file under the terms of the BSD license as follows: - ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. - ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ - - #include "satellitedialog.h" - - #include - - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - #include - - #include "qgeopositioninfosource.h" - #include "qgeosatelliteinfosource.h" - #include "qgeopositioninfo.h" - #include "qgeosatelliteinfo.h" - - class SatelliteWidget : public QWidget - { - public: - SatelliteWidget(QWidget *parent, - SatelliteDialog::Ordering ordering, - SatelliteDialog::StrengthScaling scaling); - - void clearSatellites(); - void satellitesInViewUpdated(const QList &list); - void satellitesInUseUpdated(const QList &list); - - QSize sizeHint() const; - - SatelliteDialog::Ordering ordering() const; - void setOrdering(SatelliteDialog::Ordering ordering); - - SatelliteDialog::StrengthScaling strengthScaling() const; - void setStrengthScaling(SatelliteDialog::StrengthScaling scaling); - - protected: - void paintEvent(QPaintEvent *event); - - private: - static const int numBars = 32; - static const int gapWidth = 1; - static const int barWidth = 3; - static const int spanWidth = gapWidth + barWidth; - static const int borderOffset = 4; - static const int legendTextOffset = 5; - - int textHeight; - int legendHeight; - - QColor inUseColor; - QColor inViewColor; - - SatelliteDialog::Ordering m_ordering; - SatelliteDialog::StrengthScaling m_scaling; - int m_maximumSignalStrength; - - void updateSatelliteList(); - void paintSatellite(QPainter &painter, const QRect &bounds, int index); - void paintLegend(QPainter &painter, const QRect &bounds); - - QList satellitesInView; - QList satellitesInUse; - QList > satellites; - }; - - SatelliteWidget::SatelliteWidget(QWidget *parent, - SatelliteDialog::Ordering ordering, - SatelliteDialog::StrengthScaling scaling) : QWidget(parent), - m_ordering(ordering), - m_scaling(scaling) - { - QPainter painter(this); - textHeight = painter.fontMetrics().height(); - legendHeight = borderOffset + textHeight + 2; - - inViewColor = QColor(192, 192, 255); - inUseColor = QColor(64, 64, 255); - } - - SatelliteDialog::Ordering SatelliteWidget::ordering() const - { - return m_ordering; - } - - void SatelliteWidget::setOrdering(SatelliteDialog::Ordering ordering) - { - if (ordering != m_ordering) { - m_ordering = ordering; - updateSatelliteList(); - } - } - - SatelliteDialog::StrengthScaling SatelliteWidget::strengthScaling() const - { - return m_scaling; - } - - void SatelliteWidget::setStrengthScaling(SatelliteDialog::StrengthScaling scaling) - { - if (scaling != m_scaling) { - m_scaling = scaling; - updateSatelliteList(); - } - } - - bool sortByPrn(const QGeoSatelliteInfo &s1, const QGeoSatelliteInfo &s2) - { - return s1.prnNumber() < s2.prnNumber(); - } - - bool sortBySignalStrength(const QGeoSatelliteInfo &s1, const QGeoSatelliteInfo &s2) - { - return s1.signalStrength() < s2.signalStrength(); - } - - void SatelliteWidget::clearSatellites() - { - satellitesInView.clear(); - satellitesInUse.clear(); - updateSatelliteList(); - } - - void SatelliteWidget::satellitesInViewUpdated(const QList &list) - { - satellitesInView = list; - qSort(satellitesInView.begin(), satellitesInView.end(), sortByPrn); - updateSatelliteList(); - } - - void SatelliteWidget::satellitesInUseUpdated(const QList &list) - { - satellitesInUse = list; - qSort(satellitesInUse.begin(), satellitesInUse.end(), sortByPrn); - updateSatelliteList(); - } - - bool sortPairsByPrn(const QPair &p1, const QPair &p2) - { - return sortByPrn(p1.first, p2.first); - } - - bool sortPairsBySignalStrength(const QPair &p1, const QPair &p2) - { - return sortBySignalStrength(p1.first, p2.first); - } - - void SatelliteWidget::updateSatelliteList() - { - satellites.clear(); - - int useSize = satellitesInUse.size(); - int viewSize = satellitesInView.size(); - - if ((useSize == 0) && (viewSize == 0)) { - update(); - return; - } - - for (int i = 0; i < useSize; ++i) { - if (satellitesInUse.at(i).signalStrength() != 0) - satellites << QPair(satellitesInUse.at(i), true); - } - - QList::iterator end = satellitesInUse.end(); - - for (int i = 0; i < viewSize; ++i) { - if (satellitesInView.at(i).signalStrength() == 0) - continue; - - QList::iterator j = - qBinaryFind( - satellitesInUse.begin(), - end, - satellitesInView.at(i), - sortByPrn - ); - - if (j == end) { - satellites << QPair(satellitesInView.at(i), false); - } - } - - int satSize = satellites.size(); - - if (m_ordering == SatelliteDialog::OrderByPrnNumber) { - qSort(satellites.begin(), satellites.end(), sortPairsByPrn); - m_maximumSignalStrength = 0; - for (int i = 0; i < satSize; ++i) { - if (satellites.at(i).first.signalStrength() > m_maximumSignalStrength) - m_maximumSignalStrength = satellites.at(i).first.signalStrength(); - } - - } else { - qSort(satellites.begin(), satellites.end(), sortPairsBySignalStrength); - m_maximumSignalStrength = satellites.at(satSize - 1).first.signalStrength(); - } - - update(); - } - - void SatelliteWidget::paintEvent(QPaintEvent * /*event*/) - { - QPainter painter(this); - painter.setRenderHint(QPainter::Antialiasing); - - QRect satBounds = QRect(rect().x() + borderOffset, - rect().y() + borderOffset, - rect().width() - 2 * borderOffset, - rect().height() - legendHeight - 2 * borderOffset); - - painter.setPen(QApplication::palette().color(QPalette::WindowText)); - painter.setBrush(QApplication::palette().color(QPalette::Base)); - painter.drawRect(satBounds); - - int size = satellites.size(); - for (int i = 0; i < size; ++i) { - paintSatellite(painter, satBounds, i); - } - - QRect legendBounds = QRect(rect().x() + borderOffset, - rect().height() - legendHeight, - rect().width() - 2 * borderOffset, - legendHeight); - - paintLegend(painter, legendBounds); - } - - void SatelliteWidget::paintSatellite(QPainter &painter, const QRect &bounds, int index) - { - int bars = numBars; - if (m_ordering == SatelliteDialog::OrderBySignalStrength) - bars = satellites.size(); - - double pixelsPerUnit = (double) bounds.width() / (double)(bars * spanWidth + gapWidth); - double spanPixels = pixelsPerUnit * spanWidth; - double gapPixels = pixelsPerUnit * gapWidth; - double barPixels = pixelsPerUnit * barWidth; - - painter.setPen(QApplication::palette().color(QPalette::WindowText)); - if (!satellites.at(index).second) { - painter.setBrush(inViewColor); - } else { - painter.setBrush(inUseColor); - } - - int maximum = 100; - if (m_scaling == SatelliteDialog::ScaleToMaxAvailable) { - maximum = m_maximumSignalStrength; - } - - int i = index; - if (m_ordering == SatelliteDialog::OrderByPrnNumber) - i = satellites.at(index).first.prnNumber() - 1; - - double height = ((double) satellites.at(index).first.signalStrength() / (double) maximum) * bounds.height(); - - QRectF r(bounds.x() + gapPixels + i * spanPixels, bounds.y() + bounds.height() - 1 - height, barPixels, height); - - painter.drawRect(r); - } - - void SatelliteWidget::paintLegend(QPainter &painter, const QRect &bounds) - { - double halfWidth = (double) bounds.width() / 2.0; - - double keyX = bounds.x() + 1; - double textX = keyX + legendHeight + 2 + legendTextOffset; - double y = bounds.y() + 1; - double keyWidth = legendHeight - 2 - borderOffset; - double textWidth = halfWidth - legendHeight - 3 - legendTextOffset; - double height = legendHeight - 2 - borderOffset; - - QRectF viewKeyRect(keyX, y, keyWidth, height); - QRectF viewTextRect(textX, y, textWidth, height); - QRectF useKeyRect(keyX + halfWidth, y, keyWidth, height); - QRectF useTextRect(textX + halfWidth, y, textWidth, height); - - painter.setPen(QApplication::palette().color(QPalette::WindowText)); - - painter.setBrush(inViewColor); - painter.drawRect(viewKeyRect); - - painter.setBrush(inUseColor); - painter.drawRect(useKeyRect); - - painter.setPen(QApplication::palette().color(QPalette::Text)); - painter.drawText(viewTextRect, Qt::AlignLeft, tr("In View")); - painter.drawText(useTextRect, Qt::AlignLeft, tr("In Use")); - } - - QSize SatelliteWidget::sizeHint() const - { - return QSize(parentWidget()->width(), parentWidget()->width() / 2 + legendHeight); - } - - SatelliteDialog::SatelliteDialog(QWidget *parent, - int noSatelliteTimeoutSeconds, - ExitBehaviour exitBehaviour, - Ordering ordering, - StrengthScaling scaling) : QDialog(parent), - m_noSatelliteTimeoutSeconds(noSatelliteTimeoutSeconds), - m_exitBehaviour(exitBehaviour), - m_ordering(ordering), - m_scaling(scaling) - { - noSatelliteTimer = new QTimer(this); - noSatelliteTimer->setInterval(m_noSatelliteTimeoutSeconds * 1000); - noSatelliteTimer->setSingleShot(true); - - connect(noSatelliteTimer, SIGNAL(timeout()), this, SLOT(noSatelliteTimeout())); - - satelliteWidget = new SatelliteWidget(this, ordering, scaling); - - QLabel *titleLabel = new QLabel(tr("Satellite Signal Strength")); - titleLabel->setAlignment(Qt::AlignCenter | Qt::AlignBottom); - - QVBoxLayout *mainLayout = new QVBoxLayout; - mainLayout->addWidget(titleLabel); - mainLayout->addWidget(satelliteWidget); - - #if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) - QAction *switchAction = new QAction(tr("Switch"), this); - switchAction->setSoftKeyRole(QAction::PositiveSoftKey); - - connect(switchAction, SIGNAL(triggered()), this, SLOT(switchButtonClicked())); - addAction(switchAction); - - QAction *cancelAction = new QAction(tr("Cancel"), this); - cancelAction->setSoftKeyRole(QAction::NegativeSoftKey); - - connect(cancelAction, SIGNAL(triggered()), this, SLOT(reject())); - addAction(cancelAction); - - QMenuBar *menuBar = new QMenuBar(this); - menuBar->addAction(switchAction); - menuBar->addAction(cancelAction); - - #if defined(Q_OS_WINCE) - menuBar->setDefaultAction(cancelAction); - #endif - - #else - cancelButton = new QPushButton(tr("Cancel")); - connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject())); - - switchButton = new QPushButton(tr("Switch")); - connect(switchButton, SIGNAL(clicked()), this, SLOT(switchButtonClicked())); - - QHBoxLayout *buttonLayout = new QHBoxLayout; - buttonLayout->addWidget(switchButton); - buttonLayout->addStretch(1); - buttonLayout->addWidget(cancelButton); - - mainLayout->addLayout(buttonLayout); - #endif - - setLayout(mainLayout); - - /*#if defined(Q_OS_SYMBIAN) - // workaround for QTBUG-4771 - oldTitle = windowTitle(); - connect(this, SIGNAL(finished(int)), this, SLOT(restoreWindowTitle())); - #endif*/ - - setWindowTitle(tr("Waiting for GPS fix")); - - setModal(true); - } - - /*#if defined(Q_OS_SYMBIAN) - // workaround for QTBUG-4771 - void SatelliteDialog::restoreWindowTitle() - { - setWindowTitle(oldTitle); - } - #endif*/ - - void SatelliteDialog::connectSources(QGeoPositionInfoSource *posSource, QGeoSatelliteInfoSource *satSource) - { - connect(posSource, SIGNAL(positionUpdated(const QGeoPositionInfo &)), - this, SLOT(positionUpdated(const QGeoPositionInfo &))); - - connect(satSource, SIGNAL(satellitesInViewUpdated(const QList &)), - this, SLOT(satellitesInViewUpdated(const QList &))); - connect(satSource, SIGNAL(satellitesInUseUpdated(const QList &)), - this, SLOT(satellitesInUseUpdated(const QList &))); - } - - void SatelliteDialog::switchButtonClicked() - { - SatelliteDialog::Ordering o = ordering(); - if (o == SatelliteDialog::OrderByPrnNumber) - setOrdering(SatelliteDialog::OrderBySignalStrength); - else if (o == SatelliteDialog::OrderBySignalStrength) - setOrdering(SatelliteDialog::OrderByPrnNumber); - } - - SatelliteDialog::ExitBehaviour SatelliteDialog::exitBehaviour() const - { - return m_exitBehaviour; - } - - void SatelliteDialog::setExitBehaviour(SatelliteDialog::ExitBehaviour exitBehaviour) - { - m_exitBehaviour = exitBehaviour; - } - - SatelliteDialog::Ordering SatelliteDialog::ordering() const - { - return satelliteWidget->ordering(); - } - - void SatelliteDialog::setOrdering(SatelliteDialog::Ordering ordering) - { - satelliteWidget->setOrdering(ordering); - } - - SatelliteDialog::StrengthScaling SatelliteDialog::strengthScaling() const - { - return satelliteWidget->strengthScaling(); - } - - void SatelliteDialog::setStrengthScaling(SatelliteDialog::StrengthScaling scaling) - { - satelliteWidget->setStrengthScaling(scaling); - } - - void SatelliteDialog::noSatelliteTimeout() - { - satelliteWidget->clearSatellites(); - } - - void SatelliteDialog::positionUpdated(const QGeoPositionInfo &/*pos*/) - { - if (m_exitBehaviour == ExitOnFixOrCancel) { - accept(); - } - } - - void SatelliteDialog::satellitesInViewUpdated(const QList &list) - { - noSatelliteTimer->stop(); - satelliteWidget->satellitesInViewUpdated(list); - noSatelliteTimer->start(); - } - - void SatelliteDialog::satellitesInUseUpdated(const QList &list) - { - noSatelliteTimer->stop(); - satelliteWidget->satellitesInUseUpdated(list); - noSatelliteTimer->start(); - } diff --git a/satellitedialog.h b/satellitedialog.h deleted file mode 100755 index 68ee327..0000000 --- a/satellitedialog.h +++ /dev/null @@ -1,130 +0,0 @@ - /**************************************************************************** - ** - ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). - ** All rights reserved. - ** Contact: Nokia Corporation (qt-info@nokia.com) - ** - ** This file is part of the examples of the Qt Mobility Components. - ** - ** $QT_BEGIN_LICENSE:BSD$ - ** You may use this file under the terms of the BSD license as follows: - ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor - ** the names of its contributors may be used to endorse or promote - ** products derived from this software without specific prior written - ** permission. - ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ - - #ifndef QGEOSATELLITEDIALOG_H - #define QGEOSATELLITEDIALOG_H - - #include - #include - - #include - - QTM_BEGIN_NAMESPACE - class QGeoPositionInfoSource; - class QGeoPositionInfo; - class QGeoSatelliteInfoSource; - class QGeoSatelliteInfo; - QTM_END_NAMESPACE - - class SatelliteWidget; - - class QPushButton; - class QTimer; - - QTM_USE_NAMESPACE - - class SatelliteDialog : public QDialog - { - Q_OBJECT - - public: - enum ExitBehaviour { - ExitOnFixOrCancel, - ExitOnCancel - }; - - enum Ordering { - OrderBySignalStrength, - OrderByPrnNumber - }; - - enum StrengthScaling { - ScaleToMaxAvailable, - ScaleToMaxPossible - }; - - SatelliteDialog(QWidget *parent = 0, - int noSatelliteTimeoutSeconds = 30, - ExitBehaviour exitBehaviour = ExitOnFixOrCancel, - Ordering ordering = OrderBySignalStrength, - StrengthScaling scaling = ScaleToMaxPossible); - - void connectSources(QGeoPositionInfoSource *posSource, QGeoSatelliteInfoSource *satSource); - - ExitBehaviour exitBehaviour() const; - void setExitBehaviour(ExitBehaviour exitBehaviour); - - Ordering ordering() const; - void setOrdering(Ordering ordering); - - StrengthScaling strengthScaling() const; - void setStrengthScaling(StrengthScaling scaling); - - private slots: - void positionUpdated(const QGeoPositionInfo &pos); - - void satellitesInViewUpdated(const QList &list); - void satellitesInUseUpdated(const QList &list); - - void switchButtonClicked(); - void noSatelliteTimeout(); - /*#if defined(Q_OS_SYMBIAN) - // workaround for QTBUG-4771 - void restoreWindowTitle(); - #endif*/ - - private: - int m_noSatelliteTimeoutSeconds; - ExitBehaviour m_exitBehaviour; - Ordering m_ordering; - StrengthScaling m_scaling; - - QTimer *noSatelliteTimer; - - SatelliteWidget *satelliteWidget; - QPushButton *switchButton; - QPushButton *cancelButton; - /*#if defined(Q_OS_SYMBIAN) - // workaround for QTBUG-4771 - QString oldTitle; - #endif*/ - }; - - #endif // #ifndef QGEOSATELLITEDIALOG_H diff --git a/settings.cpp b/settings.cpp index 1ee1b7e..6c19b23 100755 --- a/settings.cpp +++ b/settings.cpp @@ -1,10 +1,29 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #include "settings.h" Settings::Settings(Log *log) :servicesStarted(false),isConfigured(false),log(log),autosaveInterval(5){ - horizontalAccuracy=200; //200 - verticalAccuracy=100; //100 + horizontalAccuracy=ACCURACY_H_MIN; //200 + verticalAccuracy=ACCURACY_V_MIN; //100 trackToSniffColor="#ff0000"; trackColor="#5bff24"; } @@ -14,8 +33,8 @@ Settings::Settings(const Settings& set, Log *log): ,xmlFile(set.xmlFile),servicesStarted(set.servicesStarted),isConfigured(set.isConfigured),log(log){ log->debug("--Settings 2n constuctor ---"); log->debug("isConfigured:" + isConfigured); - horizontalAccuracy=200; - verticalAccuracy=100; + horizontalAccuracy=ACCURACY_H_MIN; + verticalAccuracy=ACCURACY_V_MIN; trackToSniffColor="#ff0000"; trackColor="#5bff24"; } diff --git a/settings.h b/settings.h index fb64302..3a5077e 100755 --- a/settings.h +++ b/settings.h @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #ifndef SETTINGS_H #define SETTINGS_H @@ -11,6 +30,7 @@ private: int gpsInterval; MapType mapType; bool isOnline; + bool isCache; QString xmlFile; QString xmlType; bool servicesStarted; @@ -55,6 +75,9 @@ public: inline bool getIsOnline(){return isOnline;} inline void setIsOnline(bool isOnline){this->isOnline=isOnline;} + inline bool getIsCache(){return isCache;} + inline void setIsCache(bool isCache){this->isCache=isCache;} + inline bool areServicesStarted(){return servicesStarted;} inline void setServicesStarted(bool st){this->servicesStarted=st;} diff --git a/settingsWindow.cpp b/settingsWindow.cpp index cd059ca..d37fb58 100755 --- a/settingsWindow.cpp +++ b/settingsWindow.cpp @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #include "settingsWindow.h" #include "windowMap.h" #include "ui_settingsWindow.h" @@ -212,6 +231,9 @@ void SettingsWindow::accept(){ log->debug(QString("---- ONLINE:%1").arg(ui->onlineButton->isChecked())); activitySettings->setIsOnline(ui->onlineButton->isChecked()); + activitySettings->setIsCache(ui->tileCacheOn->isChecked()); + activityMap->setIsCacheEnabled(ui->tileCacheOn->isChecked()); + activitySettings->setXmlFile(ui->fileCombo->currentText()); activitySettings->setMapType((MapType)ui->mapsType->currentIndex()); @@ -221,9 +243,11 @@ void SettingsWindow::accept(){ activityMap->setTrack(activitySettings->getXmlFile(),activitySettings->getActivity()); + activitySettings->setIsConfigured(true); log->debug("starting services"); activityMap->startServices(); + activityMap->changeMapType(activitySettings->getMapType()); log->debug("done"); //activityMap->startSPositioningTimer(); @@ -269,6 +293,10 @@ void SettingsWindow::accept(){ activityMap->startNetworking(); } } + if(activitySettings->getIsCache()!=ui->tileCacheOn->isChecked()){ + activitySettings->setIsCache(ui->tileCacheOn->isChecked()); + activityMap->setIsCacheEnabled(activitySettings->getIsCache()); + } if(activitySettings->getMapType()!=(MapType)ui->mapsType->currentIndex()){ activitySettings->setMapType((MapType)ui->mapsType->currentIndex()); diff --git a/settingsWindow.h b/settingsWindow.h index d8b0685..79baa70 100755 --- a/settingsWindow.h +++ b/settingsWindow.h @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #ifndef SETTINGSWINDOW_H #define SETTINGSWINDOW_H diff --git a/settingsWindow.ui b/settingsWindow.ui index e84bf40..07ab85b 100755 --- a/settingsWindow.ui +++ b/settingsWindow.ui @@ -46,17 +46,17 @@ - Walking + Cycling - Running + Padding - Cycling + Running @@ -64,6 +64,11 @@ Skiing + + + Walking + + @@ -155,6 +160,11 @@ + CloudMade (World) + + + + GoogleMaps (World) @@ -185,9 +195,12 @@ - + - Offline + Online + + + true buttonGroup @@ -195,12 +208,9 @@ - + - Online - - - true + Offline buttonGroup @@ -209,14 +219,14 @@ - + XML file - + @@ -246,7 +256,7 @@ - + @@ -262,14 +272,14 @@ - + XML type - + @@ -296,11 +306,39 @@ + + + + Map cache + + + + + + + + + On + + + false + + + + + + + Off + + + true + + + + + - formLayoutWidget - offLineButton - onlineButton @@ -338,7 +376,7 @@ - + diff --git a/tilesMap.cpp b/tilesMap.cpp index cff06cb..aa7efbe 100755 --- a/tilesMap.cpp +++ b/tilesMap.cpp @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #include "tilesMap.h" #include "constants.h" #include "log.h" @@ -39,7 +58,8 @@ TilesMap::TilesMap(QNetworkSession *session, QObject *parent = 0, Log* log=0, in longitude(0), width(WIDTH_DEFAULT), height(HEIGHT_DEFAULT), - tilesD(0){ + tilesD(0), + cache(false){ m_mapsDir = QDir(QString(APPLICATION_PATH).append(MAPS_DIR)); m_manager = new QNetworkAccessManager(this); @@ -49,9 +69,9 @@ TilesMap::TilesMap(QNetworkSession *session, QObject *parent = 0, Log* log=0, in m_emptyTile.fill(Qt::lightGray); //log->debug(QString("Is Network accessible?:%1").arg(m_manager->networkAccessible())); - QNetworkDiskCache *cache = new QNetworkDiskCache; - cache->setCacheDirectory(QDesktopServices::storageLocation(QDesktopServices::CacheLocation)); - m_manager->setCache(cache); + QNetworkDiskCache *nCache = new QNetworkDiskCache; + nCache->setCacheDirectory(QDesktopServices::storageLocation(QDesktopServices::CacheLocation)); + m_manager->setCache(nCache); connect(m_manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(handleReplies(QNetworkReply*))); @@ -158,13 +178,17 @@ void TilesMap::getTiles() { request.setAttribute(QNetworkRequest::User, QVariant(grab)); m_pendingReplies << m_manager->get(request); - m_tileRequests[grab]=TileRequest(zoom,QDateTime::currentDateTime(),false); + m_tileRequests[grab]=TileRequest(zoom,QDateTime::currentDateTime(),cache,false); } } } } +void TilesMap::cancelDownloading(){ + +} + int TilesMap::downloadMaps(Track* track_p){ int numTiles = 0; tilesD=0; @@ -180,7 +204,7 @@ int TilesMap::downloadMaps(Track* track_p){ // ading tiles needed by track QList gpsPoints = track_p->getGpsPoints(); int updateProgress=0; - for(int zoom_temp=zoom; zoom_temp < 17; zoom_temp++){ + for(int zoom_temp=zoom; zoom_temp <= MAX_ZOOM_DOWNL; zoom_temp++){ for (int i = 0; i < gpsPoints.size(); ++i) { GpsPoint* point = gpsPoints.at(i); downloadTiles(point->getLatitude(), point->getLongitude(),zoom_temp,&numTiles); @@ -242,7 +266,7 @@ void TilesMap::downloadWindow(int* numTiles,int zoom){ request.setAttribute(QNetworkRequest::User, QVariant(grab)); m_pendingReplies << m_manager->get(request); - m_tileRequests[grab]= TileRequest(zoom,QDateTime::currentDateTime(),true); + m_tileRequests[grab]= TileRequest(zoom,QDateTime::currentDateTime(),true,true); (*numTiles)++; } } @@ -250,8 +274,6 @@ void TilesMap::downloadWindow(int* numTiles,int zoom){ } - - void TilesMap::render(QPainter *p, const QRect &rect) { //log->debug("rendering maps..."); for (int x = 0; x <= m_tilesRect.width(); ++x) @@ -301,33 +323,38 @@ void TilesMap::handleReplies(QNetworkReply *reply){ QDir().mkdir(mapsDir()); } if (!reply->error()){ + if (!img.load(reply, 0)){ img = QImage(); }else{ - if(tr.save){ + if(tr.downloading){ zoomReply=tr.zoom; } - QString fileString = QString(fileUrlProvider()).arg(zoomReply).arg(tp.x()).arg(tp.y()); - if(!QDir(urlProvider()).exists()) - QDir().mkdir(urlProvider()); + if(tr.save){ + QString fileString = QString(fileUrlProvider()).arg(zoomReply).arg(tp.x()).arg(tp.y()); + + if(!QDir(urlProvider()).exists()) + QDir().mkdir(urlProvider()); - if(!QDir(urlProvider().append("%1/").arg(zoomReply)).exists()) - QDir().mkdir(urlProvider().append("%1").arg(zoomReply)); + if(!QDir(urlProvider().append("%1/").arg(zoomReply)).exists()) + QDir().mkdir(urlProvider().append("%1").arg(zoomReply)); + + if(!QDir(urlProvider().append("%1/").arg(zoomReply).append("%1/").arg(tp.x())).exists()) + QDir().mkdir(urlProvider().append("%1/").arg(zoomReply).append("%1/").arg(tp.x())); - if(!QDir(urlProvider().append("%1/").arg(zoomReply).append("%1/").arg(tp.x())).exists()) - QDir().mkdir(urlProvider().append("%1/").arg(zoomReply).append("%1/").arg(tp.x())); - if(tr.save){ QFile file(fileString); if (!file.open(QIODevice::WriteOnly)) { qDebug() << QString("Cannot open file for writing: %1").arg(file.errorString()); } img.save(fileString); - tilesD++; + + if(tr.downloading) + tilesD++; } } } @@ -336,7 +363,7 @@ void TilesMap::handleReplies(QNetworkReply *reply){ m_tileRequests.remove(tp); - if(!tr.save){ + if(!tr.downloading){ m_tileMaps[tp] = QPixmap::fromImage(img); if (img.isNull()){ @@ -350,6 +377,7 @@ void TilesMap::handleReplies(QNetworkReply *reply){ foreach(QPoint tp, m_tileMaps.keys()) if (!bound.contains(tp)) m_tileMaps.remove(tp); + }else{ emit tilesDownloaded(tilesD); } @@ -396,6 +424,9 @@ QString TilesMap::fileUrlProvider(){ case MapTypeICC: dir.append("/icc/%1/%2/%3.png"); break; + case MapTypeCloudMade: + dir.append("/cloudmade/%1/%2/%3.png"); + break; case MapTypeOpenCycleMaps: dir.append("/ocm/%1/%2/%3.png"); break; @@ -422,6 +453,9 @@ QString TilesMap::urlProvider(){ case MapTypeICC: dir.append("/icc/"); break; + case MapTypeCloudMade: + dir.append("/cloudmade/"); + break; case MapTypeOpenCycleMaps: dir.append("/ocm/"); break; @@ -438,9 +472,14 @@ QString TilesMap::mapUrlProvider(){ //m_log->debug("--- mapUrlProvider ---"); QString url("http://"); //m_log->debug(QString("mapType:%1").arg(mapType)); + switch(mapType){ + case MapTypeCloudMade: + url.append("tile.cloudmade.com/e63d1732f3be48299e0c19d6bcefe25c/3/256/%1/%2/%3.png"); + break; case MapTypeGoogleMaps: - url.append("mt1.google.com/vt/&x=%2&y=%3&z=%1"); + url.append("mt1.google.com/vt/lyrs=m@121,bike&hl=es&x=%2&y=%3&z=%1"); + //url.append("mt1.google.com/vt/&x=%2&y=%3&z=%1"); break; case MapTypeICC: url.append("norma.icc.cat/tilecache/tilecache.py/1.0.0/topo3857/%1/%2/%3.png?type=google"); diff --git a/tilesMap.h b/tilesMap.h index 0858489..834581b 100755 --- a/tilesMap.h +++ b/tilesMap.h @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #ifndef TILESMAP_H #define TILESMAP_H @@ -20,8 +39,7 @@ // Use the QtMobility namespace QTM_USE_NAMESPACE -// tile size in pixels -const int tdim=256; + class TileRequest{ @@ -29,14 +47,16 @@ public: QDateTime dateTime; bool save; + bool downloading; int zoom; TileRequest(){} - TileRequest(int z, QDateTime time, bool s){ + TileRequest(int z, QDateTime time, bool s, bool d){ dateTime=time; save=s; zoom=z; + downloading=d; } }; @@ -81,6 +101,9 @@ public: inline void setMapType(MapType m){mapType=m;} inline MapType getMapType(){return mapType;} + inline bool isCacheEnabled(){return cache;} + inline void setIsCacheEnabled(bool value){cache=value;} + //inline void setLatitude(qreal lat){latitude=lat;} inline qreal getLatitude(){return latitude;} @@ -97,6 +120,7 @@ public: void updateTiles(); void updateTiles(qreal lat, qreal lng); + void cancelDownloading(); int downloadMaps(Track* track_p); void downloadTiles(qreal lat, qreal lng, int zoom, int* numTiles); void downloadWindow(int *numTiles, int zoom); @@ -127,6 +151,7 @@ private: int height; int tilesD; + bool cache; qreal latitude; qreal longitude; diff --git a/track.cpp b/track.cpp index e6ea24b..3d3b7a7 100755 --- a/track.cpp +++ b/track.cpp @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #include "track.h" #include #include @@ -290,12 +309,19 @@ Track::Track(QString file,QString nameTrack) addActivity(nameTrack); } +Track::Track(QString fname) + :fileName(fname),name(fname){ + numActivities=0; + addActivity(name); +} + Track::Track() :fileName("noname"),name("noname"){ numActivities=0; addActivity(name); } + Track::~Track(){ for (int i = 0; i < activities.size(); ++i) { delete activities.at(i); diff --git a/track.h b/track.h index 5df908b..4c0b61a 100755 --- a/track.h +++ b/track.h @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #ifndef TRACK_H #define TRACK_H @@ -258,6 +277,7 @@ private: public: explicit Track(QString fileName,QString name); + explicit Track(QString fname); explicit Track(); virtual ~Track(); diff --git a/utils.cpp b/utils.cpp index b48ffad..9b58ba7 100755 --- a/utils.cpp +++ b/utils.cpp @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #include "utils.h" #include "constants.h" #include "track.h" @@ -56,7 +75,7 @@ Track* readFromXML(QString fileName){ qDebug() << "going to read file:" << fileName; - Track* myTrack = new Track(); + Track* myTrack = new Track(fileName); myTrack->addActivity("doesn'tmatter"); if (!file->open(QIODevice::ReadOnly | QIODevice::Text)) { diff --git a/utils.h b/utils.h index 45ec108..b64fec3 100755 --- a/utils.h +++ b/utils.h @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #ifndef UTILS_H #define UTILS_H diff --git a/windowMap.cpp b/windowMap.cpp index 32fcf68..8c388d6 100755 --- a/windowMap.cpp +++ b/windowMap.cpp @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #include "windowMap.h" #include @@ -12,18 +31,18 @@ #include #include - - - - -#include "satellitedialog.h" +//#include "satellitedialog.h" WindowMap::WindowMap(QWidget *parent, Settings* settings_p, Log *log) - : QMainWindow(parent),satelliteInfo(satelliteInfo), satelliteDialog(0), + : QMainWindow(parent), + //satelliteInfo(satelliteInfo), + //satelliteDialog(0), log(log),pressed(false),snapped(false), settings(settings_p),track(0),trackToSniff(0),network(false),slippyMap(0), - waitingForFix(false),validPositions(0),invalidPositions(0),mode(Mode_NewActivityMode),possitionPaint(true),nSession(0),location(0){ + //waitingForFix(false), + isDisplayInit(false), + validPositions(0),invalidPositions(0),mode(Mode_NewActivityMode),possitionPaint(true),nSession(0),location(0){ track = new Track(); trackToSniff = new Track(); @@ -74,7 +93,7 @@ WindowMap::WindowMap(QWidget *parent, Settings* settings_p, Log *log) //log->debug("going to create actions"); loadTrackAction = new QAction(tr("Load track"),this); - downloadMapsAction = new QAction(tr("Download maps"),this); + downloadMapsTrackAction = new QAction(tr("Download maps from track"),this); newActivityAction = new QAction(tr("New activity"),this); simulatedActivityAction = new QAction(tr("Activity simulation"),this); infoAction = new QAction(tr("Activity info"),this); @@ -86,14 +105,14 @@ WindowMap::WindowMap(QWidget *parent, Settings* settings_p, Log *log) startAction = new QAction(tr("Start"), this); startAction->setEnabled(false); tracksAction = new QAction(tr("Load track"), this); - satelliteAction = new QAction(tr("Satellite info."), this); + //satelliteAction = new QAction(tr("Satellite info."), this); startNetworkAction = new QAction(tr("Start Networking"),this); startNetworkAction->setEnabled(false); //log->debug("done, connecting"); connect(loadTrackAction, SIGNAL(triggered()),SLOT(loadTrack())); - connect(downloadMapsAction, SIGNAL(triggered()),SLOT(downloadMapTrack())); + connect(downloadMapsTrackAction, SIGNAL(triggered()),SLOT(downloadMapTrack())); connect(newActivityAction, SIGNAL(triggered()),SLOT(newActivityTrack())); connect(simulatedActivityAction, SIGNAL(triggered()), SLOT(newSimulation())); connect(stopAction, SIGNAL(triggered()), SLOT(stopActivity())); @@ -102,7 +121,7 @@ WindowMap::WindowMap(QWidget *parent, Settings* settings_p, Log *log) connect(lapAction, SIGNAL(triggered()), SLOT(lapActivity())); connect(settingsAction, SIGNAL(triggered()), SLOT(configureSettings())); connect(tracksAction, SIGNAL(triggered()), SLOT(tracksActivity())); - connect(satelliteAction, SIGNAL(triggered()), SLOT(satellite())); + //connect(satelliteAction, SIGNAL(triggered()), SLOT(satellite())); connect(startNetworkAction,SIGNAL(triggered()), SLOT(networkStart())); connect(infoAction, SIGNAL(triggered()), SLOT(info())); @@ -150,7 +169,7 @@ void WindowMap::setMenuLoadTracks(){ #if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) menuBar()->addAction(loadTrackAction); - menuBar()->addAction(downloadMapsAction); + menuBar()->addAction(downloadMapsTrackAction); menuBar()->addAction(newActivityAction); menuBar()->addAction(simulatedActivityAction); menuBar()->addAction(startNetworkAction); @@ -162,7 +181,7 @@ void WindowMap::setMenuLoadTracks(){ QMenu *menu = menuBar()->addMenu("&Options"); menu->clear(); menu->addAction(loadTrackAction); - menu->addAction(downloadMapsAction); + menu->addAction(downloadMapsTrackAction); menu->addAction(newActivityAction); menu->addAction(simulatedActivityAction); menu->addAction(startNetworkAction); @@ -186,7 +205,7 @@ void WindowMap::setMenuActivity(){ menuBar()->addAction(quitAction); - menuBar()->addAction(satelliteAction); + //menuBar()->addAction(satelliteAction); #else QMenu *menu = menuBar()->addMenu("&Options"); @@ -197,7 +216,7 @@ void WindowMap::setMenuActivity(){ menu->addAction(startAction); menu->addAction(tracksAction); menu->addAction(startNetworkAction); - menu->addAction(satelliteAction); + //menu->addAction(satelliteAction); menu->addAction(infoAction); menu->addAction(quitAction); @@ -239,6 +258,7 @@ void WindowMap::startServices(){ startMaps(); } +/* void WindowMap::showSatelliteInfo(){ if(!satelliteInfo) @@ -265,8 +285,9 @@ void WindowMap::showSatelliteInfo(){ } } +*/ - +/* void WindowMap::waitForFix() { if (waitingForFix) return; @@ -299,6 +320,8 @@ void WindowMap::waitForFix() { waitingForFix = false; } +*/ + void WindowMap::stopNetworking(){ network=false; if(nSession) @@ -332,18 +355,24 @@ void WindowMap::startNetworking(){ } nSession = new QNetworkSession(cfg, this); - nSession->open(); - nSession->waitForOpened(-1); - - - connect(nSession, SIGNAL(opened()), this, SLOT(networkSessionOpened())); connect(nSession,SIGNAL(error(QNetworkSession::SessionError)),this,SLOT(error(QNetworkSession::SessionError))); + nSession->open(); + if(nSession->waitForOpened(-1)){ + log->info("session connected"); + + connect(nSession, SIGNAL(opened()), this, SLOT(networkSessionOpened())); + //connect(nSession,SIGNAL(error(QNetworkSession::SessionError)),this,SLOT(error(QNetworkSession::SessionError))); - network=true; - if(slippyMap){ - slippyMap->setNetwork(true); + network=true; + if(slippyMap){ + slippyMap->setNetwork(true); + } + }else{ + log->err(nSession->errorString()); + network=false; } + } } @@ -356,7 +385,6 @@ void WindowMap::networkSessionOpened(){ //log->debug("invalidating map"); slippyMap->setNetwork(true); slippyMap->updateTiles(); - } } @@ -387,11 +415,13 @@ void WindowMap::error(QNetworkSession::SessionError error) //log->debug("enabling startNetworking"); startNetworkAction->setEnabled(true); stopNetworking(); - }else{ - QTimer::singleShot(60000, nSession, SLOT(open())); } + //else{ + // QTimer::singleShot(60000, nSession, SLOT(open())); + //} network=false; - slippyMap->setNetwork(false); + if(slippyMap) + slippyMap->setNetwork(false); } } @@ -421,13 +451,13 @@ void WindowMap::changeMapType(MapType map){ bool WindowMap::checkGPS(){ -#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) +//#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) location = QGeoPositionInfoSource::createDefaultSource(this); -#else +//#else //With maemo simulator doesn't work, I've to change this. - location=0; -#endif +// location=0; +//#endif if (!location) { if(!simulateGPS) @@ -446,16 +476,86 @@ void WindowMap::startGPS(){ connect(location,SIGNAL(positionUpdated(QGeoPositionInfo)),this,SLOT(positionUpdated(QGeoPositionInfo))); if(!settings->getIsOnline()) location->setPreferredPositioningMethods(QGeoPositionInfoSource::SatellitePositioningMethods); - location->startUpdates(); - waitForFix(); + //waitForFix(); //log->debug("setting signal updateTimeout..."); - connect(location, SIGNAL(updateTimeout()), this, SLOT(waitForFix())); + //connect(location, SIGNAL(updateTimeout()), this, SLOT(waitForFix())); //log->debug("start positioning..."); } startPositioning(); } + +void WindowMap::positionUpdated(const QGeoPositionInfo &pos){ + + //log->info("ACTIVITYMAP-POSSITIONUPDATED!!!"); + //setCenter(pos.coordinate().latitude(), pos.coordinate().longitude()); + + if(pos.isValid() && + pos.attribute(QGeoPositionInfo::HorizontalAccuracy)<=settings->getHorizontalAccuracy() && + pos.attribute(QGeoPositionInfo::VerticalAccuracy)<=settings->getVerticalAccuracy()){ + + GpsPoint* point = new GpsPoint(pos.coordinate().latitude(),pos.coordinate().longitude(),pos.coordinate().altitude(),pos.timestamp(), + pos.attribute(QGeoPositionInfo::GroundSpeed),pos.attribute(QGeoPositionInfo::Direction), + pos.attribute(QGeoPositionInfo::MagneticVariation), + pos.attribute(QGeoPositionInfo::HorizontalAccuracy), + pos.attribute(QGeoPositionInfo::VerticalAccuracy)); + + + // log->debug(point->toString()); + //log->debug("going to add point..."); + track->addPoint(point); + emit(infoWindow->updateSummary()); + validPositions++; + + if(possitionPaint) + setCenter(point->getLatitude(),point->getLongitude()); + + //if(satelliteDialog) + // satelliteDialog->hide(); + + + }else{ + log->debug("position not updated:"); + + log->debug("Horizontal accuracy (meters):" + QString::number(pos.attribute(QGeoPositionInfo::HorizontalAccuracy))); + log->debug("Vertical accuracy (meters):" + QString::number(pos.attribute(QGeoPositionInfo::VerticalAccuracy))); + invalidPositions++; + } + +} + +void WindowMap::simulatedPossitionUpdated(){ + log->info("simulated possition!!!"); + //log->info(QString("num points to simulate:%1").arg(trackToSimulate.size())); + GpsPoint* point= new GpsPoint(0,0,0); + + + if(trackToSimulate.size()>0){ + + point = trackToSimulate.first(); + + log->debug(QString("point to simulate:%1").arg(point->toString())); + track->addPoint(point); + log->debug("going to emit updateSummary!!!"); + emit(infoWindow->updateSummary()); + log->debug("point added to track and updated"); + //log->debug(QString("track num points:%1").arg(track->getNumPoints())); + + trackToSimulate.removeFirst(); + validPositions++; + //log->info(QString("num points to simulate:%1").arg(trackToSimulate.size())); + + //log->debug(QString("Possition paint???????????%1").arg(possitionPaint)); + if(possitionPaint) + setCenter(point->getLatitude(),point->getLongitude()); + } + + + +} + + void WindowMap::setTopLeft(qreal lat, qreal lng){ //log->debug("----setTopLeft----"); @@ -502,6 +602,7 @@ void WindowMap::closeEvent(QCloseEvent *event){ if (ret == QMessageBox::Cancel){ event->ignore(); }else{ + disconnect(nSession,SIGNAL(error(QNetworkSession::SessionError)),this,SLOT(error(QNetworkSession::SessionError))); stopPositioning(); autosave(); settings->setIsConfigured(false); @@ -526,19 +627,20 @@ void WindowMap::closeEvent(QCloseEvent *event){ } } - void WindowMap::showEvent(QShowEvent *){ +void WindowMap::chooseDisplay(){ + if(mode==Mode_NewActivityMode && !settings->getIsConfigured()){ + checkGPS(); + settingsWindow->show(); + //setWindowTitle(settings->getActivity()); + }else if(mode==Mode_LoadTracksWindow && !settings->getIsConfigured()){ + setWindowTitle(QString("Load Tracks ->").append(trackToSniff->getName())); + loadTracksWindow->show(); + } +} - if(mode==Mode_NewActivityMode && !settings->getIsConfigured()){ - checkGPS(); - settingsWindow->show(); - //setWindowTitle(settings->getActivity()); - }else if(mode==Mode_LoadTracksWindow && !settings->getIsConfigured()){ - setWindowTitle(QString("Load Tracks ->").append(trackToSniff->getName())); - loadTracksWindow->show(); - }else{ - fixZoomButtons(); - } + void WindowMap::showEvent(QShowEvent *){ + chooseDisplay(); } void WindowMap::networkStart(){ @@ -567,17 +669,17 @@ void WindowMap::closeEvent(QCloseEvent *event){ qreal lat = slippyMap->getLatitude(); qreal lng = slippyMap->getLongitude(); tilesToDownload=0; - - //QPoint pos; - //pos.setX((width()-downloadingStatus->width())/2); - //pos.setY((height()-downloadingStatus->height())/2); + startNetworking(); downloadingStatus->show(); //downloadingStatus->move(pos); QProgressBar* pb = downloadingStatus->getProgressBar(); int numPoints = trackToSniff->getNumPoints(); - pb->setRange(0,numPoints); + int zoomsToDown = (MAX_ZOOM_DOWNL - slippyMap->getZoom()); + if(zoomsToDown>=0){ + pb->setRange(0,numPoints*zoomsToDown); + } pb->setValue(0); downloadingStatus->setText(QString(tr("Making map requests"))); @@ -609,7 +711,7 @@ void WindowMap::closeEvent(QCloseEvent *event){ mode=Mode_NewActivityMode; settings->setIsConfigured(false); setMenuActivity(); - settingsWindow->show(); + chooseDisplay(); } void WindowMap::newSimulation(){ @@ -617,7 +719,7 @@ void WindowMap::closeEvent(QCloseEvent *event){ simulateGPS=true; settings->setIsConfigured(false); setMenuActivity(); - settingsWindow->show(); + chooseDisplay(); } void WindowMap::info(){ @@ -660,12 +762,15 @@ void WindowMap::tracks(){ } */ + +/* void WindowMap::satellite(){ #if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) showSatelliteInfo(); #endif } +*/ void WindowMap::stopPositioning() { if(simulateGPS){ @@ -725,74 +830,6 @@ void WindowMap::updateSummary(){ emit(infoWindow->updateSummary()); } -void WindowMap::simulatedPossitionUpdated(){ - log->info("simulated possition!!!"); - //log->info(QString("num points to simulate:%1").arg(trackToSimulate.size())); - GpsPoint* point= new GpsPoint(0,0,0); - - - if(trackToSimulate.size()>0){ - - point = trackToSimulate.first(); - - log->debug(QString("point to simulate:%1").arg(point->toString())); - track->addPoint(point); - log->debug("going to emit updateSummary!!!"); - emit(infoWindow->updateSummary()); - log->debug("point added to track and updated"); - //log->debug(QString("track num points:%1").arg(track->getNumPoints())); - - trackToSimulate.removeFirst(); - validPositions++; - //log->info(QString("num points to simulate:%1").arg(trackToSimulate.size())); - - //log->debug(QString("Possition paint???????????%1").arg(possitionPaint)); - if(possitionPaint) - setCenter(point->getLatitude(),point->getLongitude()); - } - - - -} - -void WindowMap::positionUpdated(const QGeoPositionInfo &pos){ - - //log->info("ACTIVITYMAP-POSSITIONUPDATED!!!"); - //setCenter(pos.coordinate().latitude(), pos.coordinate().longitude()); - - if(pos.isValid() && - pos.attribute(QGeoPositionInfo::HorizontalAccuracy)<=settings->getHorizontalAccuracy() && - pos.attribute(QGeoPositionInfo::VerticalAccuracy)<=settings->getVerticalAccuracy()){ - - GpsPoint* point = new GpsPoint(pos.coordinate().latitude(),pos.coordinate().longitude(),pos.coordinate().altitude(),pos.timestamp(), - pos.attribute(QGeoPositionInfo::GroundSpeed),pos.attribute(QGeoPositionInfo::Direction), - pos.attribute(QGeoPositionInfo::MagneticVariation), - pos.attribute(QGeoPositionInfo::HorizontalAccuracy), - pos.attribute(QGeoPositionInfo::VerticalAccuracy)); - - - // log->debug(point->toString()); - //log->debug("going to add point..."); - track->addPoint(point); - emit(infoWindow->updateSummary()); - validPositions++; - - if(possitionPaint) - setCenter(point->getLatitude(),point->getLongitude()); - - if(satelliteDialog) - satelliteDialog->hide(); - - - }else{ - log->debug("position not updated:"); - - log->debug("Horizontal accuracy (meters):" + QString::number(pos.attribute(QGeoPositionInfo::HorizontalAccuracy))); - log->debug("Vertical accuracy (meters):" + QString::number(pos.attribute(QGeoPositionInfo::VerticalAccuracy))); - invalidPositions++; - } - -} void WindowMap::autosave(){ @@ -861,16 +898,18 @@ void WindowMap::showExpanded() #endif } + void WindowMap::paintEvent(QPaintEvent *event) { - fixZoomButtons(); + fixZoomButtons(); log->debug("---- paint Event ----!"); QPainter p; p.begin(this); p.setPen(Qt::black); + #if defined(Q_OS_SYMBIAN) QFont font = p.font(); font.setPixelSize(13); @@ -879,22 +918,25 @@ void WindowMap::paintEvent(QPaintEvent *event) { if (!slippyMap){ log->debug("slippyMap not created!"); - return; - } + displayInit(&p); - slippyMap->render(&p, event->rect()); + }else{ + + slippyMap->render(&p, event->rect()); - //log->info("going to draw tracking route..."); - drawTrack(trackToSniff,&p, settings->getTrackToSniffColor()); + //log->info("going to draw tracking route..."); + drawTrack(trackToSniff,&p, settings->getTrackToSniffColor()); - if(mode==Mode_NewActivityMode){ - //log->info("going to draw actual route..."); - //log->debug(QString("num points track:%1").arg(track->getNumPoints())); - //log->debug("entering to drawTrack"); - drawTrack(track,&p,settings->getTrackColor(),true); - //log->info("done"); + if(mode==Mode_NewActivityMode){ + //log->info("going to draw actual route..."); + //log->debug(QString("num points track:%1").arg(track->getNumPoints())); + //log->debug("entering to drawTrack"); + drawTrack(track,&p,settings->getTrackColor(),true); + //log->info("done"); + } } + //log->info("done"); //p.drawText(rect(), Qt::AlignBottom | Qt::TextWordWrap,"OpenStreetMap maps"); //log->debug("ending Paint event..."); @@ -902,6 +944,34 @@ void WindowMap::paintEvent(QPaintEvent *event) { //log->debug("done... and now?"); } + +void WindowMap::displayInit(QPainter *p){ + + QPixmap emptyTile = QPixmap(tdim,tdim); + emptyTile.fill(Qt::lightGray); + + int numWidth = floor(width()/tdim)+1; + int numHeight = floor(height()/tdim)+1; + qreal tempx = static_cast(width())/tdim; + qreal tempy = static_cast(height())/tdim; + + int width_offset=(tempx-numWidth)*tdim/2; + int height_offset=(tempy-numHeight)*tdim/2; + + QPoint topLeft = QPoint(width_offset,height_offset); + + for (int x = 0; x <= numWidth; ++x){ + for (int y = 0; y <= numHeight; ++y) { + QRect box = QRect(topLeft.x()+x*tdim, topLeft.y()+y*tdim, tdim, tdim); + + p->drawPixmap(box,emptyTile); + } + } + + + +} + void WindowMap::drawFullTrackMaps(Track* track_p){ QList gpsPoints = track_p->getGpsPoints(); @@ -1091,21 +1161,18 @@ void WindowMap::mouseReleaseEvent(QMouseEvent *) { void WindowMap::fixZoomButtons(){ - if(settings->getIsConfigured()){ - int x_in=(width()-zoomInButton->width()); - int y_in=(height()/2-zoomInButton->height()/2); - //log->debug(QString("ZoomIn possition: x=%1,y=%2").arg(x_in).arg(y_in)); - - int x_out=0; - int y_out=(height()/2-zoomOutButton->height()/2); - //log->debug(QString("ZoomOut possition: x=%1,y=%2").arg(x_out).arg(y_out)); + int x_in=(width()-zoomInButton->width()); + int y_in=(height()/2-zoomInButton->height()/2); + //log->debug(QString("ZoomIn possition: x=%1,y=%2").arg(x_in).arg(y_in)); - zoomInButton->move(x_in,y_in); - zoomOutButton->move(x_out,y_out); - zoomInButton->show(); - zoomOutButton->show(); + int x_out=0; + int y_out=(height()/2-zoomOutButton->height()/2); + //log->debug(QString("ZoomOut possition: x=%1,y=%2").arg(x_out).arg(y_out)); - } + zoomInButton->move(x_in,y_in); + zoomOutButton->move(x_out,y_out); + zoomInButton->show(); + zoomOutButton->show(); } void WindowMap::resizeEvent(QResizeEvent * /* event */) diff --git a/windowMap.h b/windowMap.h index acb42c6..350630d 100755 --- a/windowMap.h +++ b/windowMap.h @@ -1,3 +1,22 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Tito Eritja Real +** +** 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 . +** +****************************************************************************/ + #ifndef ACTIVITYMAP_H #define ACTIVITYMAP_H @@ -27,7 +46,7 @@ class Settings; class ConnectivityHelper; -class SatelliteDialog; +//class SatelliteDialog; // Use the QtMobility namespace @@ -54,6 +73,7 @@ private: bool pressed; bool snapped; bool possitionPaint; + bool isDisplayInit; int tilesToDownload; @@ -75,7 +95,7 @@ private: QAction *startNetworkAction; QAction *loadTrackAction; - QAction *downloadMapsAction; + QAction *downloadMapsTrackAction; QAction *newActivityAction; QAction *simulatedActivityAction; QAction *quitAction; @@ -84,7 +104,7 @@ private: QAction *stopAction; QAction *startAction; QAction *tracksAction; - QAction *satelliteAction; + //QAction *satelliteAction; QAction *infoAction; // Dialogs @@ -96,8 +116,8 @@ private: DownloadingStatus* downloadingStatus; - QGeoSatelliteInfoSource *satelliteInfo; - SatelliteDialog *satelliteDialog; + //QGeoSatelliteInfoSource *satelliteInfo; + //SatelliteDialog *satelliteDialog; Log *log; @@ -107,7 +127,7 @@ private: QList trackToSimulate; - bool waitingForFix; + //bool waitingForFix; int validPositions; int invalidPositions; @@ -126,6 +146,7 @@ private: void mouseReleaseEvent(QMouseEvent *event); void resizeEvent(QResizeEvent * ); + void chooseDisplay(); public: QToolButton *zoomInButton; @@ -142,6 +163,8 @@ public: explicit WindowMap(QWidget *parent = 0,Settings* settings=0, Log *log=0); virtual ~WindowMap(); + void displayInit(QPainter *p); + void fixZoomButtons(); void updateSummary(); void clearAllMaps(); @@ -158,7 +181,7 @@ public: void startGPS(); void startMaps(); - void showSatelliteInfo(); + //void showSatelliteInfo(); void startNetworking(); void stopNetworking(); void setOrientation(ScreenOrientation orientation); @@ -167,7 +190,7 @@ public: inline Track* getTrack(){return track;} inline Track* getTrackToSniff(){return trackToSniff;} inline void setTrackToSimulate(QList toDo){trackToSimulate=toDo;} - inline bool hasTrackToSimulate(){(trackToSimulate.size()>0);} + inline bool hasTrackToSimulate(){return (trackToSimulate.size()>0);} inline void startAutosaveTimer(int milliseconds){autosaveTimer->start(milliseconds);} inline void startSimulatePossitioning(int milliseconds){simulatePossitioningTimer->start(milliseconds);} inline void startSimulatePossitioning(){simulatePossitioningTimer->start();} @@ -179,6 +202,11 @@ public: inline bool simulatingGPS(){return simulateGPS;} inline void setSimulateGPS(bool value){simulateGPS=value;} inline int getTilesToDownload(){return tilesToDownload;} + inline void setIsCacheEnabled(bool value){ + if(slippyMap) + slippyMap->setIsCacheEnabled(value); + } + inline bool isCacheEnabled(){return slippyMap->isCacheEnabled();} void setTrack(QString filename,QString activity); void setCenter(qreal lat, qreal lng); @@ -208,7 +236,7 @@ public: void quit(); - void satellite(); + //void satellite(); void onZoomIn(); void onZoomOut(); @@ -217,7 +245,7 @@ public: //void networkSessionOpened(); - void waitForFix(); + //void waitForFix(); void updateMap(const QRect &r);