Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Martin Schorb
py-EM
Commits
4021337f
Commit
4021337f
authored
Jul 07, 2020
by
Martin Schorb
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of git.embl.de:schorb/pyem
parents
1f750674
be585484
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
applications/clem_icy.py
applications/clem_icy.py
+1
-1
setup.py
setup.py
+1
-1
No files found.
applications/clem_icy.py
View file @
4021337f
...
...
@@ -137,7 +137,7 @@ workdir = os.getcwd()
os
.
chdir
(
'C:\Software\icy'
)
icycmd
=
'java -jar icy.jar -x plugins.tprovoost.scripteditor.main.ScriptEditorPlugin C:\Software\opener.js'
os
.
system
(
icycmd
+
' '
+
mm_fm
[
'mapfile'
]
+
' '
+
mm_em
[
'mergefile'
]
+
os
.
path
.
splitext
(
mm_em
[
'mapfile'
])[
1
]
)
os
.
system
(
icycmd
+
' '
+
mm_fm
[
'mapfile'
]
+
' '
+
mm_em
[
'mergefile'
])
os
.
chdir
(
workdir
)
...
...
setup.py
View file @
4021337f
...
...
@@ -6,7 +6,7 @@ with open("readme.md", "r") as fh:
long_description
=
fh
.
read
()
setup
(
name
=
'py-EM'
,
version
=
'202006
22
'
,
version
=
'202006
30
'
,
py_modules
=
[
'pyEM'
],
description
=
'Tools to interact with Serial EM enabling automated transmission electron microscopy.'
,
long_description
=
long_description
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment