[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble/esasocis-2012-eclipse] src/plugins/render/eclipses: EclipsesPlugin: Fix timezone handling
From:       Rene Kuettner <rene () bitkanal ! net>
Date:       2013-01-22 8:37:48
Message-ID: 20130122083748.4A61BA6091 () git ! kde ! org
[Download RAW message or body]

Git commit 7fdbe33dd7fcbcdd3c53cd6f97f0028a49b8db33 by Rene Kuettner.
Committed on 22/01/2013 at 09:37.
Pushed by renek into branch 'esasocis-2012-eclipse'.

EclipsesPlugin: Fix timezone handling

M  +5    -5    src/plugins/render/eclipses/EclipsesItem.cpp
M  +0    -2    src/plugins/render/eclipses/EclipsesModel.cpp

http://commits.kde.org/marble/7fdbe33dd7fcbcdd3c53cd6f97f0028a49b8db33

diff --git a/src/plugins/render/eclipses/EclipsesItem.cpp \
b/src/plugins/render/eclipses/EclipsesItem.cpp index 5a28ec5..1e16235 100644
--- a/src/plugins/render/eclipses/EclipsesItem.cpp
+++ b/src/plugins/render/eclipses/EclipsesItem.cpp
@@ -203,7 +203,7 @@ void EclipsesItem::initialize()
 
     m_dateMaximum = QDateTime( QDate( year, month, day ),
                                QTime( hour, min, secs ),
-                               Qt::UTC ).addSecs( - ( tz * 3600 ) );
+                               Qt::LocalTime );
 
     // get global start/end date of eclipse
  
@@ -214,11 +214,11 @@ void EclipsesItem::initialize()
         m_ecl->getDatefromMJD( mjd_start, year, month, day, hour, min, secs );
         m_startDatePartial = QDateTime( QDate( year, month, day ),
                                         QTime( hour, min, secs ),
-                                        Qt::UTC ).addSecs( - ( tz * 3600 ) );
+                                        Qt::LocalTime );
         m_ecl->getDatefromMJD( mjd_end, year, month, day, hour, min, secs );
         m_endDatePartial = QDateTime( QDate( year, month, day ),
                                       QTime( hour, min, secs ),
-                                      Qt::UTC ).addSecs( - ( tz * 3600 ) );
+                                      Qt::LocalTime );
     } else {
         // duration is shorter than 1 min
         m_startDatePartial = m_dateMaximum;
@@ -230,11 +230,11 @@ void EclipsesItem::initialize()
         m_ecl->getDatefromMJD( mjd_start, year, month, day, hour, min, secs );
         m_startDateTotal = QDateTime( QDate( year, month, day ),
                                       QTime( hour, min, secs ),
-                                      Qt::UTC ).addSecs( - ( tz * 3600 ) );
+                                      Qt::LocalTime );
         m_ecl->getDatefromMJD( mjd_end, year, month, day, hour, min, secs );
         m_endDateTotal = QDateTime( QDate( year, month, day ),
                                     QTime( hour, min, secs ),
-                                    Qt::UTC ).addSecs( - ( tz * 3600 ) );
+                                    Qt::LocalTime );
     }
 
     // detailed calculations are done when required
diff --git a/src/plugins/render/eclipses/EclipsesModel.cpp \
b/src/plugins/render/eclipses/EclipsesModel.cpp index f1fc7b3..de9d6f2 100644
--- a/src/plugins/render/eclipses/EclipsesModel.cpp
+++ b/src/plugins/render/eclipses/EclipsesModel.cpp
@@ -183,8 +183,6 @@ void EclipsesModel::update()
     for( int i = 1; i <= num; ++i ) {
         EclipsesItem *item = new EclipsesItem( m_ecps, i );
         addItem( item );
-        mDebug() << "Eclipse" << i << "added:" << item->dateMaximum()
-            << "(" << item->phaseText() << ")";
     }
 
     endInsertRows();


[prev in list] [next in list] [prev in thread] [next in thread]