Commit f2ab7711 authored by eric pellegrini's avatar eric pellegrini

Merge branch 'hotfix-1.0.3.b'

parents 361639ef 4e2ee6ed
Pipeline #1138 passed with stages
in 17 minutes and 26 seconds
......@@ -296,6 +296,7 @@ class JobControllerPanel(wx.ScrolledWindow):
runningJobs = event.runningJobs
# Remove the widgets corresponding to the jobs that are not running anymore
for k,v in self._jobs.items():
if runningJobs.has_key(k):
......@@ -315,9 +316,6 @@ class JobControllerPanel(wx.ScrolledWindow):
self._gbSizer.SetItemPosition(w.GetWindow(),(r-1,i))
for jobName, jobStatus in runningJobs.items():
if jobStatus["state"] == "aborted":
self._jobs[jobName]["name"].SetBackgroundColour(wx.RED)
if self._jobs.has_key(jobName):
self._jobs[jobName]['progress'].SetValue(jobStatus['progress'])
......@@ -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]['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)
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_traceback,self._jobs[jobName]['state'])
......
......@@ -371,7 +371,7 @@ or directly to the MDANSE mailing list:
def on_open_mdanse_url(self, event):
webbrowser.open('https://github.com/eurydyce/MDANSE/tree/master/MDANSE')
webbrowser.open('http://mdanse.org')
def on_quit(self, event=None):
......@@ -381,7 +381,7 @@ or directly to the MDANSE mailing list:
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)
......
__version__ = "1.0.3.a"
__version__ = "1.0.3.b"
__date__ = "07-11-2016"
......
#!/usr/bin/env python
#!python
if __name__ == "__main__":
......
#!python
if __name__ == "__main__":
from MDANSE.GUI.Apps import PeriodicTableViewerApp
......
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