From e96cee2ea8fb6c26b008076cd9956168e9740940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Mon, 22 May 2017 17:04:37 +0200 Subject: [PATCH] Improved filtering settings layout --- lang/gpxsee_cs.ts | 96 ++++++++++++++++++++++++------------------- lang/gpxsee_de.ts | 96 ++++++++++++++++++++++++------------------- lang/gpxsee_sv.ts | 92 +++++++++++++++++++++++------------------ src/optionsdialog.cpp | 24 +++++++---- 4 files changed, 172 insertions(+), 136 deletions(-) diff --git a/lang/gpxsee_cs.ts b/lang/gpxsee_cs.ts index 8e0bb69f..ed0352ff 100644 --- a/lang/gpxsee_cs.ts +++ b/lang/gpxsee_cs.ts @@ -800,200 +800,210 @@ - + Use anti-aliasing Vyhlazovat hrany - + Line width: Šířka čar: - + Colors Barvy - + Paths Trasy - - + + Graphs Grafy - + Moving average window size Velikost okna klouzavého průměru - + Elevation: Výška: - + Speed: Rychlost: - + Heart rate: Tep: - + Cadence: Kadence: - + Power: Výkon: - Outlier elimination - Eliminovat chybné hodnoty GPS signálu + Smoothing + Vyhlazování - + + Eliminate GPS outliers + Odstarnit odlehlé GPS záznamy + + + + Outlier elimination + Odstranění odlehlých hodnot + + + mi/h mi/h - + km/h km/h - + s s - + Minimal speed: Minimální rychlost: - + Minimal duration: Minimální doba trvání: - + Filtering Filtrování - + Pause detection Detekce přestávek - + mi mi - + km km - + POI radius: POI radius: - - + + POI POI - + Name Název - + Date Datum - + Distance Vzdálenost - + Time Čas - + Moving time Čistý čas - + Item count (>1) Počet objektů (>1) - + Separate graph page Samostatná stránka s grafy - + Header Záhlaví - + Use OpenGL Používat OpenGL - + MB MB - + Image cache size: Mezipaměť obrázků: - - + + System Systém - + Appearance Vzhled - + Data Data - + Print & Export Tisk a export - + Options Nastavení diff --git a/lang/gpxsee_de.ts b/lang/gpxsee_de.ts index fc081e5b..8bad3341 100644 --- a/lang/gpxsee_de.ts +++ b/lang/gpxsee_de.ts @@ -799,200 +799,210 @@ - + Use anti-aliasing Anti-Aliasing verwenden - + Line width: Linienbreite: - + Colors Farben - + Paths Pfade - - + + Graphs Graphen - + Moving average window size Fensterbreite des gleitenden Mittelwerts - + Elevation: Höhe: - + Speed: Geschwindigkeit: - + Heart rate: Herzfrequenz: - + Cadence: Frequenz: - + Power: Leistung: - Outlier elimination - Ausreißer entfernen + Smoothing + Glätten - + + Eliminate GPS outliers + GPS Ausreißer entfernen + + + + Outlier elimination + Ausreißer Entfernung + + + mi/h mi/h - + km/h km/h - + s sek - + Minimal speed: Minimale Geschwindigkeit: - + Minimal duration: Minimale Dauer: - + Filtering Datenfilterung - + Pause detection Pausenerkennung - + mi mi - + km km - + POI radius: POI-Radius: - - + + POI POI - + Name Name - + Date Datum - + Distance Distanz - + Time Zeit - + Moving time Bewegungszeit - + Item count (>1) Elementanzahl (>1) - + Separate graph page Separate Seite für Graphen - + Header Kopfzeile - + Use OpenGL OpenGL verwenden - + MB MB - + Image cache size: Bild-Cache größe: - - + + System System - + Appearance Erscheinungsbild - + Data Daten - + Print & Export Druck & Export - + Options Einstellungen diff --git a/lang/gpxsee_sv.ts b/lang/gpxsee_sv.ts index 041e64fc..b1a92dc3 100644 --- a/lang/gpxsee_sv.ts +++ b/lang/gpxsee_sv.ts @@ -799,200 +799,210 @@ - + Use anti-aliasing Använd kantutjämning - + Line width: Linjetjocklek: - + Colors Färger - + Paths Sökvägar - - + + Graphs Diagram - + Moving average window size - + Elevation: Höjd: - + Speed: Hastighet: - + Heart rate: Hjärtfrekvens: - + Cadence: Stegfrekvens: - + Power: Kraft: + Smoothing + + + + + Eliminate GPS outliers + + + + Outlier elimination - + mi/h mi/h - + km/h km/h - + s sek - + Minimal speed: - + Minimal duration: - + Filtering - + Pause detection - + mi mi - + km km - + POI radius: POI-radie: - - + + POI POI - + Name Namn - + Date Datum - + Distance Avstånd - + Time Tid - + Moving time Förflyttningstid - + Item count (>1) Objektantal (>1) - + Separate graph page Separat diagramsida - + Header - + Use OpenGL Använd OpenGL - + MB - + Image cache size: - - + + System System - + Appearance Utseende - + Data Data - + Print & Export Utskrift & Export - + Options Alternativ diff --git a/src/optionsdialog.cpp b/src/optionsdialog.cpp index 9834752e..63238671 100644 --- a/src/optionsdialog.cpp +++ b/src/optionsdialog.cpp @@ -88,6 +88,7 @@ QWidget *OptionsDialog::createAppearancePage() pathTabLayout->addWidget(routeBox); #endif pathTabLayout->addLayout(pathAALayout); + pathTabLayout->addStretch(); pathTab->setLayout(pathTabLayout); _graphWidth = new QSpinBox(); @@ -137,26 +138,31 @@ QWidget *OptionsDialog::createDataPage() _powerFilter->setValue(_options->powerFilter); _powerFilter->setToolTip(filterToolTip); - QFormLayout *filterLayout = new QFormLayout(); - filterLayout->addRow(tr("Elevation:"), _elevationFilter); - filterLayout->addRow(tr("Speed:"), _speedFilter); - filterLayout->addRow(tr("Heart rate:"), _heartRateFilter); - filterLayout->addRow(tr("Cadence:"), _cadenceFilter); - filterLayout->addRow(tr("Power:"), _powerFilter); + QFormLayout *smoothLayout = new QFormLayout(); + smoothLayout->addRow(tr("Elevation:"), _elevationFilter); + smoothLayout->addRow(tr("Speed:"), _speedFilter); + smoothLayout->addRow(tr("Heart rate:"), _heartRateFilter); + smoothLayout->addRow(tr("Cadence:"), _cadenceFilter); + smoothLayout->addRow(tr("Power:"), _powerFilter); + QGroupBox *smoothBox = new QGroupBox(tr("Smoothing")); + smoothBox->setLayout(smoothLayout); - _outlierEliminate = new QCheckBox(tr("Outlier elimination")); + _outlierEliminate = new QCheckBox(tr("Eliminate GPS outliers")); _outlierEliminate->setChecked(_options->outlierEliminate); QFormLayout *outlierLayout = new QFormLayout(); outlierLayout->addWidget(_outlierEliminate); + QGroupBox *outlierBox = new QGroupBox(tr("Outlier elimination")); + outlierBox->setLayout(outlierLayout); QWidget *filterTab = new QWidget(); QVBoxLayout *filterTabLayout = new QVBoxLayout(); - filterTabLayout->addLayout(filterLayout); - filterTabLayout->addLayout(outlierLayout); + filterTabLayout->addWidget(outlierBox); + filterTabLayout->addWidget(smoothBox); filterTabLayout->addStretch(); filterTab->setLayout(filterTabLayout); + _pauseSpeed = new QDoubleSpinBox(); _pauseSpeed->setDecimals(1); _pauseSpeed->setSingleStep(0.1);