From c2eb66bc5c5ac4225edff8b369026bd208f8c148 Mon Sep 17 00:00:00 2001 From: tille Date: Thu, 20 Jun 2002 22:13:34 +0000 Subject: here it is... --- diff --git a/example/main.cpp b/example/main.cpp index b705c44..2b23751 100644 --- a/example/main.cpp +++ b/example/main.cpp @@ -1,11 +1,11 @@ -#include "example.h" +#include "ntp.h" #include int main( int argc, char ** argv ) { QPEApplication a( argc, argv ); - Example mw; + Ntp mw; a.showMainWidget( &mw ); return a.exec(); diff --git a/example/netsystemtime.pro b/example/netsystemtime.pro new file mode 100644 index 0000000..b98e45d --- a/dev/null +++ b/example/netsystemtime.pro @@ -0,0 +1,10 @@ +TEMPLATE = app +CONFIG = qt warn_on debug +#CONFIG = qt warn_on release +HEADERS = ntp.h +SOURCES = main.cpp ntp.cpp +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include +LIBS += -lqpe -lopie +INTERFACES = ntpbase.ui +TARGET = ../../bin/netsystemtime diff --git a/example/ntp.cpp b/example/ntp.cpp new file mode 100644 index 0000000..5357cae --- a/dev/null +++ b/example/ntp.cpp @@ -0,0 +1,130 @@ +#include "ntp.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) + : NtpBase( 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())); + _nextCorrection = new QTimer( this ); + connect( _nextCorrection, SIGNAL(timeout()), SLOT(correctClock()) ); + slotRunNtp(); +} + +Ntp::~Ntp() +{ + 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"); + outPut->append("\nError while executing\n\n"); + } +} + +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); + + float timeShift = getTimeShift(); + 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);qDebug("in %f secs the time will be shifted by %i", nextCorr,_maxOffset); + 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); + outPut->append( "time will be shifted by "+QString::number(corr)+ "secs"); + 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(); +} \ No newline at end of file diff --git a/example/ntp.h b/example/ntp.h new file mode 100644 index 0000000..c9c2e9b --- a/dev/null +++ b/example/ntp.h @@ -0,0 +1,35 @@ +#ifndef NTP_H +#define NTP_H +#include "ntpbase.h" +#include +#include + +class OProcess; +class QString; + + +class Ntp : public NtpBase +{ + Q_OBJECT + +public: + Ntp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + ~Ntp(); + + OProcess *ntpProcess; + +private: + QString _ntpOutput; + int _maxOffset; + float _shiftPerSec; + QTimer *_nextCorrection; + float getTimeShift(); + int _minLookupDiff; +private slots: + void slotRunNtp(); + void getNtpOutput(OProcess *proc, char *buffer, int buflen); + void ntpFinished(OProcess*); + void correctClock(); +}; + +#endif diff --git a/example/ntpbase.ui b/example/ntpbase.ui new file mode 100644 index 0000000..eb09e4a --- a/dev/null +++ b/example/ntpbase.ui @@ -0,0 +1,322 @@ + +NtpBase + + QWidget + + name + NtpBase + + + geometry + + 0 + 0 + 296 + 337 + + + + caption + Network Time + + + layoutMargin + + + layoutSpacing + + + + margin + 2 + + + spacing + 1 + + + QTabWidget + + name + TabWidgetMain + + + layoutMargin + + + layoutSpacing + + + QWidget + + name + tabNtp + + + title + NTP + + + + margin + 3 + + + spacing + 3 + + + QPushButton + + name + runNtp + + + text + get time from network + + + + QFrame + + name + FrameNtp + + + frameShape + StyledPanel + + + frameShadow + Raised + + + layoutMargin + + + + margin + 11 + + + spacing + 6 + + + QLayoutWidget + + name + Layout4 + + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + TextLabel1 + + + autoMask + false + + + text + Start Time: + + + + QLabel + + name + TextLabelStartTime + + + text + + + + + QLabel + + name + TextLabel3 + + + text + Time Shift: + + + + QLabel + + name + TextLabelTimeShift + + + text + + + + + QLabel + + name + TextLabel5 + + + text + New Time: + + + + QLabel + + name + TextLabelNewTime + + + text + + + + + + name + Spacer1 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + + QLayoutWidget + + name + Layout6 + + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + TextLabel7 + + + text + NTP Server: + + + + QLineEdit + + name + LineEditNtpServer + + + + + + + + + + QWidget + + name + tab + + + title + Auto Correction + + + QTable + + name + TableLookups + + + geometry + + 10 + 10 + 270 + 220 + + + + numRows + 2 + + + numCols + 2 + + + + + QWidget + + name + TabDebug + + + title + Debug + + + + margin + 3 + + + spacing + 6 + + + QMultiLineEdit + + name + outPut + + + wordWrap + WidgetWidth + + + + + + + + diff --git a/example/opie-netsystemtime.control b/example/opie-netsystemtime.control new file mode 100644 index 0000000..e6f5e2d --- a/dev/null +++ b/example/opie-netsystemtime.control @@ -0,0 +1,8 @@ +Files: bin/netsystemtime apps/Settings/ntpdatetime.desktop +Priority: optional +Section: opie/settings +Maintainer: Patrick S. Vogt +Architecture: arm +Version: $QPE_VERSION-$SUB_VERSION +Depends: opie-base ($QPE_VERSION) +Description: ntp ( Network Time Protocol) gui -- cgit v0.9.0.2