show error message when screenshot or export file write fails

fix for OpenHantek/openhantek#338 Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
OpenHantek · Mar 27, 2023 · 2ea8261 · 2ea8261
1 parent dfe0aaa
commit 2ea8261
Show file tree

Hide file tree

Showing 12 changed files with 734 additions and 669 deletions.
diff --git a/openhantek/src/exporting/exportcsv.cpp b/openhantek/src/exporting/exportcsv.cpp
@@ -10,6 +10,7 @@
 #include <QFile>
 #include <QFileDialog>
 #include <QLocale>
+#include <QMessageBox>
 #include <QTextStream>
 
 ExporterCSV::ExporterCSV() {}
@@ -40,10 +41,12 @@ QFile *ExporterCSV::getFile() {
     if ( fileDialog.exec() != QDialog::Accepted )
         return nullptr;
 
-    QFile *file = new QFile( fileDialog.selectedFiles().first() );
-    if ( !file->open( QIODevice::WriteOnly | QIODevice::Text ) )
+    QFile *csvFile = new QFile( fileDialog.selectedFiles().first() );
+    if ( !csvFile->open( QIODevice::WriteOnly | QIODevice::Text ) ) {
+        QMessageBox::critical( nullptr, tr( "Error" ), csvFile->fileName() );
         return nullptr;
-    return file;
+    }
+    return csvFile;
 }
 
 void ExporterCSV::fillHeaders( QTextStream &csvStream, const ExporterData &dto, const char *sep ) {

diff --git a/openhantek/src/exporting/exportjson.cpp b/openhantek/src/exporting/exportjson.cpp
@@ -11,6 +11,7 @@
 #include <QFile>
 #include <QFileDialog>
 #include <QLocale>
+#include <QMessageBox>
 #include <QTextStream>
 
 ExporterJSON::ExporterJSON() {}
@@ -42,8 +43,10 @@ QFile *ExporterJSON::getFile() {
         return nullptr;
 
     QFile *jsonFile = new QFile( fileDialog.selectedFiles().first() );
-    if ( !jsonFile->open( QIODevice::WriteOnly | QIODevice::Text ) )
+    if ( !jsonFile->open( QIODevice::WriteOnly | QIODevice::Text ) ) {
+        QMessageBox::critical( nullptr, tr( "Error" ), jsonFile->fileName() );
         return nullptr;
+    }
     return jsonFile;
 }
 

diff --git a/openhantek/src/mainwindow.cpp b/openhantek/src/mainwindow.cpp
@@ -24,6 +24,7 @@
 #include "dsosettings.h"
 
 #include <QDesktopServices>
+#include <QDir>
 #include <QFileDialog>
 #include <QLoggingCategory>
 #include <QMessageBox>
@@ -621,7 +622,8 @@ void MainWindow::screenShot( screenshotType_t screenshotType, bool autoSafe ) {
         QStringList filters;
         fileName += ".png";
         if ( autoSafe ) { // save under default name as PNG without asking
-            screenshot.save( fileName );
+            if ( !screenshot.save( fileName ) )
+                QMessageBox::critical( this, tr( "Error" ), QFileInfo{ fileName }.absoluteFilePath() );
             return;
         }
         filters << tr( "Image (*.png *.jpg)" ) << tr( "Portable Document Format (*.pdf)" );
@@ -633,7 +635,8 @@ void MainWindow::screenShot( screenshotType_t screenshotType, bool autoSafe ) {
 
         fileName = fileDialog.selectedFiles().first();
         if ( filters.indexOf( fileDialog.selectedNameFilter() ) == 0 ) { // save as image
-            screenshot.save( fileName );
+            if ( !screenshot.save( fileName ) )
+                QMessageBox::critical( this, tr( "Error" ), QFileInfo{ fileName }.absoluteFilePath() );
             return;
         }