Quote layer names in raster calculator

qgis · Jul 31, 2013 · ba86804 · ba86804
1 parent 7d44e0a
commit ba86804
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/analysis/raster/qgsrastercalclexer.ll b/src/analysis/raster/qgsrastercalclexer.ll
@@ -48,6 +48,7 @@ number  {num1}|{num2}
 non_ascii    [\x80-\xFF]
 raster_ref_char  [A-Za-z0-9_./:]|{non_ascii}|[-]
 raster_band_ref ({raster_ref_char}+)@{dig}
+raster_band_ref_quoted  \"(\\.|[^"])*\"
 
 %%
 
@@ -74,6 +75,8 @@ raster_band_ref ({raster_ref_char}+)@{dig}
 
 {raster_band_ref} { return RASTER_BAND_REF; }
 
+{raster_band_ref_quoted} { return RASTER_BAND_REF; }
+
 {white}    /* skip blanks and tabs */
 %%
 

diff --git a/src/app/qgsrastercalcdialog.cpp b/src/app/qgsrastercalcdialog.cpp
@@ -130,7 +130,7 @@ void QgsRasterCalcDialog::insertAvailableRasterBands()
         QgsRasterCalculatorEntry entry;
         entry.raster = rlayer;
         entry.bandNumber = i + 1;
-        entry.ref = rlayer->name() + "@" + QString::number( i + 1 );
+        entry.ref = quoteBandEntry( rlayer->name() + "@" + QString::number( i + 1 ) );
         mAvailableRasterBands.push_back( entry );
         mRasterBandsListWidget->addItem( entry.ref );
       }
@@ -406,3 +406,13 @@ void QgsRasterCalcDialog::on_mOrButton_clicked()
 {
   mExpressionTextEdit->insertPlainText( " OR " );
 }
+
+QString QgsRasterCalcDialog::quoteBandEntry( const QString& layerName )
+{
+  // '"' -> '\\"'
+  QString quotedName = layerName;
+  quotedName.replace( "\"", "\\\"" );
+  quotedName.append( "\"" );
+  quotedName.prepend( "\"" );
+  return quotedName;
+}
diff --git a/src/app/qgsrastercalcdialog.h b/src/app/qgsrastercalcdialog.h
@@ -87,6 +87,8 @@ class QgsRasterCalcDialog: public QDialog, private Ui::QgsRasterCalcDialogBase
     /**Returns true if output file directory exists*/
     bool filePathValid() const;
 
+    static QString quoteBandEntry( const QString& layerName );
+
     /**Stores relation between driver name and extension*/
     QMap<QString, QString> mDriverExtensionMap;