Skip to content

Version 4.0 #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
capocchi merged 5 commits into from
Mar 10, 2020
Merged

Version 4.0 #93

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8069151
bug fix for profiling on windows
capocchi Mar 9, 2020
8534759
update for linux
capocchi Mar 9, 2020
74c69df
update
capocchi Mar 9, 2020
1eb953a
update
capocchi Mar 9, 2020
95bdd3b
Add Crust to replace Shell
capocchi Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 45 additions & 22 deletions devsimpy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import webbrowser
import platform
import threading
import subprocess
import pickle
import itertools
import shutil
Expand Down Expand Up @@ -301,7 +302,7 @@ def __init__(self, parent, id, title):
# Shell panel
self.panel4 = wx.Panel(self, wx.NewIdRef(), style=wx.WANTS_CHARS)
sizer4 = wx.BoxSizer(wx.VERTICAL)
sizer4.Add(py.shell.Shell(self.panel4, introText=_("Welcome to DEVSimPy: The GUI for Python DEVS Simulator")), 1, wx.EXPAND)
sizer4.Add(py.crust.Crust(self.panel4, intro=_("Welcome to DEVSimPy: The GUI for Python DEVS Simulator")), 1, wx.EXPAND)
self.panel4.SetSizer(sizer4)
self.panel4.SetAutoLayout(True)

Expand Down Expand Up @@ -1898,28 +1899,50 @@ def OnProfiling(self, event):
prof_file_path = os.path.join(gettempdir(), fn)

### list of item in single choice dialogue
choices = ['snakeviz','gprof2dot',_('Embedded in DEVSimPy')]
### gprof2dot needs graphviz
choices = ['snakeviz', 'gprof2dot', _('Embedded in DEVSimPy')]

dlg = wx.SingleChoiceDialog(self, _('What profiling software are you using?'), _('Single Choice'), choices)
if dlg.ShowModal() == wx.ID_OK:
response = dlg.GetStringSelection()
if response == 'snakeviz':
dlg.Destroy()
r = install_and_import(response)
if r: os.system(" ".join([response,prof_file_path,"&"]))
elif response == 'gprof2dot':
dlg.Destroy()
r = install_and_import(response)
png_file_path = prof_file_path.replace('.prof', '.png')
os.system(" ".join([response,'-f pstats',prof_file_path,"|", "dot", "-Tpng", "-o", png_file_path, "&&", "eog", png_file_path]))
elif response == _('Embedded in DEVSimPy'):
dlg.Destroy()
output = self.LoadProfFile(prof_file_path)
d = wx.lib.dialogs.ScrolledMessageDialog(self, output, _("Statistic of profiling"), style=wx.OK|wx.ICON_EXCLAMATION|wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER)
d.CenterOnParent(wx.BOTH)
d.ShowModal()
else:
dlg.Destroy()
if os.path.exists(prof_file_path):

dlg = wx.SingleChoiceDialog(self, _('What profiling software are you using?'), _('Single Choice'), choices)
if dlg.ShowModal() == wx.ID_OK:

response = dlg.GetStringSelection()
if response == 'snakeviz':
dlg.Destroy()
if install_and_import(response):
threading.Thread(target=self.longRunning1,
args=(response,prof_file_path),
).start()
else:
wx.MessageBox(_('%s is not installed.'%(response)), _('Error'), wx.OK | wx.ICON_ERROR)
elif response == 'gprof2dot':
dlg.Destroy()
if install_and_import(response):
threading.Thread(target=self.longRunning2,
args=(response,prof_file_path),
).start()
else:
wx.MessageBox(_('%s is not installed.'%(response)), _('Error'), wx.OK | wx.ICON_ERROR)
elif response == _('Embedded in DEVSimPy'):
dlg.Destroy()
output = self.LoadProfFile(prof_file_path)
d = wx.lib.dialogs.ScrolledMessageDialog(self, output, _("Statistic of profiling"), style=wx.OK|wx.ICON_EXCLAMATION|wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER)
d.CenterOnParent(wx.BOTH)
d.ShowModal()
else:
dlg.Destroy()
else:
wx.MessageBox(_('The profile file %s does not exist.'%(prof_file_path)), _('Error'), wx.OK | wx.ICON_ERROR)

@staticmethod
def longRunning1(response, prof_file_path):
subprocess.call(" ".join([response,prof_file_path]), shell=True)

@staticmethod
def longRunning2(response, prof_file_path):
png_file_path = prof_file_path.replace('.prof', '.png')
subprocess.call(" ".join([response,'-f pstats',prof_file_path,"|", "dot", "-Tpng", "-o", png_file_path, "&&", "eog", png_file_path]), shell=True)

@staticmethod
@redirectStdout
Expand Down