FEM: move errors in own module

This commit is contained in:
Bernd Hahnebach
2020-02-25 16:54:50 +01:00
parent 43295895d6
commit e86ec2848e
5 changed files with 47 additions and 18 deletions

View File

@@ -45,6 +45,7 @@ import femtools.membertools as membertools
from . import settings
from . import signal
from . import task
from femtools.errors import MustSaveError, DirectoryDoesNotExistError
if App.GuiUp:
import FreeCADGui
@@ -118,7 +119,7 @@ def run_fem_solver(solver, working_dir=None):
machine = getMachine(solver, working_dir)
else:
machine = getMachine(solver)
except femutils.MustSaveError:
except MustSaveError:
error_message = (
"Please save the file before executing the solver. "
"This must be done because the location of the working "
@@ -132,7 +133,7 @@ def run_fem_solver(solver, working_dir=None):
error_message
)
return
except femutils.DirectoryDoesNotExistError:
except DirectoryDoesNotExistError:
error_message = "Selected working directory doesn't exist."
App.Console.PrintError(error_message + "\n")
if App.GuiUp:
@@ -251,7 +252,7 @@ def _getBesideBase(solver):
"Can't start Solver",
error_message
)
raise femutils.MustSaveError()
raise MustSaveError()
return path
@@ -276,7 +277,7 @@ def _getCustomBase(solver):
"Can't start Solver",
error_message
)
raise femutils.DirectoryDoesNotExistError("Invalid path")
raise DirectoryDoesNotExistError("Invalid path")
return path

View File

@@ -29,7 +29,7 @@ __url__ = "http://www.freecadweb.org"
from PySide import QtGui
import FreeCAD as App
import femtools.femutils as femutils
from femtools.errors import MustSaveError, DirectoryDoesNotExistError
from . import run
if App.GuiUp:
@@ -78,7 +78,7 @@ class ViewProxy(object):
def setEdit(self, vobj, mode=0):
try:
machine = run.getMachine(vobj.Object)
except femutils.MustSaveError:
except MustSaveError:
error_message = (
"Please save the file before opening the task panel. "
"This must be done because the location of the working "
@@ -91,7 +91,7 @@ class ViewProxy(object):
error_message
)
return False
except femutils.DirectoryDoesNotExistError:
except DirectoryDoesNotExistError:
error_message = "Selected working directory doesn't exist."
App.Console.PrintError(error_message + "\n")
QtGui.QMessageBox.critical(