fix #3185 and #4689

qgis · Dec 25, 2011 · 2b39c0f · 2b39c0f
1 parent 78379f6
commit 2b39c0f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/src/app/gps/qgsgpsinformationwidget.cpp
@@ -320,7 +320,7 @@ void QgsGPSInformationWidget::connectGps()
 
   if ( mRadUserPath->isChecked() )
   {
-    port = mCboDevices->itemData( mCboDevices->currentIndex() ).toString();
+    port = mCboDevices->currentText();
 
     if ( port.isEmpty() )
     {

diff --git a/src/core/gps/qextserialport/qextserialenumerator.cpp b/src/core/gps/qextserialport/qextserialenumerator.cpp
@@ -104,7 +104,7 @@ QextSerialEnumerator::~QextSerialEnumerator( )
           infoList.append(info);
 
           CloseHandle( hPort );
-				}
+	}
 #endif
     }
 

diff --git a/src/core/gps/qgsgpsdetector.cpp b/src/core/gps/qgsgpsdetector.cpp
@@ -89,7 +89,7 @@ QList< QPair<QString, QString> > QgsGPSDetector::availablePorts()
 QgsGPSDetector::QgsGPSDetector( QString portName )
 {
   mConn = 0;
-  mBaudList << BAUD4800 << BAUD9600 << BAUD38400;
+  mBaudList << BAUD4800 << BAUD9600 << BAUD38400 << BAUD57600 << BAUD115200;  //add 57600 for SXBlueII GPS unit
 
   if ( portName.isEmpty() )
   {

diff --git a/src/ui/qgsgpsinformationwidgetbase.ui b/src/ui/qgsgpsinformationwidgetbase.ui
@@ -335,6 +335,9 @@
                   <property name="enabled">
                    <bool>false</bool>
                   </property>
+                  <property name="editable">
+                   <bool>true</bool>
+                  </property>
                  </widget>
                 </item>
                 <item>