[GRASS] fixed saving mapset to project

blazek · blazek · commit 42953e618ab4 · 2015-08-24T15:13:24.000+02:00
diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
@@ -93,6 +93,7 @@ QgsGrassPlugin::~QgsGrassPlugin()
   {
     mEdit->closeEdit();
   }
+  disconnect( QgsGrass::instance(), SIGNAL( mapsetChanged() ), this, SLOT( mapsetChanged() ) );
   QgsGrass::instance()->closeMapsetWarn();
 }
 
@@ -181,7 +182,7 @@ void QgsGrassPlugin::initGui()
   connect( mRegionAction, SIGNAL( toggled( bool ) ), this, SLOT( switchRegion( bool ) ) );
   connect( mOpenMapsetAction, SIGNAL( triggered() ), this, SLOT( openMapset() ) );
   connect( mNewMapsetAction, SIGNAL( triggered() ), this, SLOT( newMapset() ) );
-  connect( mCloseMapsetAction, SIGNAL( triggered() ), QgsGrass::instance(), SLOT( closeMapsetWarn() ) );
+  connect( mCloseMapsetAction, SIGNAL( triggered() ), SLOT( closeMapset() ) );
 
   // Add actions to a GRASS plugin menu
   qGisInterface->addPluginToMenu( tr( "&GRASS" ), mOpenMapsetAction );
@@ -527,6 +528,13 @@ void QgsGrassPlugin::openMapset()
     QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open the mapset. %1" ).arg( err ) );
     return;
   }
+  QgsGrass::saveMapset();
+}
+
+void QgsGrassPlugin::closeMapset()
+{
+  QgsGrass::instance()->closeMapsetWarn();
+  QgsGrass::saveMapset();
 }
 
 void QgsGrassPlugin::newMapset()
@@ -577,6 +585,7 @@ void QgsGrassPlugin::projectRead()
   QgsGrass::instance()->closeMapsetWarn();
 
   QString err = QgsGrass::openMapset( gisdbase, location, mapset );
+  QgsGrass::saveMapset();
 
   if ( !err.isNull() )
   {
diff --git a/src/plugins/grass/qgsgrassplugin.h b/src/plugins/grass/qgsgrassplugin.h
@@ -97,8 +97,10 @@ class QgsGrassPlugin : public QObject, public QgisPlugin
     void openTools( void );
     //! Create new mapset
     void newMapset();
-    //! Open existing mapset
+    //! Open existing mapset and save it to project
     void openMapset();
+    //! Close mapset and save it to project
+    void closeMapset();
     //! Current mapset changed (opened/closed)
     void mapsetChanged();
     //! Create new vector
diff --git a/src/plugins/grass/qgsgrasstools.cpp b/src/plugins/grass/qgsgrasstools.cpp
@@ -153,7 +153,7 @@ QgsGrassTools::QgsGrassTools( QgisInterface *iface, QWidget * parent, const char
   setupUi( this );
   QPushButton * closeMapsetButton = new QPushButton( QgsApplication::getThemeIcon( "mActionFileExit.png" ), tr( "Close mapset" ), this );
   mTabWidget->setCornerWidget( closeMapsetButton );
-  connect( closeMapsetButton, SIGNAL( clicked() ), QgsGrass::instance(), SLOT( closeMapsetWarn() ) );
+  connect( closeMapsetButton, SIGNAL( clicked() ), SLOT( closeMapset() ) );
 
   qRegisterMetaType<QgsDetailedItemData>();
 
@@ -537,6 +537,12 @@ void QgsGrassTools::removeEmptyItems( QStandardItem *item )
   }
 }
 
+void QgsGrassTools::closeMapset()
+{
+  QgsGrass::instance()->closeMapsetWarn();
+  QgsGrass::saveMapset();
+}
+
 void QgsGrassTools::mapsetChanged()
 {
   QgsDebugMsg( "entered." );
diff --git a/src/plugins/grass/qgsgrasstools.h b/src/plugins/grass/qgsgrasstools.h
@@ -77,6 +77,9 @@ class QgsGrassTools: public QDockWidget, private Ui::QgsGrassToolsBase
     //! Save window position
     void saveWindowLocation();
 
+    //! Close mapset and save it to project
+    void closeMapset();
+
     //! Current mapset changed
     void mapsetChanged();
 
diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp
@@ -856,7 +856,6 @@ QString QgsGrass::openMapset( const QString& gisdbase,
 
   mMapsetLock = lock;
 
-  saveMapset();
   emit QgsGrass::instance()->mapsetChanged();
   return QString::null;
 }
@@ -919,7 +918,6 @@ QString QgsGrass::closeMapset()
     }
   }
 
-  saveMapset();
   emit QgsGrass::instance()->mapsetChanged();
   return QString::null;
 }
diff --git a/src/providers/grass/qgsgrassprovidermodule.cpp b/src/providers/grass/qgsgrassprovidermodule.cpp
@@ -626,7 +626,9 @@ void QgsGrassMapsetItem::openMapset()
   if ( !error.isEmpty() )
   {
     QgsGrass::warning( error );
+    return;
   }
+  QgsGrass::saveMapset();
 }
 
 //----------------------- QgsGrassObjectItemBase ------------------------------

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ QgsGrassPlugin::~QgsGrassPlugin()`
`93`	`93`	`{`
`94`	`94`	`mEdit->closeEdit();`
`95`	`95`	`}`
	`96`	`+ disconnect( QgsGrass::instance(), SIGNAL( mapsetChanged() ), this, SLOT( mapsetChanged() ) );`
`96`	`97`	`QgsGrass::instance()->closeMapsetWarn();`
`97`	`98`	`}`
`98`	`99`
`@@ -181,7 +182,7 @@ void QgsGrassPlugin::initGui()`
`181`	`182`	`connect( mRegionAction, SIGNAL( toggled( bool ) ), this, SLOT( switchRegion( bool ) ) );`
`182`	`183`	`connect( mOpenMapsetAction, SIGNAL( triggered() ), this, SLOT( openMapset() ) );`
`183`	`184`	`connect( mNewMapsetAction, SIGNAL( triggered() ), this, SLOT( newMapset() ) );`
`184`		`- connect( mCloseMapsetAction, SIGNAL( triggered() ), QgsGrass::instance(), SLOT( closeMapsetWarn() ) );`
	`185`	`+ connect( mCloseMapsetAction, SIGNAL( triggered() ), SLOT( closeMapset() ) );`
`185`	`186`
`186`	`187`	`// Add actions to a GRASS plugin menu`
`187`	`188`	`qGisInterface->addPluginToMenu( tr( "&GRASS" ), mOpenMapsetAction );`
`@@ -527,6 +528,13 @@ void QgsGrassPlugin::openMapset()`
`527`	`528`	`QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open the mapset. %1" ).arg( err ) );`
`528`	`529`	`return;`
`529`	`530`	`}`
	`531`	`+ QgsGrass::saveMapset();`
	`532`	`+}`
	`533`	`+`
	`534`	`+void QgsGrassPlugin::closeMapset()`
	`535`	`+{`
	`536`	`+ QgsGrass::instance()->closeMapsetWarn();`
	`537`	`+ QgsGrass::saveMapset();`
`530`	`538`	`}`
`531`	`539`
`532`	`540`	`void QgsGrassPlugin::newMapset()`
`@@ -577,6 +585,7 @@ void QgsGrassPlugin::projectRead()`
`577`	`585`	`QgsGrass::instance()->closeMapsetWarn();`
`578`	`586`
`579`	`587`	`QString err = QgsGrass::openMapset( gisdbase, location, mapset );`
	`588`	`+ QgsGrass::saveMapset();`
`580`	`589`
`581`	`590`	`if ( !err.isNull() )`
`582`	`591`	`{`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ QgsGrassTools::QgsGrassTools( QgisInterface iface, QWidget parent, const char`
`153`	`153`	`setupUi( this );`
`154`	`154`	`QPushButton * closeMapsetButton = new QPushButton( QgsApplication::getThemeIcon( "mActionFileExit.png" ), tr( "Close mapset" ), this );`
`155`	`155`	`mTabWidget->setCornerWidget( closeMapsetButton );`
`156`		`- connect( closeMapsetButton, SIGNAL( clicked() ), QgsGrass::instance(), SLOT( closeMapsetWarn() ) );`
	`156`	`+ connect( closeMapsetButton, SIGNAL( clicked() ), SLOT( closeMapset() ) );`
`157`	`157`
`158`	`158`	`qRegisterMetaType<QgsDetailedItemData>();`
`159`	`159`
`@@ -537,6 +537,12 @@ void QgsGrassTools::removeEmptyItems( QStandardItem *item )`
`537`	`537`	`}`
`538`	`538`	`}`
`539`	`539`
	`540`	`+void QgsGrassTools::closeMapset()`
	`541`	`+{`
	`542`	`+ QgsGrass::instance()->closeMapsetWarn();`
	`543`	`+ QgsGrass::saveMapset();`
	`544`	`+}`
	`545`	`+`
`540`	`546`	`void QgsGrassTools::mapsetChanged()`
`541`	`547`	`{`
`542`	`548`	`QgsDebugMsg( "entered." );`
Original file line number	Diff line number	Diff line change
`@@ -856,7 +856,6 @@ QString QgsGrass::openMapset( const QString& gisdbase,`
`856`	`856`
`857`	`857`	`mMapsetLock = lock;`
`858`	`858`
`859`		`- saveMapset();`
`860`	`859`	`emit QgsGrass::instance()->mapsetChanged();`
`861`	`860`	`return QString::null;`
`862`	`861`	`}`
`@@ -919,7 +918,6 @@ QString QgsGrass::closeMapset()`
`919`	`918`	`}`
`920`	`919`	`}`
`921`	`920`
`922`		`- saveMapset();`
`923`	`921`	`emit QgsGrass::instance()->mapsetChanged();`
`924`	`922`	`return QString::null;`
`925`	`923`	`}`
Original file line number	Diff line number	Diff line change
`@@ -626,7 +626,9 @@ void QgsGrassMapsetItem::openMapset()`
`626`	`626`	`if ( !error.isEmpty() )`
`627`	`627`	`{`
`628`	`628`	`QgsGrass::warning( error );`
	`629`	`+ return;`
`629`	`630`	`}`
	`631`	`+ QgsGrass::saveMapset();`
`630`	`632`	`}`
`631`	`633`
`632`	`634`	`//----------------------- QgsGrassObjectItemBase ------------------------------`