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
f2ab7711
Commit
f2ab7711
authored
Nov 07, 2016
by
eric pellegrini
Browse files
Merge branch 'hotfix-1.0.3.b'
parents
361639ef
4e2ee6ed
Pipeline
#1138
passed with stages
in 17 minutes and 26 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
MDANSE/GUI/JobControllerPanel.py
View file @
f2ab7711
...
@@ -296,6 +296,7 @@ class JobControllerPanel(wx.ScrolledWindow):
...
@@ -296,6 +296,7 @@ class JobControllerPanel(wx.ScrolledWindow):
runningJobs
=
event
.
runningJobs
runningJobs
=
event
.
runningJobs
# Remove the widgets corresponding to the jobs that are not running anymore
for
k
,
v
in
self
.
_jobs
.
items
():
for
k
,
v
in
self
.
_jobs
.
items
():
if
runningJobs
.
has_key
(
k
):
if
runningJobs
.
has_key
(
k
):
...
@@ -315,9 +316,6 @@ class JobControllerPanel(wx.ScrolledWindow):
...
@@ -315,9 +316,6 @@ class JobControllerPanel(wx.ScrolledWindow):
self
.
_gbSizer
.
SetItemPosition
(
w
.
GetWindow
(),(
r
-
1
,
i
))
self
.
_gbSizer
.
SetItemPosition
(
w
.
GetWindow
(),(
r
-
1
,
i
))
for
jobName
,
jobStatus
in
runningJobs
.
items
():
for
jobName
,
jobStatus
in
runningJobs
.
items
():
if
jobStatus
[
"state"
]
==
"aborted"
:
self
.
_jobs
[
jobName
][
"name"
].
SetBackgroundColour
(
wx
.
RED
)
if
self
.
_jobs
.
has_key
(
jobName
):
if
self
.
_jobs
.
has_key
(
jobName
):
self
.
_jobs
[
jobName
][
'progress'
].
SetValue
(
jobStatus
[
'progress'
])
self
.
_jobs
[
jobName
][
'progress'
].
SetValue
(
jobStatus
[
'progress'
])
...
@@ -346,6 +344,9 @@ class JobControllerPanel(wx.ScrolledWindow):
...
@@ -346,6 +344,9 @@ class JobControllerPanel(wx.ScrolledWindow):
self
.
_gbSizer
.
Add
(
self
.
_jobs
[
jobName
][
'progress'
],
pos
=
(
r
,
5
),
flag
=
wx
.
EXPAND
|
wx
.
ALIGN_CENTER_HORIZONTAL
)
self
.
_gbSizer
.
Add
(
self
.
_jobs
[
jobName
][
'progress'
],
pos
=
(
r
,
5
),
flag
=
wx
.
EXPAND
|
wx
.
ALIGN_CENTER_HORIZONTAL
)
self
.
_gbSizer
.
Add
(
self
.
_jobs
[
jobName
][
'eta'
]
,
pos
=
(
r
,
6
),
flag
=
wx
.
EXPAND
|
wx
.
ALIGN_CENTER_HORIZONTAL
)
self
.
_gbSizer
.
Add
(
self
.
_jobs
[
jobName
][
'eta'
]
,
pos
=
(
r
,
6
),
flag
=
wx
.
EXPAND
|
wx
.
ALIGN_CENTER_HORIZONTAL
)
self
.
_gbSizer
.
Add
(
self
.
_jobs
[
jobName
][
'kill'
]
,
pos
=
(
r
,
7
),
flag
=
wx
.
EXPAND
|
wx
.
ALIGN_CENTER_HORIZONTAL
)
self
.
_gbSizer
.
Add
(
self
.
_jobs
[
jobName
][
'kill'
]
,
pos
=
(
r
,
7
),
flag
=
wx
.
EXPAND
|
wx
.
ALIGN_CENTER_HORIZONTAL
)
if
jobStatus
[
"state"
]
==
"aborted"
:
self
.
_jobs
[
jobName
][
"name"
].
SetBackgroundColour
(
wx
.
RED
)
self
.
Bind
(
wx
.
EVT_BUTTON
,
self
.
on_display_info
,
self
.
_jobs
[
jobName
][
'name'
])
self
.
Bind
(
wx
.
EVT_BUTTON
,
self
.
on_display_info
,
self
.
_jobs
[
jobName
][
'name'
])
self
.
Bind
(
wx
.
EVT_BUTTON
,
self
.
on_display_traceback
,
self
.
_jobs
[
jobName
][
'state'
])
self
.
Bind
(
wx
.
EVT_BUTTON
,
self
.
on_display_traceback
,
self
.
_jobs
[
jobName
][
'state'
])
...
...
MDANSE/GUI/MainFrame.py
View file @
f2ab7711
...
@@ -371,7 +371,7 @@ or directly to the MDANSE mailing list:
...
@@ -371,7 +371,7 @@ or directly to the MDANSE mailing list:
def
on_open_mdanse_url
(
self
,
event
):
def
on_open_mdanse_url
(
self
,
event
):
webbrowser
.
open
(
'http
s
://
github.com/eurydyce/MDANSE/tree/master/MDANSE
'
)
webbrowser
.
open
(
'http://
mdanse.org
'
)
def
on_quit
(
self
,
event
=
None
):
def
on_quit
(
self
,
event
=
None
):
...
@@ -381,7 +381,7 @@ or directly to the MDANSE mailing list:
...
@@ -381,7 +381,7 @@ or directly to the MDANSE mailing list:
def
on_start_plotter
(
self
,
event
=
None
):
def
on_start_plotter
(
self
,
event
=
None
):
from
MDANSE.GUI.Plugins.
Plotter.
PlotterPlugin
import
PlotterFrame
from
MDANSE.GUI.Plugins.PlotterPlugin
import
PlotterFrame
f
=
PlotterFrame
(
self
)
f
=
PlotterFrame
(
self
)
...
...
MDANSE/__pkginfo__.py
View file @
f2ab7711
__version__
=
"1.0.3.
a
"
__version__
=
"1.0.3.
b
"
__date__
=
"07-11-2016"
__date__
=
"07-11-2016"
...
...
Scripts/mdanse_gui
View file @
f2ab7711
#!
/usr/bin/env
python
#!python
if
__name__
==
"__main__"
:
if
__name__
==
"__main__"
:
...
...
Scripts/mdanse_periodic_table
View file @
f2ab7711
#!python
#!python
if
__name__
==
"__main__"
:
if
__name__
==
"__main__"
:
from
MDANSE.GUI.Apps
import
PeriodicTableViewerApp
from
MDANSE.GUI.Apps
import
PeriodicTableViewerApp
...
...
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