kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

FEM: ccx tools, small indent code formating

Browse Source
This commit is contained in:
Bernd Hahnebach
2019-08-15 08:39:12 +02:00
parent 03b4fe50ed
commit 4bb32ae8d2
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Mod/Fem/femtools/ccxtools.py
View File

@@ -803,9 +803,13 @@ class FemToolsCcx(QtCore.QRunnable, QtCore.QObject):
ccx_stdout = None
ccx_stderr = None
try:
p = subprocess.Popen([self.ccx_binary], stdout=subprocess.PIPE,
stderr=subprocess.PIPE, shell=False,
startupinfo=startup_info)
p = subprocess.Popen(
[self.ccx_binary],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
shell=False,
startupinfo=startup_info
)
ccx_stdout, ccx_stderr = p.communicate()
if ccx_binary_sig in str(ccx_stdout):
self.ccx_binary_present = True
@@ -861,9 +865,13 @@ class FemToolsCcx(QtCore.QRunnable, QtCore.QObject):
cwd = QtCore.QDir.currentPath()
f = QtCore.QFileInfo(self.inp_file_name)
QtCore.QDir.setCurrent(f.path())
p = subprocess.Popen([self.ccx_binary, "-i ", f.baseName()],
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
shell=False, env=_env)
p = subprocess.Popen(
[self.ccx_binary, "-i ", f.baseName()],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
shell=False,
env=_env
)
self.ccx_stdout, self.ccx_stderr = p.communicate()
if sys.version_info.major >= 3:
self.ccx_stdout = self.ccx_stdout.decode()
@@ -884,9 +892,13 @@ class FemToolsCcx(QtCore.QRunnable, QtCore.QObject):
ccx_stdout = None
ccx_stderr = None
# Now extract the version number
p = subprocess.Popen([self.ccx_binary, '-v'], stdout=subprocess.PIPE,
stderr=subprocess.PIPE, shell=False,
startupinfo=startup_info)
p = subprocess.Popen(
[self.ccx_binary, '-v'],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
shell=False,
startupinfo=startup_info
)
ccx_stdout, ccx_stderr = p.communicate()
if sys.version_info.major >= 3:
ccx_stdout = ccx_stdout.decode()