summaryrefslogtreecommitdiffstats
path: root/LogReceiver/ndgui.cpp
diff options
context:
space:
mode:
authorNiklas2011-10-05 17:39:35 +0200
committerNiklas2011-10-05 17:39:35 +0200
commitbe915d3cfcc639d6303bf8bc0e5ad825e0ef2f95 (patch)
treec52ed62bb40ad926271f0637f9a29aee2889543c /LogReceiver/ndgui.cpp
parenttried to solve the timing problem. but failed. it is also enough to test for ... (diff)
downloadfbgui-be915d3cfcc639d6303bf8bc0e5ad825e0ef2f95.tar.gz
fbgui-be915d3cfcc639d6303bf8bc0e5ad825e0ef2f95.tar.xz
fbgui-be915d3cfcc639d6303bf8bc0e5ad825e0ef2f95.zip
modified the check for carrier signal. on autoUp==true: if no interface is in running state, the app will check the state of the interface several times (can be specified by us with the _ifUpCountdown value)
Diffstat (limited to 'LogReceiver/ndgui.cpp')
-rw-r--r--LogReceiver/ndgui.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/LogReceiver/ndgui.cpp b/LogReceiver/ndgui.cpp
index eafc2f6..b77c2a1 100644
--- a/LogReceiver/ndgui.cpp
+++ b/LogReceiver/ndgui.cpp
@@ -62,7 +62,7 @@ void ndgui::startNetworkDiscovery(){
disconnect(_webView,SIGNAL(loadFinished(bool)), this, SLOT(startNetworkDiscovery()));
if(!_started) {
_started = true;
- networkDiscovery.initAndRun("209.85.148.105", _userChoice,"/var/tmp/qt_c_socket_custom");
+ networkDiscovery.initAndRun("209.85.148.105", _userChoice, true, "/var/tmp/logfile","/var/tmp/qt_c_socket_custom");
}
else {
qDebug() << "NetworkDiscovery already started";
@@ -108,8 +108,9 @@ void ndgui::continueBoot(QString ifName, int userChoice) {
_webView->load(QUrl("qrc:html/continueBoot.html"));
}
-void ndgui::showLog() {
+QString ndgui::readLogFile() {
qDebug() << "show log";
+ return networkDiscovery.readLogFile();
}
/*test html gui version*/
@@ -130,6 +131,7 @@ int ndgui::ip4_setManualConfiguration(QVariantMap jsonArr) {
}
+
/* slots */