napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[locale] Name zones when debugging

Browse Source 
- When debugging timezones, state their names (e.g. UTC offset)
   and also log the pixel position under consideration.
This commit is contained in:
Adriaan de Groot 2018-05-29 06:33:50 -04:00
parent 2c18ba6ddb
commit b7dbc8cc1f
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/modules/locale/timezonewidget/timezonewidget.cpp
View File

@ -27,7 +27,12 @@
#include "timezonewidget.h" #include "timezonewidget.h"
constexpr double MATH_PI = 3.14159265; constexpr static double MATH_PI = 3.14159265;
#ifdef DEBUG_TIMEZONES
// Adds a label to the timezone with this name
constexpr static QLatin1Literal ZONE_NAME( "zone" );
#endif
TimeZoneWidget::TimeZoneWidget( QWidget* parent ) : TimeZoneWidget::TimeZoneWidget( QWidget* parent ) :
QWidget( parent ) QWidget( parent )
@ -50,7 +55,12 @@ TimeZoneWidget::TimeZoneWidget( QWidget* parent ) :
// Zone images // Zone images
QStringList zones = QString( ZONES ).split( " ", QString::SkipEmptyParts ); QStringList zones = QString( ZONES ).split( " ", QString::SkipEmptyParts );
for ( int i = 0; i < zones.size(); ++i ) for ( int i = 0; i < zones.size(); ++i )
{
timeZoneImages.append( QImage( ":/images/timezone_" + zones.at( i ) + ".png" ).scaled( X_SIZE, Y_SIZE, Qt::IgnoreAspectRatio, Qt::SmoothTransformation ) ); timeZoneImages.append( QImage( ":/images/timezone_" + zones.at( i ) + ".png" ).scaled( X_SIZE, Y_SIZE, Qt::IgnoreAspectRatio, Qt::SmoothTransformation ) );
#ifdef DEBUG_TIMEZONES
timeZoneImages.last().setText( ZONE_NAME, zones.at( i ) );
#endif
}
} }
@ -77,15 +87,17 @@ void TimeZoneWidget::setCurrentLocation( LocaleGlobal::Location location )
{ {
currentLocation = location; currentLocation = location;
// Set zone
QPoint pos = getLocationPosition( currentLocation.longitude, currentLocation.latitude );
#ifdef DEBUG_TIMEZONES #ifdef DEBUG_TIMEZONES
cDebug() << "Setting location" << location.region << location.zone << location.country; cDebug() << "Setting location" << location.region << location.zone << location.country;
cDebug() << " .. long" << location.longitude << "lat" << location.latitude; cDebug() << " .. long" << location.longitude << "lat" << location.latitude;
cDebug() << " .. x" << pos.x() << "y" << pos.y();
bool found = false; bool found = false;
#endif #endif
// Set zone
QPoint pos = getLocationPosition( currentLocation.longitude, currentLocation.latitude );
for ( int i = 0; i < timeZoneImages.size(); ++i ) for ( int i = 0; i < timeZoneImages.size(); ++i )
{ {
@ -101,10 +113,10 @@ void TimeZoneWidget::setCurrentLocation( LocaleGlobal::Location location )
{ {
currentZoneImage = zone; currentZoneImage = zone;
found = true; found = true;
cDebug() << " .. First zone found" << i; cDebug() << " .. First zone found" << i << zone.text( ZONE_NAME );
} }
else else
cDebug() << " .. Also in zone" << i; cDebug() << " .. Also in zone" << i << zone.text( ZONE_NAME );
#else #else
currentZoneImage = zone; currentZoneImage = zone;
break; break;