qt4 update

git-svn-id: http://svn.osgeo.org/qgis/trunk@4700 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 18, 2006 · 982fa15 · 982fa15
1 parent 6c0a710
commit 982fa15
Show file tree

Hide file tree

Showing 5 changed files with 267 additions and 193 deletions.
diff --git a/src/plugins/grass/Makefile.am b/src/plugins/grass/Makefile.am
@@ -23,7 +23,7 @@ endif
 plugindir = ${pkglibdir}
 
 grassdatadir = ${pkgdatadir}/grass/
-grassdata_DATA = *.gml
+grassdata_DATA = *.gml images/world.png
 
 %.moc.cpp: %.h
 	$(MOC) -o $@ $<

diff --git a/src/plugins/grass/locations.gml b/src/plugins/grass/locations.gml
@@ -977,7 +977,7 @@
  <gml:featureMember>
    <gml:name>Tanzania United Republic of</gml:name>
      <gml:Envelope>
-      <gml:coordinates>,-0.54 28.96,41.23</gml:coordinates>
+      <gml:coordinates>0,-0.54 28.96,41.23</gml:coordinates>
      </gml:Envelope>
  </gml:featureMember>
  <gml:featureMember>

diff --git a/src/plugins/grass/qgsgrassnewmapset.cpp b/src/plugins/grass/qgsgrassnewmapset.cpp
@@ -47,6 +47,7 @@
 #include <Q3Wizard>
 
 #include "qgis.h"
+#include "qgsapplication.h"
 #include "qgsmapcanvas.h"
 #include "qgsproject.h"
 #include "qgsrect.h"
@@ -70,13 +71,24 @@ QgsGrassNewMapset::QgsGrassNewMapset ( QgisApp *qgisApp, QgisIface *iface,
   std::cerr << "QgsGrassNewMapset()" << std::endl;
 #endif
 
+    setupUi(this);
+
     mRunning = true;
     mQgisApp = qgisApp;
     mIface = iface;
     mProjectionSelector = 0;
     mPreviousPage = -1;
     mRegionModified = false;
-    mPixmap = QPixmap( *(mRegionMap->pixmap()) );
+
+    QString mapPath = QgsApplication::pkgDataPath() + "/grass/world.png";
+#ifdef QGISDEBUG
+    std::cerr << "mapPath = " << mapPath.ascii() << std::endl;
+#endif
+
+    //mPixmap = QPixmap( *(mRegionMap->pixmap()) );
+    mPixmap.load ( mapPath );
+    std::cerr << "mPixmap.isNull() = " << mPixmap.isNull() << std::endl;
+
     mRegionsInited = false;
     mPlugin = plugin;
 
@@ -808,9 +820,21 @@ void QgsGrassNewMapset::loadRegions()
         if ( coorNodes.item(0).isNull() ) continue;
         QDomElement coorElem = coorNodes.item(0).toElement();
         if ( coorElem.text().isNull() ) continue;
+
         QStringList coor = QStringList::split ( " ", coorElem.text() );
+        if ( coor.size() != 2 )
+        {
+            std::cerr << "Cannot parse coordinates: " << coorElem.text().ascii() << std::endl;
+            continue;
+        }
+
         QStringList ll = QStringList::split ( ",", coor[0] );
         QStringList ur = QStringList::split ( ",", coor[1] );
+        if ( ll.size() != 2 || ur.size() != 2 )
+        {
+            std::cerr << "Cannot parse coordinates: " << coorElem.text().ascii() << std::endl;
+            continue;
+        }
 
         // Add region
         mRegionsComboBox->insertItem ( nameElem.text() );
@@ -1019,6 +1043,7 @@ void QgsGrassNewMapset::drawRegion()
 
     if ( mCellHead.proj == PROJECTION_XY ) return; 
 
+    std::cerr << "pm.isNull() = " << pm.isNull() << std::endl;
     QPainter p ( &pm );
     p.setPen( QPen(QColor(255,0,0),3) );
 
@@ -1154,13 +1179,10 @@ void QgsGrassNewMapset::drawRegion()
 			 180+shift+(int)x2, 90-(int)points[i+1].y() );
 	}
     }
-    std::cerr << "<<<<<<<<<<" << std::endl;
 
     p.end();
-    std::cerr << "<<<<<<<<<<" << std::endl;
 
     mRegionMap->setPixmap( pm );
-    std::cerr << "<<<<<<<<<<" << std::endl;
 }
 
 /**************************** MAPSET ********************************/

diff --git a/src/plugins/grass/qgsgrassnewmapset.h b/src/plugins/grass/qgsgrassnewmapset.h
@@ -80,9 +80,11 @@ class QgsGrassNewMapset : public Q3Wizard, private Ui::QgsGrassNewMapsetBase
 
 public slots:
     //! Browse database
+    void on_mDatabaseButton_clicked() { browseDatabase(); }
     void browseDatabase();
 
     //! Database changed
+    void on_mDatabaseLineEdit_returnPressed() { databaseChanged(); }
     void databaseChanged();
 
     /***************** LOCATION *****************/
@@ -93,12 +95,17 @@ public slots:
     void setLocations ( );
 
     //! Location radio switched
+    void on_mCreateLocationRadioButton_clicked() { locationRadioSwitched(); }
+    void on_mSelectLocationRadioButton_clicked() { locationRadioSwitched(); }
     void locationRadioSwitched ( );
 
     //! Existing location selection
+    void on_mLocationComboBox_textChanged(const QString &txt) {
+            existingLocationChanged ( txt ); }
     void existingLocationChanged(const QString&);
 
     //! New location name has changed
+    void on_mLocationLineEdit_returnPressed() { newLocationChanged(); }
     void newLocationChanged();
 
     //! Check location
@@ -113,6 +120,8 @@ public slots:
     void projectionSelected();
 
     //! Location radio switched
+    void on_mNoProjRadioButton_clicked() { projRadioSwitched(); }
+    void on_mProjRadioButton_clicked() { projRadioSwitched(); }
     void projRadioSwitched ( );
 
     //! Set GRASS projection structures for currently selected projection
@@ -127,12 +136,18 @@ public slots:
     void setGrassRegionDefaults();
 
     //! Region Changed
+    void on_mNorthLineEdit_returnPressed() { regionChanged(); }
+    void on_mSouthLineEdit_returnPressed() { regionChanged(); }
+    void on_mEastLineEdit_returnPressed() { regionChanged(); }
+    void on_mWestLineEdit_returnPressed() { regionChanged(); }
     void regionChanged();
 
     //! Set current QGIS region
+    void on_mCurrentRegionButton_clicked() { setCurrentRegion(); }
     void setCurrentRegion();
 
     //! Set region selected in combo box
+    void on_mRegionButton_clicked() { setSelectedRegion(); }
     void setSelectedRegion();
 
     //! Draw current region on map
@@ -144,6 +159,7 @@ public slots:
     void setMapsets();
 
     //! Mapset name changed
+    void on_mMapsetLineEdit_returnPressed() { mapsetChanged(); }
     void mapsetChanged();
 
     /******************** FINISH ******************/