summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/ntp.cpp50
-rw-r--r--noncore/settings/netsystemtime/ntp.h4
-rw-r--r--noncore/settings/netsystemtime/settime.cpp20
-rw-r--r--noncore/settings/netsystemtime/settime.h1
4 files changed, 43 insertions, 32 deletions
diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp
index ddb1372..87b20ec 100644
--- a/noncore/settings/netsystemtime/ntp.cpp
+++ b/noncore/settings/netsystemtime/ntp.cpp
@@ -1,183 +1,191 @@
#include "ntp.h"
#include <qpushbutton.h>
#include <qregexp.h>
#include <qtable.h>
#include <qlabel.h>
#include <qlineedit.h>
#include <qmultilineedit.h>
#include <opie/oprocess.h>
#include <qpe/config.h>
#include <qpe/global.h>
#include <qpe/timeconversion.h>
#include <qpe/tzselect.h>
#include <qpe/timestring.h>
#include <qpe/qpedialog.h>
#include <sys/time.h>
#include <time.h>
#include <stdlib.h>
Ntp::Ntp( QWidget* parent, const char* name, WFlags fl )
: SetDateTime( parent, name, fl )
{
Config cfg("ntp",Config::User);
cfg.setGroup("settings");
_maxOffset = cfg.readNumEntry("maxOffset",5);
_minLookupDiff = cfg.readNumEntry("minLookupDiff",10);
LineEditNtpServer->setText( cfg.readEntry("ntpServer") );
ntpProcess = new OProcess( );
connect ( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)),
this, SLOT(getNtpOutput(OProcess*,char*,int)));
connect ( ntpProcess, SIGNAL(processExited(OProcess*)),
this, SLOT(ntpFinished(OProcess*)));
connect(runNtp, SIGNAL(clicked()), this, SLOT(slotRunNtp()));
connect(PushButtonPredict, SIGNAL(clicked()), this, SLOT(preditctTime()));
- _nextCorrection = new QTimer( this );
- connect( _nextCorrection, SIGNAL(timeout()), SLOT(correctClock()) );
+// _nextCorrection = new QTimer( this );
+// connect( _nextCorrection, SIGNAL(timeout()), SLOT(correctClock()) );
slotRunNtp();
readLookups();
}
Ntp::~Ntp()
{
}
void Ntp::accept()
{
Config cfg("ntp",Config::User);
cfg.setGroup("settings");
cfg.writeEntry("ntpServer", LineEditNtpServer->text());
}
void Ntp::slotRunNtp()
{
TextLabelStartTime->setText(QDateTime::currentDateTime().toString());
ntpProcess->clearArguments();
*ntpProcess << "ntpdate" << LineEditNtpServer->text();
bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput);
if ( !ret ) {
qDebug("Error while executing ntp");
}
}
void Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen)
{
QString lineStr, lineStrOld;
lineStr = buffer;
lineStr=lineStr.left(buflen);
if (lineStr!=lineStrOld)
{
// outPut->append(lineStr);
_ntpOutput += lineStr;
}
lineStrOld = lineStr;
}
void Ntp::ntpFinished(OProcess*)
{
Config cfg("ntp",Config::User);
cfg.setGroup("lookups");
int lastLookup = cfg.readNumEntry("time",0);
int lookupCount = cfg.readNumEntry("count",-1);
int time = TimeConversion::toUTC( QDateTime::currentDateTime() );
cfg.writeEntry("time", time);
+ cfg.setGroup("correction");
+ cfg.writeEntry("time", time);
float timeShift = getTimeShift();
if (timeShift == 0.0) return;
int secsSinceLast = time - lastLookup;
TextLabelNewTime->setText(QDateTime::currentDateTime().toString());
if ( lastLookup > 0 && secsSinceLast > 60*_minLookupDiff)
{
lookupCount++;
cfg.writeEntry("count",lookupCount);
cfg.setGroup("lookup_"+QString::number(lookupCount));
_shiftPerSec = timeShift / secsSinceLast;
// float nextCorr = _maxOffset / _shiftPerSec;
qDebug("secs since last lookup %i", secsSinceLast);qDebug("timeshift since last lookup %f", timeShift);qDebug("timeshift since per sec %f", _shiftPerSec);
cfg.writeEntry("secsSinceLast",secsSinceLast);
cfg.writeEntry("timeShift",QString::number(timeShift));
}
}
-void Ntp::correctClock()
-{
- qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1());
- Config cfg("ntp",Config::User);
- cfg.setGroup("correction");
- int lastTime = cfg.readNumEntry("time",0);
- int now = TimeConversion::toUTC( QDateTime::currentDateTime() );
- int corr = int((now - lastTime) * _shiftPerSec);
- struct timeval myTv;
- myTv.tv_sec = TimeConversion::toUTC( QDateTime::currentDateTime().addSecs(corr) );
- myTv.tv_usec = 0;
-
- if ( myTv.tv_sec != -1 )
- ::settimeofday( &myTv, 0 );
- Global::writeHWClock();
- cfg.writeEntry("time",now);
- qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1());
-}
+//void Ntp::correctClock()
+//{
+// qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1());
+// Config cfg("ntp",Config::User);
+// cfg.setGroup("correction");
+// int lastTime = cfg.readNumEntry("time",0);
+// if ( lastTime == 0 )
+// {
+// return;
+// }
+// int now = TimeConversion::toUTC( QDateTime::currentDateTime() );
+// int corr = int((now - lastTime) * _shiftPerSec);
+// struct timeval myTv;
+// myTv.tv_sec = TimeConversion::toUTC( QDateTime::currentDateTime().addSecs(corr) );
+// myTv.tv_usec = 0;
+//
+// if ( myTv.tv_sec != -1 )
+// ::settimeofday( &myTv, 0 );
+// Global::writeHWClock();
+// cfg.writeEntry("time",now);
+// qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1());
+//}
float Ntp::getTimeShift()
{
QString _offset = "offset";
QString _sec = "sec";
QRegExp _reOffset = QRegExp(_offset);
QRegExp _reEndOffset = QRegExp(_sec);
int posOffset = _reOffset.match( _ntpOutput );
int posEndOffset = _reEndOffset.match( _ntpOutput, posOffset );
posOffset += _offset.length() + 1;
QString diff = _ntpOutput.mid(posOffset, posEndOffset-posOffset-1);
qDebug("%s", _ntpOutput.latin1());
qDebug("diff = >%s<",diff.latin1());
TextLabelTimeShift->setText(diff);
return diff.toFloat();
}
void Ntp::readLookups()
{
Config cfg("ntp",Config::User);
cfg.setGroup("lookups");
int lookupCount = cfg.readNumEntry("count",-1);
float last, shift, shiftPerSec;
qDebug("lookupCount = %i",lookupCount);
TableLookups->setNumCols( 3 );
TableLookups->setNumRows( lookupCount);
TableLookups->horizontalHeader()->setLabel(2,"secsSinceLast");
TableLookups->horizontalHeader()->setLabel(1,"timeShift");
TableLookups->horizontalHeader()->setLabel(0,"shift/s");
int cw = TableLookups->width()/4;
qDebug("column width %i",cw);
TableLookups->setColumnWidth( 0, cw );
TableLookups->setColumnWidth( 1, cw );
TableLookups->setColumnWidth( 2, cw );
for (int i=0; i < lookupCount; i++)
{
cfg.setGroup("lookup_"+QString::number(i));
last = cfg.readEntry("secsSinceLast",0).toFloat();
shift = QString(cfg.readEntry("timeShift",0)).toFloat();
qDebug("%i last %f",i,last);
qDebug("%i shift %f",i,shift);
shiftPerSec = shift / last;
_shiftPerSec += shiftPerSec;
TableLookups->setText( i,0,QString::number(shiftPerSec));
TableLookups->setText( i,1,QString::number(shift));
TableLookups->setText( i,2,QString::number(last));
}
_shiftPerSec /= lookupCount+1;
TextLabelShift->setText(QString::number(_shiftPerSec));
}
void Ntp::preditctTime()
{
qDebug("current time: %s",QDateTime::currentDateTime().toString().latin1());
Config cfg("ntp",Config::User);
cfg.setGroup("lookups");
int lastTime = cfg.readNumEntry("time",0);
setenv( "TZ", tz->currentZone(), 1 );
int now = TimeConversion::toUTC( QDateTime::currentDateTime() );
int corr = int((now - lastTime) * _shiftPerSec);
- TextLabelPredTime->setText(QDateTime::currentDateTime().addSecs(corr).toString());
+ QDateTime dt = QDateTime::currentDateTime().addSecs(corr);
+ setTime(dt);
+ TextLabelPredTime->setText(dt.toString());
}
diff --git a/noncore/settings/netsystemtime/ntp.h b/noncore/settings/netsystemtime/ntp.h
index fc233bf..d2e238d 100644
--- a/noncore/settings/netsystemtime/ntp.h
+++ b/noncore/settings/netsystemtime/ntp.h
@@ -1,41 +1,41 @@
#ifndef NTP_H
#define NTP_H
#include "settime.h"
#include <qdatetime.h>
#include <qtimer.h>
class OProcess;
class QString;
class Ntp : public SetDateTime
{
Q_OBJECT
public:
Ntp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~Ntp();
OProcess *ntpProcess;
protected:
virtual void accept();
private:
QString _ntpOutput;
int _maxOffset;
float _shiftPerSec;
- QTimer *_nextCorrection;
+// QTimer *_nextCorrection;
int _minLookupDiff;
float getTimeShift();
void readLookups();
private slots:
void slotRunNtp();
void getNtpOutput(OProcess *proc, char *buffer, int buflen);
void ntpFinished(OProcess*);
- void correctClock();
+// void correctClock();
void preditctTime();
};
#endif
diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp
index dac5bd4..01268c9 100644
--- a/noncore/settings/netsystemtime/settime.cpp
+++ b/noncore/settings/netsystemtime/settime.cpp
@@ -163,130 +163,132 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
SLOT(formatChanged(int)));
QHBoxLayout *hb4 = new QHBoxLayout( vb );
l = new QLabel( tr("Applet format" ), FrameSystemTime );
hb4->addWidget( l, 1 );
clockAppletCombo = new QComboBox( FrameSystemTime );
clockAppletCombo->insertItem( tr("hh:mm"), 0 );
clockAppletCombo->insertItem( tr("D/M hh:mm"), 1 );
clockAppletCombo->insertItem( tr("M/D hh:mm"), 2 );
hb4->addWidget( clockAppletCombo, 2 );
int clockApplet = config.readNumEntry("ClockApplet",0);
clockAppletCombo->setCurrentItem( clockApplet );
vb->addStretch( 0 );
QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ),
timeButton, SLOT( slotTzChange( const QString& ) ) );
QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ),
SLOT( tzChange( const QString& ) ) );
QObject::connect( PushButtonSetManualTime, SLOT(clicked()),
SLOT(commitTime()));
// dl = new QPEDialogListener(this);
}
void SetDateTime::accept()
{
Config config("qpe");
config.setGroup( "Time" );
config.writeEntry( "AMPM", ampmCombo->currentItem() );
config.writeEntry( "MONDAY", weekStartCombo->currentItem() );
config.setGroup( "Date" );
DateFormat df = date_formats[dateFormatCombo->currentItem()];
config.writeEntry( "Separator", QString(df.separator()));
config.writeEntry( "ShortOrder", df.shortOrder());
config.writeEntry( "LongOrder", df.longOrder());
config.writeEntry( "ClockApplet", clockAppletCombo->currentItem() );
Config lconfig("locale");
lconfig.setGroup( "Location" );
lconfig.writeEntry( "Timezone", tz->currentZone() );
}
void SetDateTime::commitTime()
{
- Config cfg("ntp",Config::User);
- cfg.setGroup("lookups");
- int time = TimeConversion::toUTC( QDateTime::currentDateTime() );
- cfg.writeEntry("time", time);
tz->setFocus();
// really turn off the screensaver before doing anything
{
// Needs to be encased in { } so that it deconstructs and sends
QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
disableScreenSaver << 0 << 0 << 0;
}
// Need to process the QCOP event generated above before proceeding
qApp->processEvents();
// before we progress further, set our TZ!
setenv( "TZ", tz->currentZone(), 1 );
// now set the time...
QDateTime dt( dateButton->date(), timeButton->time() );
- if ( dt.isValid() ) {
+ if ( dt.isValid() ) setTime(dt);
+}
+
+void SetDateTime::setTime(QDateTime dt)
+{
+ Config cfg("ntp",Config::User);
+ cfg.setGroup("correction");
+ int t = TimeConversion::toUTC(dt);
struct timeval myTv;
- myTv.tv_sec = TimeConversion::toUTC( dt );
+ myTv.tv_sec = t;
+ cfg.writeEntry("time", t );
myTv.tv_usec = 0;
if ( myTv.tv_sec != -1 )
::settimeofday( &myTv, 0 );
Global::writeHWClock();
// since time has changed quickly load in the datebookdb
// to allow the alarm server to get a better grip on itself
// (example re-trigger alarms for when we travel back in time)
DateBookDB db;
- } else {
- qWarning( "Invalid date/time" );
- }
+
// set the timezone for everyone else...
QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" );
setTimeZone << tz->currentZone();
// AM/PM setting and notify time changed
QCopEnvelope setClock( "QPE/System", "clockChange(bool)" );
setClock << ampmCombo->currentItem();
// Notify everyone what day we prefer to start the week on.
QCopEnvelope setWeek( "QPE/System", "weekChange(bool)" );
setWeek << weekStartCombo->currentItem();
// Notify everyone what date format to use
QCopEnvelope setDateFormat( "QPE/System", "setDateFormat(DateFormat)" );
setDateFormat << date_formats[dateFormatCombo->currentItem()];
// Restore screensaver
QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
enableScreenSaver << -1 << -1 << -1;
// QDialog::accept();
}
void SetDateTime::done(int r)
{
// QDialog::done(r);
close();
}
void SetDateTime::tzChange( const QString &tz )
{
// set the TZ get the time and leave gracefully...
QString strSave;
strSave = getenv( "TZ" );
setenv( "TZ", tz, 1 );
QDate d = QDate::currentDate();
// reset the time.
if ( !strSave.isNull() ) {
setenv( "TZ", strSave, 1 );
}
dateButton->setDate( d );
}
void SetDateTime::formatChanged(int i)
{
dateButton->setDateFormat(date_formats[i]);
}
diff --git a/noncore/settings/netsystemtime/settime.h b/noncore/settings/netsystemtime/settime.h
index 053d17a..729bf4b 100644
--- a/noncore/settings/netsystemtime/settime.h
+++ b/noncore/settings/netsystemtime/settime.h
@@ -31,67 +31,68 @@ class QToolButton;
class QSpinBox;
class QLabel;
class TimeZoneSelector;
class DateBookMonth;
class QComboBox;
//class QPEDialogListener;
class SetTime : public QWidget
{
Q_OBJECT
public:
SetTime( QWidget *parent=0, const char *name=0 );
QTime time() const;
public slots:
void slotTzChange( const QString& tz );
void show12hourTime( int );
protected slots:
void hourChanged( int value );
void minuteChanged( int value );
void checkedPM( int );
protected:
int hour;
int minute;
bool use12hourTime;
QComboBox *ampm;
QSpinBox *sbHour;
QSpinBox *sbMin;
};
class DateButton;
class SetDateTime : public NtpBase
{
Q_OBJECT
public:
SetDateTime( QWidget *parent=0, const char *name=0, WFlags f=0 );
protected slots:
void tzChange( const QString &tz );
void formatChanged(int);
protected:
void commitTime();
+ void setTime(QDateTime dt);
virtual void accept();
virtual void done(int);
SetTime *timeButton;
DateButton *dateButton;
TimeZoneSelector *tz;
QComboBox *weekStartCombo;
QComboBox *ampmCombo;
QComboBox *dateFormatCombo;
QComboBox *clockAppletCombo;
// QPEDialogListener *dl;
DateFormat date_formats[4];
};
#endif