Fixed gdal driver (de)selection feature that had some outstanding issues

timlinux · timlinux · commit 907646164c2b · 2011-09-13T11:01:11.000+02:00
diff --git a/src/app/qgscustomization.cpp b/src/app/qgscustomization.cpp
@@ -797,7 +797,7 @@ void QgsCustomization::customizeWidget( QString thePath, QWidget * theWidget )
     QString p = myPath + "/" + w->objectName();
 
     bool on = mySettings.value( p, true ).toBool();
-    QgsDebugMsg( QString( "p = %1 on = %2" ).arg( p ).arg( on ) );
+    //QgsDebugMsg( QString( "p = %1 on = %2" ).arg( p ).arg( on ) );
     if ( on )
     {
       QgsCustomization::customizeWidget( myPath, w );
@@ -854,7 +854,7 @@ void QgsCustomization::preNotify( QObject * receiver, QEvent * event, bool * don
     }
     else if ( widget && event->type() == QEvent::MouseButtonPress )
     {
-      QgsDebugMsg( "click" );
+      //QgsDebugMsg( "click" );
       if ( pDialog && pDialog->isVisible() )
       {
         QMouseEvent *e = static_cast<QMouseEvent*>( event );
@@ -870,7 +870,7 @@ void QgsCustomization::preNotify( QObject * receiver, QEvent * event, bool * don
     if ( pDialog && pDialog->isVisible() )
     {
       QKeyEvent *e = static_cast<QKeyEvent*>( event );
-      QgsDebugMsg( QString( "key = %1 modifiers = %2" ).arg( e->key() ).arg( e->modifiers() ) ) ;
+      //QgsDebugMsg( QString( "key = %1 modifiers = %2" ).arg( e->key() ).arg( e->modifiers() ) ) ;
       if ( e->key() == Qt::Key_M && e->modifiers() == Qt::ControlModifier )
       {
         pDialog->setCatch( !pDialog->catchOn() );
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -745,6 +745,5 @@ void QgsApplication::applyGdalSkippedDrivers()
   QgsDebugMsg( "Gdal Skipped driver list set to:" );
   QgsDebugMsg( myDriverList );
   CPLSetConfigOption("GDAL_SKIP", myDriverList.toUtf8());
-  GDALDriverManager myDriverManager;
-  myDriverManager.AutoSkipDrivers();
+  GetGDALDriverManager()->AutoSkipDrivers();
 }
diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
@@ -1181,12 +1181,19 @@ int QgsGdalProvider::colorInterpretation( int theBandNo ) const
 
 void QgsGdalProvider::registerGdalDrivers()
 {
-  if ( GDALGetDriverCount() == 0 )
+  //GDALDestroyDriverManager();
+  GDALAllRegister();
+  QSettings mySettings;
+  QString myJoinedList = mySettings.value( "gdal/skipList", "" ).toString();
+  if ( !myJoinedList.isEmpty() )
   {
-    GDALAllRegister();
+    QStringList myList = myJoinedList.split(" ");
+    for ( int i = 0; i < myList.size(); ++i )
+    {
+      QgsApplication::skipGdalDriver( myList.at( i ) );
+    }
+    QgsApplication::applyGdalSkippedDrivers();
   }
-  //call regardless of above
-  QgsApplication::applyGdalSkippedDrivers();
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -797,7 +797,7 @@ void QgsCustomization::customizeWidget( QString thePath, QWidget * theWidget )`
`797`	`797`	`QString p = myPath + "/" + w->objectName();`
`798`	`798`
`799`	`799`	`bool on = mySettings.value( p, true ).toBool();`
`800`		`- QgsDebugMsg( QString( "p = %1 on = %2" ).arg( p ).arg( on ) );`
	`800`	`+ //QgsDebugMsg( QString( "p = %1 on = %2" ).arg( p ).arg( on ) );`
`801`	`801`	`if ( on )`
`802`	`802`	`{`
`803`	`803`	`QgsCustomization::customizeWidget( myPath, w );`
`@@ -854,7 +854,7 @@ void QgsCustomization::preNotify( QObject * receiver, QEvent * event, bool * don`
`854`	`854`	`}`
`855`	`855`	`else if ( widget && event->type() == QEvent::MouseButtonPress )`
`856`	`856`	`{`
`857`		`- QgsDebugMsg( "click" );`
	`857`	`+ //QgsDebugMsg( "click" );`
`858`	`858`	`if ( pDialog && pDialog->isVisible() )`
`859`	`859`	`{`
`860`	`860`	`QMouseEvent e = static_cast<QMouseEvent>( event );`
`@@ -870,7 +870,7 @@ void QgsCustomization::preNotify( QObject * receiver, QEvent * event, bool * don`
`870`	`870`	`if ( pDialog && pDialog->isVisible() )`
`871`	`871`	`{`
`872`	`872`	`QKeyEvent e = static_cast<QKeyEvent>( event );`
`873`		`- QgsDebugMsg( QString( "key = %1 modifiers = %2" ).arg( e->key() ).arg( e->modifiers() ) ) ;`
	`873`	`+ //QgsDebugMsg( QString( "key = %1 modifiers = %2" ).arg( e->key() ).arg( e->modifiers() ) ) ;`
`874`	`874`	`if ( e->key() == Qt::Key_M && e->modifiers() == Qt::ControlModifier )`
`875`	`875`	`{`
`876`	`876`	`pDialog->setCatch( !pDialog->catchOn() );`
Original file line number	Diff line number	Diff line change
`@@ -745,6 +745,5 @@ void QgsApplication::applyGdalSkippedDrivers()`
`745`	`745`	`QgsDebugMsg( "Gdal Skipped driver list set to:" );`
`746`	`746`	`QgsDebugMsg( myDriverList );`
`747`	`747`	`CPLSetConfigOption("GDAL_SKIP", myDriverList.toUtf8());`
`748`		`- GDALDriverManager myDriverManager;`
`749`		`- myDriverManager.AutoSkipDrivers();`
	`748`	`+ GetGDALDriverManager()->AutoSkipDrivers();`
`750`	`749`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1181,12 +1181,19 @@ int QgsGdalProvider::colorInterpretation( int theBandNo ) const`
`1181`	`1181`
`1182`	`1182`	`void QgsGdalProvider::registerGdalDrivers()`
`1183`	`1183`	`{`
`1184`		`- if ( GDALGetDriverCount() == 0 )`
	`1184`	`+ //GDALDestroyDriverManager();`
	`1185`	`+ GDALAllRegister();`
	`1186`	`+ QSettings mySettings;`
	`1187`	`+ QString myJoinedList = mySettings.value( "gdal/skipList", "" ).toString();`
	`1188`	`+ if ( !myJoinedList.isEmpty() )`
`1185`	`1189`	`{`
`1186`		`- GDALAllRegister();`
	`1190`	`+ QStringList myList = myJoinedList.split(" ");`
	`1191`	`+ for ( int i = 0; i < myList.size(); ++i )`
	`1192`	`+ {`
	`1193`	`+ QgsApplication::skipGdalDriver( myList.at( i ) );`
	`1194`	`+ }`
	`1195`	`+ QgsApplication::applyGdalSkippedDrivers();`
`1187`	`1196`	`}`
`1188`		`- //call regardless of above`
`1189`		`- QgsApplication::applyGdalSkippedDrivers();`
`1190`	`1197`	`}`
`1191`	`1198`
`1192`	`1199`