update filters with new formats

PeterPetrik · wonder-sk · commit f9fc708d97d9 · 2018-07-16T09:15:16.000+02:00
diff --git a/src/app/mesh/qgsmeshlayerproperties.cpp b/src/app/mesh/qgsmeshlayerproperties.cpp
@@ -134,7 +134,10 @@ void QgsMeshLayerProperties::addDataset()
 
   QgsSettings settings;
   QString openFileDir = settings.value( QStringLiteral( "lastMeshDatasetDir" ), QDir::homePath(), QgsSettings::App ).toString();
-  QString openFileString = QFileDialog::getOpenFileName( nullptr, tr( "Load mesh datasets" ), openFileDir, tr( "Layout mesh datasets" ) + " (*.*)" );
+  QString openFileString = QFileDialog::getOpenFileName( nullptr,
+                           tr( "Load mesh datasets" ),
+                           openFileDir,
+                           QStringLiteral( "All files(*.*);;Results Files XMDF(*.xmdf);;Results Files DAT(*.dat)" ) );
 
   if ( openFileString.isEmpty() )
   {
diff --git a/src/providers/mdal/qgsmdaldataitems.cpp b/src/providers/mdal/qgsmdaldataitems.cpp
@@ -64,7 +64,13 @@ QGISEXTERN QgsDataItem *dataItem( QString path, QgsDataItem *parentItem )
   if ( sExtensions.isEmpty() )
   {
     // TODO ask MDAL for extensions !
-    sExtensions << QStringLiteral( "2dm" );
+    sExtensions << QStringLiteral( "2dm" )
+                << QStringLiteral( "grb" )
+                << QStringLiteral( "grb2" )
+                << QStringLiteral( "bin" )
+                << QStringLiteral( "grib" )
+                << QStringLiteral( "grib1" )
+                << QStringLiteral( "grib2" );
   }
 
   // Filter files by extension
diff --git a/src/providers/mdal/qgsmdalsourceselect.cpp b/src/providers/mdal/qgsmdalsourceselect.cpp
@@ -28,7 +28,7 @@ QgsMdalSourceSelect::QgsMdalSourceSelect( QWidget *parent, Qt::WindowFlags fl, Q
   setupButtons( buttonBox );
 
   mFileWidget->setDialogTitle( tr( "Open MDAL Supported Mesh Dataset(s)" ) );
-  mFileWidget->setFilter( QStringLiteral( "Mesh File (*.2dm);;All files (*.*)" ) );
+  mFileWidget->setFilter( QStringLiteral( "All files(*.*);;GRIB File(*.grb *.grb2 *.bin *.grib *.grib1 *.grib2);;2DM Mesh File(*.2dm)" ) );
   mFileWidget->setStorageMode( QgsFileWidget::GetMultipleFiles );
   connect( mFileWidget, &QgsFileWidget::fileChanged, this, [ = ]( const QString & path )
   {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,13 @@ QGISEXTERN QgsDataItem dataItem( QString path, QgsDataItem parentItem )`
`64`	`64`	`if ( sExtensions.isEmpty() )`
`65`	`65`	`{`
`66`	`66`	`// TODO ask MDAL for extensions !`
`67`		`- sExtensions << QStringLiteral( "2dm" );`
	`67`	`+ sExtensions << QStringLiteral( "2dm" )`
	`68`	`+ << QStringLiteral( "grb" )`
	`69`	`+ << QStringLiteral( "grb2" )`
	`70`	`+ << QStringLiteral( "bin" )`
	`71`	`+ << QStringLiteral( "grib" )`
	`72`	`+ << QStringLiteral( "grib1" )`
	`73`	`+ << QStringLiteral( "grib2" );`
`68`	`74`	`}`
`69`	`75`
`70`	`76`	`// Filter files by extension`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ QgsMdalSourceSelect::QgsMdalSourceSelect( QWidget *parent, Qt::WindowFlags fl, Q`
`28`	`28`	`setupButtons( buttonBox );`
`29`	`29`
`30`	`30`	`mFileWidget->setDialogTitle( tr( "Open MDAL Supported Mesh Dataset(s)" ) );`
`31`		`- mFileWidget->setFilter( QStringLiteral( "Mesh File (.2dm);;All files (.*)" ) );`
	`31`	`+ mFileWidget->setFilter( QStringLiteral( "All files(.);;GRIB File(.grb .grb2 .bin .grib .grib1 .grib2);;2DM Mesh File(*.2dm)" ) );`
`32`	`32`	`mFileWidget->setStorageMode( QgsFileWidget::GetMultipleFiles );`
`33`	`33`	`connect( mFileWidget, &QgsFileWidget::fileChanged, this, [ = ]( const QString & path )`
`34`	`34`	`{`