From 99bd486607b0a565dc0a13440bf2d5c71072d945 Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Tue, 26 Mar 2019 21:55:11 +0100
Subject: [PATCH] FEM: run, improvements in error messages

---
 src/Mod/Fem/femsolver/run.py        |  4 ++--
 src/Mod/Fem/femsolver/solverbase.py | 22 +++++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/Mod/Fem/femsolver/run.py b/src/Mod/Fem/femsolver/run.py
index 6ad291ba67..7dfde95134 100644
--- a/src/Mod/Fem/femsolver/run.py
+++ b/src/Mod/Fem/femsolver/run.py
@@ -75,7 +75,7 @@ def run_fem_solver(solver, working_dir=None):
             else:
                 App.Console.PrintError("Houston, we have a problem! {}\n".format(message))
     else:
-        App.Console.PrintMessage("Frame work solver!\n")
+        # App.Console.PrintMessage("Frame work solver!\n")
         try:
             if working_dir is not None:
                 machine = getMachine(solver, working_dir)
@@ -85,7 +85,7 @@ def run_fem_solver(solver, working_dir=None):
             error_message = (
                 "Please save the file before executing the solver. "
                 "This must be done because the location of the working "
-                "directory is set to \"Beside .FCStd File\"."
+                "directory is set to \"Beside *.FCStd File\"."
             )
             App.Console.PrintError(error_message + "\n")
             if App.GuiUp:
diff --git a/src/Mod/Fem/femsolver/solverbase.py b/src/Mod/Fem/femsolver/solverbase.py
index cc6304141d..7bd2564778 100644
--- a/src/Mod/Fem/femsolver/solverbase.py
+++ b/src/Mod/Fem/femsolver/solverbase.py
@@ -78,18 +78,26 @@ class ViewProxy(object):
         try:
             machine = run.getMachine(vobj.Object)
         except run.MustSaveError:
-            QtGui.QMessageBox.critical(
-                Gui.getMainWindow(),
-                "Can't open Task Panel",
+            error_message = (
                 "Please save the file before opening the task panel. "
                 "This must be done because the location of the working "
-                "directory is set to \"Beside .FCStd File\".")
-            return False
-        except run.DirectoryDoesNotExistError:
+                "directory is set to \"Beside *.FCStd File\"."
+            )
+            App.Console.PrintError(error_message + "\n")
             QtGui.QMessageBox.critical(
                 Gui.getMainWindow(),
                 "Can't open Task Panel",
-                "Selected working directory doesn't exist.")
+                error_message
+            )
+            return False
+        except run.DirectoryDoesNotExistError:
+            error_message = "Selected working directory doesn't exist."
+            App.Console.PrintError(error_message + "\n")
+            QtGui.QMessageBox.critical(
+                Gui.getMainWindow(),
+                "Can't open Task Panel",
+                error_message
+            )
             return False
         task = _TaskPanelFemSolverControl.ControlTaskPanel(machine)
         Gui.Control.showDialog(task)