summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/ntp.cpp42
-rw-r--r--noncore/settings/netsystemtime/ntp.h1
-rw-r--r--noncore/settings/netsystemtime/ntpbase.ui117
3 files changed, 134 insertions, 26 deletions
diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp
index c2b64f0..04b113b 100644
--- a/noncore/settings/netsystemtime/ntp.cpp
+++ b/noncore/settings/netsystemtime/ntp.cpp
@@ -30,8 +30,9 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl )
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()) );
slotRunNtp();
readLookups();
@@ -79,9 +80,9 @@ void Ntp::ntpFinished(OProcess*)
int time = TimeConversion::toUTC( QDateTime::currentDateTime() );
cfg.writeEntry("time", time);
float timeShift = getTimeShift();
- if (timeShift = 0.0) return;
+ if (timeShift == 0.0) return;
int secsSinceLast = time - lastLookup;
TextLabelNewTime->setText(QDateTime::currentDateTime().toString());
if ( lastLookup > 0 && secsSinceLast > 60*_minLookupDiff)
{
@@ -89,9 +90,9 @@ void Ntp::ntpFinished(OProcess*)
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);
+ 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));
}
}
@@ -136,11 +137,44 @@ 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));
- TableLookups->setText( 1,i,cfg.readEntry("secsSinceLast",0));
- TableLookups->setText( 2,i,cfg.readEntry("timeShift",0));
+ 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);
+ int now = TimeConversion::toUTC( QDateTime::currentDateTime() );
+ int corr = int((now - lastTime) * _shiftPerSec);
+ outPut->append( "time will be shifted by "+QString::number(corr)+ "secs");
+ TextLabelPredTime->setText(QDateTime::currentDateTime().addSecs(corr).toString());
}
diff --git a/noncore/settings/netsystemtime/ntp.h b/noncore/settings/netsystemtime/ntp.h
index 4dc04b1..e3f6d16 100644
--- a/noncore/settings/netsystemtime/ntp.h
+++ b/noncore/settings/netsystemtime/ntp.h
@@ -31,7 +31,8 @@ private slots:
void slotRunNtp();
void getNtpOutput(OProcess *proc, char *buffer, int buflen);
void ntpFinished(OProcess*);
void correctClock();
+ void preditctTime();
};
#endif
diff --git a/noncore/settings/netsystemtime/ntpbase.ui b/noncore/settings/netsystemtime/ntpbase.ui
index eb09e4a..1c1e1aa 100644
--- a/noncore/settings/netsystemtime/ntpbase.ui
+++ b/noncore/settings/netsystemtime/ntpbase.ui
@@ -10,9 +10,9 @@
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>296</width>
+ <width>292</width>
<height>337</height>
</rect>
</property>
<property stdset="1">
@@ -139,9 +139,9 @@
<cstring>TextLabelStartTime</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string></string>
+ <string>nan</string>
</property>
</widget>
<widget>
<class>QLabel</class>
@@ -161,9 +161,9 @@
<cstring>TextLabelTimeShift</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string></string>
+ <string>nan</string>
</property>
</widget>
<widget>
<class>QLabel</class>
@@ -183,9 +183,9 @@
<cstring>TextLabelNewTime</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string></string>
+ <string>nan</string>
</property>
</widget>
<spacer>
<property>
@@ -258,32 +258,105 @@
<attribute>
<name>title</name>
<string>Auto Correction</string>
</attribute>
- <widget>
- <class>QTable</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TableLookups</cstring>
- </property>
- <property stdset="1">
- <name>geometry</name>
- <rect>
- <x>10</x>
- <y>10</y>
- <width>270</width>
- <height>220</height>
- </rect>
- </property>
+ <grid>
<property stdset="1">
- <name>numRows</name>
+ <name>margin</name>
<number>2</number>
</property>
<property stdset="1">
- <name>numCols</name>
+ <name>spacing</name>
<number>2</number>
</property>
- </widget>
+ <widget row="0" column="0" >
+ <class>QTable</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TableLookups</cstring>
+ </property>
+ <property stdset="1">
+ <name>numRows</name>
+ <number>2</number>
+ </property>
+ <property stdset="1">
+ <name>numCols</name>
+ <number>2</number>
+ </property>
+ </widget>
+ <widget row="2" column="0" >
+ <class>QPushButton</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>PushButtonPredict</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>predict time</string>
+ </property>
+ </widget>
+ <widget row="1" column="0" >
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout5</cstring>
+ </property>
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget row="0" column="1" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabelShift</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>nan</string>
+ </property>
+ </widget>
+ <widget row="1" column="1" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabelPredTime</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>nan</string>
+ </property>
+ </widget>
+ <widget row="0" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Mean_shift_label</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Mean shift:</string>
+ </property>
+ </widget>
+ <widget row="1" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel3_2</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Pred. Time:</string>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ </grid>
</widget>
<widget>
<class>QWidget</class>
<property stdset="1">