changeset 983:9ae8a300cf7f

Report error if transform fails (during operation, rather than at start as was already reported)
author Chris Cannam
date Wed, 10 Jun 2015 13:13:39 +0100
parents 92f610ae640d
children 0c78336aa4f3
files .hgsubstate main/MainWindow.cpp
diffstat 2 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Fri May 22 10:42:15 2015 +0100
+++ b/.hgsubstate	Wed Jun 10 13:13:39 2015 +0100
@@ -1,5 +1,5 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 55ece8862b6d3a54aad271a53f9c1615e5d3bcf8 sv-dependency-builds
-1ab4ac6b2fcb8c8fd85716c8f1033b0ab780d53c svapp
-882d448c8a6da6a92202efcf7d5c68551091267a svcore
+8125b8cb8128b71ba9eb0759a8774c8038cd16e8 svapp
+b6092700a73ea770fcad75b1669ea800f6ac2aa1 svcore
 fd934705973f2806ebf2624f0416341f545e8b50 svgui
--- a/main/MainWindow.cpp	Fri May 22 10:42:15 2015 +0100
+++ b/main/MainWindow.cpp	Wed Jun 10 13:13:39 2015 +0100
@@ -4296,20 +4296,25 @@
 {
     emit hideSplash();
 
+    QString quoted;
+    if (transformName != "") {
+        quoted = QString("\"%1\" ").arg(transformName);
+    }
+    
     if (message != "") {
 
         QMessageBox::warning
             (this,
              tr("Failed to generate layer"),
-             tr("<b>Layer generation failed</b><p>Failed to generate derived layer.<p>The layer transform \"%1\" failed:<p>%2")
-             .arg(transformName).arg(message),
+             tr("<b>Layer generation failed</b><p>Failed to generate derived layer.<p>The layer transform %1failed:<p>%2")
+             .arg(quoted).arg(message),
              QMessageBox::Ok);
     } else {
         QMessageBox::warning
             (this,
              tr("Failed to generate layer"),
-             tr("<b>Layer generation failed</b><p>Failed to generate a derived layer.<p>The layer transform \"%1\" failed.<p>No error information is available.")
-             .arg(transformName),
+             tr("<b>Layer generation failed</b><p>Failed to generate a derived layer.<p>The layer transform %1failed.<p>No error information is available.")
+             .arg(quoted),
              QMessageBox::Ok);
     }
 }