Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Scientific Software
MDANSE
Commits
83c32ee2
Commit
83c32ee2
authored
Apr 05, 2017
by
eric pellegrini
Browse files
Merge branch 'hotfix-1.0.10'
parents
60a019ed
99fe13d3
Pipeline
#1634
passed with stages
in 15 minutes and 57 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
83c32ee2
version 1.0.10
-------------
* bug fix due to missing import in ElementsDatabaseEditor
* bug fix when loading trajectory with missing unknown MMTK atoms
version 1.0.9
-------------
* use the short git commit id instead of long
...
...
MDANSE/GUI/ElementsDatabaseEditor.py
View file @
83c32ee2
...
...
@@ -35,7 +35,7 @@ import os
import
wx
import
wx.grid
as
wxgrid
from
MDANSE
import
ELEMENTS
from
MDANSE
import
ELEMENTS
,
PLATFORM
from
MDANSE.Core.Error
import
Error
from
MDANSE.Core.Singleton
import
Singleton
...
...
MDANSE/__init__.py
View file @
83c32ee2
...
...
@@ -52,3 +52,12 @@ from MMTK import Database
# The default database is still the MMTK one
Database
.
path
.
append
(
os
.
path
.
join
(
PLATFORM
.
package_directory
(),
'Data'
))
Database
.
path
.
append
(
os
.
path
.
join
(
PLATFORM
.
application_directory
(),
'mmtk_database'
))
# Update the database with user defined atom entries
import
glob
userDefinedAtoms
=
glob
.
glob
(
os
.
path
.
join
(
PLATFORM
.
application_directory
(),
'mmtk_database'
,
'Atoms'
,
'*'
))
for
atomFile
in
userDefinedAtoms
:
atomName
=
os
.
path
.
basename
(
atomFile
)
if
not
ELEMENTS
.
has_element
(
atomName
):
ELEMENTS
.
add_element
(
atomName
)
\ No newline at end of file
MDANSE/__pkginfo__.py
View file @
83c32ee2
__version__
=
"1.0.
9
"
__version__
=
"1.0.
10
"
__date__
=
"
1
0-0
3
-2017"
__date__
=
"0
5
-0
4
-2017"
__author__
=
"Eric Pellegrini"
...
...
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