summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/configbase.ui2
-rw-r--r--noncore/net/wellenreiter/gui/gps.cpp2
-rw-r--r--noncore/net/wellenreiter/gui/mainwindow.cpp9
3 files changed, 8 insertions, 5 deletions
diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui
index de6abfc..469effe 100644
--- a/noncore/net/wellenreiter/gui/configbase.ui
+++ b/noncore/net/wellenreiter/gui/configbase.ui
@@ -1389,13 +1389,13 @@
1389 <property stdset="1"> 1389 <property stdset="1">
1390 <name>enabled</name> 1390 <name>enabled</name>
1391 <bool>false</bool> 1391 <bool>false</bool>
1392 </property> 1392 </property>
1393 <property stdset="1"> 1393 <property stdset="1">
1394 <name>text</name> 1394 <name>text</name>
1395 <string>gpsd -p /dev/ttyS3 -s 57600</string> 1395 <string>gpsd -p /dev/ttyS3 -s 4800</string>
1396 </property> 1396 </property>
1397 </widget> 1397 </widget>
1398 <spacer> 1398 <spacer>
1399 <property> 1399 <property>
1400 <name>name</name> 1400 <name>name</name>
1401 <cstring>Spacer4_2</cstring> 1401 <cstring>Spacer4_2</cstring>
diff --git a/noncore/net/wellenreiter/gui/gps.cpp b/noncore/net/wellenreiter/gui/gps.cpp
index 5b1b4a4..b845aa1 100644
--- a/noncore/net/wellenreiter/gui/gps.cpp
+++ b/noncore/net/wellenreiter/gui/gps.cpp
@@ -54,13 +54,13 @@ GpsLocation GPS::position() const
54 { 54 {
55 int numAvail = _socket->bytesAvailable(); 55 int numAvail = _socket->bytesAvailable();
56 qDebug( "GPS write succeeded, %d bytes available for reading...", numAvail ); 56 qDebug( "GPS write succeeded, %d bytes available for reading...", numAvail );
57 if ( numAvail ) 57 if ( numAvail )
58 { 58 {
59 int numRead = _socket->readBlock( &buf[0], sizeof buf ); 59 int numRead = _socket->readBlock( &buf[0], sizeof buf );
60 int numScan = sscanf( &buf[0], "GPSD,P=%lg %lg", &lat, &lon); 60 int numScan = ::sscanf( &buf[0], "GPSD,P=%lg %lg", &lat, &lon);
61 61
62 if ( numRead < 7 || numScan != 2 ) 62 if ( numRead < 7 || numScan != 2 )
63 { 63 {
64 qDebug( "GPS read %d bytes succeeded, invalid response: '%s'", numRead, &buf[0] ); 64 qDebug( "GPS read %d bytes succeeded, invalid response: '%s'", numRead, &buf[0] );
65 return GpsLocation( -111, -111 ); 65 return GpsLocation( -111, -111 );
66 } 66 }
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 72624f7..3729ed0 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -45,12 +45,14 @@ using namespace Opie;
45#else 45#else
46#include "resource.h" 46#include "resource.h"
47#include <qapplication.h> 47#include <qapplication.h>
48#include <qfiledialog.h> 48#include <qfiledialog.h>
49#endif 49#endif
50 50
51#include <unistd.h>
52
51WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) 53WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f )
52 :QMainWindow( parent, name, f ) 54 :QMainWindow( parent, name, f )
53{ 55{
54 cw = new WellenreiterConfigWindow( this ); 56 cw = new WellenreiterConfigWindow( this );
55 mw = new Wellenreiter( this ); 57 mw = new Wellenreiter( this );
56 mw->setConfigWindow( cw ); 58 mw->setConfigWindow( cw );
@@ -131,13 +133,13 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
131 sniffer->setItemEnabled( startID, false ); 133 sniffer->setItemEnabled( startID, false );
132 stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) ); 134 stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) );
133 sniffer->setItemEnabled( stopID, false ); 135 sniffer->setItemEnabled( stopID, false );
134 136
135 QPopupMenu* demo = new QPopupMenu( mb ); 137 QPopupMenu* demo = new QPopupMenu( mb );
136 demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) ); 138 demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) );
137 demo->insertItem( tr( "&Read from GPSd" ), this, SLOT( demoReadFromGps() ) ); 139 //demo->insertItem( tr( "&Read from GPSd" ), this, SLOT( demoReadFromGps() ) );
138 140
139 id = mb->insertItem( tr( "&File" ), file ); 141 id = mb->insertItem( tr( "&File" ), file );
140 //id = mb->insertItem( tr( "&View" ), view ); 142 //id = mb->insertItem( tr( "&View" ), view );
141 //mb->setItemEnabled( id, false ); 143 //mb->setItemEnabled( id, false );
142 id = mb->insertItem( tr( "&Sniffer" ), sniffer ); 144 id = mb->insertItem( tr( "&Sniffer" ), sniffer );
143 145
@@ -216,13 +218,13 @@ void WellenreiterMainWindow::changedSniffingState()
216 } 218 }
217} 219}
218 220
219 221
220WellenreiterMainWindow::~WellenreiterMainWindow() 222WellenreiterMainWindow::~WellenreiterMainWindow()
221{ 223{
222 qDebug( "Wellenreiter:: bye." ); 224 qDebug( "Wellenreiter: bye." );
223}; 225};
224 226
225 227
226void WellenreiterMainWindow::demoAddStations() 228void WellenreiterMainWindow::demoAddStations()
227{ 229{
228 //mw = 0; // test SIGSEGV handling 230 //mw = 0; // test SIGSEGV handling
@@ -236,16 +238,17 @@ void WellenreiterMainWindow::demoAddStations()
236 238
237 239
238void WellenreiterMainWindow::demoReadFromGps() 240void WellenreiterMainWindow::demoReadFromGps()
239{ 241{
240 WellenreiterConfigWindow* configwindow = WellenreiterConfigWindow::instance(); 242 WellenreiterConfigWindow* configwindow = WellenreiterConfigWindow::instance();
241 GPS* gps = new GPS( this ); 243 GPS* gps = new GPS( this );
244 qDebug( "Wellenreiter::demoReadFromGps(): url=gps://%s:%d/", (const char*) configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
242 gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() ); 245 gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
243 GpsLocation loc = gps->position(); 246 GpsLocation loc = gps->position();
244
245 QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n%1" ).arg( loc.dmsPosition() ) ); 247 QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n%1" ).arg( loc.dmsPosition() ) );
248 delete gps;
246} 249}
247 250
248 251
249QString WellenreiterMainWindow::getFileName( bool save ) 252QString WellenreiterMainWindow::getFileName( bool save )
250{ 253{
251 QMap<QString, QStringList> map; 254 QMap<QString, QStringList> map;