summaryrefslogtreecommitdiffstats
path: root/LogReceiver/ndgui.cpp
diff options
context:
space:
mode:
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 */