GRASS region reprojection fix

git-svn-id: http://svn.osgeo.org/qgis/trunk@15757 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 18, 2011 · 4929260 · 4929260
1 parent 614c3b3
commit 4929260
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
@@ -65,13 +65,6 @@ QgsGrassPlugin::QgsGrassPlugin( QgisInterface * theQgisInterFace ):
   pluginNameQString = tr( "GrassVector" );
   pluginVersionQString = tr( "0.1" );
   pluginDescriptionQString = tr( "GRASS layer" );
-  QString gisdbase = QgsGrass::getDefaultGisdbase();
-  QString location = QgsGrass::getDefaultLocation();
-  mCanvas = qGisInterface->mapCanvas();
-  mCrs = QgsGrass::crs( gisdbase, location );
-  QgsDebugMsg( "mCrs: " + mCrs.toWkt() );
-  setTransform();
-  connect( qGisInterface->mapCanvas()->mapRenderer(), SIGNAL( destinationSrsChanged() ), this, SLOT( setTransform() ) );
 }
 
 QgsGrassPlugin::~QgsGrassPlugin()
@@ -118,9 +111,8 @@ void QgsGrassPlugin::initGui()
   mRegion = 0;
 
   QSettings settings;
-
   QgsGrass::init();
-
+  mCanvas = qGisInterface->mapCanvas();
   QWidget* qgis = qGisInterface->mainWindow();
 
   // Connect project
@@ -598,6 +590,15 @@ void QgsGrassPlugin::displayRegion()
 
   QgsGrass::setLocation( gisdbase, location );
 
+  // TODO: check better if we have to init + maybe the location can change -> mCrs must be reloaded
+  if ( !mCrs.isValid() )
+  {
+    mCrs = QgsGrass::crs( gisdbase, location );
+    QgsDebugMsg( "mCrs: " + mCrs.toWkt() );
+    setTransform();
+    connect( mCanvas->mapRenderer(), SIGNAL( destinationSrsChanged() ), this, SLOT( setTransform() ) );
+  }
+
   struct Cell_head window;
   char *err = G__get_window( &window, ( char * ) "", ( char * ) "WIND", mapset.toLatin1().data() );