Commit 1094abbe authored by eric pellegrini's avatar eric pellegrini

Merge tag '1.0.10' into develop

this is version 1.0.10
parents 461691e0 83c32ee2
Pipeline #1672 passed with stages
in 11 minutes and 19 seconds
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 version 1.0.9
------------- -------------
* use the short git commit id instead of long * use the short git commit id instead of long
......
...@@ -35,7 +35,7 @@ import os ...@@ -35,7 +35,7 @@ import os
import wx import wx
import wx.grid as wxgrid import wx.grid as wxgrid
from MDANSE import ELEMENTS from MDANSE import ELEMENTS, PLATFORM
from MDANSE.Core.Error import Error from MDANSE.Core.Error import Error
from MDANSE.Core.Singleton import Singleton from MDANSE.Core.Singleton import Singleton
......
...@@ -52,3 +52,12 @@ from MMTK import Database ...@@ -52,3 +52,12 @@ from MMTK import Database
# The default database is still the MMTK one # 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.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
__version__ = "1.0.9" __version__ = "1.0.10"
__date__ = "10-03-2017" __date__ = "05-04-2017"
__author__ = "Eric Pellegrini" __author__ = "Eric Pellegrini"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment