From 6e16a47b0d32acc8db0ce36ea20df45eea55bc22 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 9 Feb 2018 11:19:04 +0100
Subject: [PATCH] #2446 : Replace - with _ for all generated file names

---
 .../RicSnapshotFilenameGenerator.cpp          | 21 +++++++++++++++----
 .../RicSnapshotFilenameGenerator.h            |  1 +
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ApplicationCode/Commands/ExportCommands/RicSnapshotFilenameGenerator.cpp b/ApplicationCode/Commands/ExportCommands/RicSnapshotFilenameGenerator.cpp
index 37128b6591..6db72f2815 100644
--- a/ApplicationCode/Commands/ExportCommands/RicSnapshotFilenameGenerator.cpp
+++ b/ApplicationCode/Commands/ExportCommands/RicSnapshotFilenameGenerator.cpp
@@ -51,7 +51,7 @@ QString RicSnapshotFilenameGenerator::generateSnapshotFileName(RimViewWindow* vi
         fileName = viewWindow->uiCapability()->uiName();
     }
 
-    fileName = caf::Utils::makeValidFileBasename(fileName);
+    fileName = makeValidFileName(fileName);
 
     return fileName;
 }
@@ -71,9 +71,7 @@ QString RicSnapshotFilenameGenerator::generateSnapshotFilenameForRimView(RimView
     if ( !timeSteps.empty() ) fileName += QString("_%1_%2").arg(timeStep, 2, 10, QChar('0'))
                                                            .arg(timeSteps[timeStep]);
 
-    fileName.replace("-", "_");
-
-    fileName = caf::Utils::makeValidFileBasename(fileName);
+    fileName = makeValidFileName(fileName);
 
     return fileName;
 }
@@ -111,3 +109,18 @@ QString RicSnapshotFilenameGenerator::resultName(RimView * rimView)
 
     return "";
 }
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RicSnapshotFilenameGenerator::makeValidFileName(const QString& filename)
+{
+    QString trimmedString = filename;
+
+    // Use lowercase instead of dash before calling caf::Utils::makeValidFileBasename
+    trimmedString.replace("-", "_");
+
+    trimmedString = caf::Utils::makeValidFileBasename(trimmedString);
+
+    return trimmedString;
+}
diff --git a/ApplicationCode/Commands/ExportCommands/RicSnapshotFilenameGenerator.h b/ApplicationCode/Commands/ExportCommands/RicSnapshotFilenameGenerator.h
index 37916b7697..9532f6b37d 100644
--- a/ApplicationCode/Commands/ExportCommands/RicSnapshotFilenameGenerator.h
+++ b/ApplicationCode/Commands/ExportCommands/RicSnapshotFilenameGenerator.h
@@ -34,4 +34,5 @@ public:
 private:
     static QString generateSnapshotFilenameForRimView(RimView* rimView);
     static QString resultName(RimView* rimView);
+    static QString makeValidFileName(const QString& filename);
 };