Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Scientific Software
MDANSE
Commits
91956bf8
Commit
91956bf8
authored
Mar 06, 2017
by
eric pellegrini
Browse files
Merge branch 'release-1.0.5'
parents
046a6de4
1a903f90
Pipeline
#1487
passed with stages
in 15 minutes and 44 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
MDANSE/Data/ElementsDatabase.py
View file @
91956bf8
...
...
@@ -35,7 +35,6 @@ import copy
import
csv
import
numbers
import
os
import
pkg_resources
import
sys
import
xml.etree.ElementTree
as
etree
...
...
@@ -113,15 +112,8 @@ class ElementsDatabase(object):
__metaclass__
=
Singleton
try
:
_DEFAULT_DATABASE
=
pkg_resources
.
resource_filename
(
__name__
,
"elements_database.csv"
)
except
:
if
hasattr
(
sys
,
'frozen'
):
_DEFAULT_DATABASE
=
os
.
path
.
join
(
os
.
path
.
dirname
(
sys
.
executable
),
"elements_database.csv"
)
else
:
raise
_DEFAULT_DATABASE
=
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
"elements_database.csv"
)
# The user path
_USER_DATABASE
=
os
.
path
.
join
(
PLATFORM
.
application_directory
(),
"elements_database.csv"
)
...
...
MDANSE/GUI/Icons/__init__.py
View file @
91956bf8
import
os
import
pkg_resources
import
sys
import
wx
...
...
@@ -14,13 +13,7 @@ class Icons(object):
name
,
width
,
height
=
item
try
:
icon
=
pkg_resources
.
resource_filename
(
__name__
,
name
+
".png"
)
except
:
if
hasattr
(
sys
,
'frozen'
):
icon
=
os
.
path
.
join
(
os
.
path
.
dirname
(
sys
.
executable
),
name
+
".png"
)
else
:
raise
icon
=
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
name
+
".png"
)
image
=
wx
.
ImageFromBitmap
(
wx
.
Bitmap
(
icon
))
image
=
image
.
Scale
(
width
,
height
,
wx
.
IMAGE_QUALITY_HIGH
)
...
...
MDANSE/GUI/JobControllerPanel.py
View file @
91956bf8
...
...
@@ -75,6 +75,8 @@ class JobController(threading.Thread):
'''
threading
.
Thread
.
__init__
(
self
)
self
.
setDaemon
(
True
)
# The wx object related to this thread
self
.
_window
=
window
...
...
@@ -366,4 +368,4 @@ if __name__ == "__main__":
\ No newline at end of file
MDANSE/__pkginfo__.py
View file @
91956bf8
__version__
=
"1.0.
4
"
__version__
=
"1.0.
5
"
__date__
=
"
25
-0
1
-2017"
__date__
=
"
06
-0
3
-2017"
__author__
=
"Eric Pellegrini"
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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