From 0322c33a48b62dbad08108274c9fceb931e4a099 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Sun, 1 Nov 2020 22:25:45 +0100 Subject: [PATCH] bug fix --- SpreadSheet.py | 11 ++++++----- devsimpy.py | 15 ++++++++++++--- plugins/state_trajectory.py | 8 +++----- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/SpreadSheet.py b/SpreadSheet.py index c0dcb10f..3753d0dd 100644 --- a/SpreadSheet.py +++ b/SpreadSheet.py @@ -431,11 +431,12 @@ def OnGraph(self, event): break ### choice is digit else we break - if select in range(0,len(value)-1) and not isinstance(value[select], str): - data.append((time, float(value[select]))) - else: - #wx.MessageBox(_('Value to plot must be digit!'), _('Warning'), wx.OK | wx.ICON_WARNING) - data.append((time, value[select])) + if value[select]: + if select in range(0,len(value)-1) and not isinstance(value[select], str): + data.append((time, float(value[select]))) + else: + #wx.MessageBox(_('Value to plot must be digit!'), _('Warning'), wx.OK | wx.ICON_WARNING) + data.append((time, value[select])) ### first if int is digit or if float is digit else: diff --git a/devsimpy.py b/devsimpy.py index 3a58872d..7b71c516 100644 --- a/devsimpy.py +++ b/devsimpy.py @@ -505,13 +505,22 @@ def Seti18n(self): # language config from .devsimpy file if self.language == 'en': - locale.setlocale(locale.LC_ALL, 'en') + try: + locale.setlocale(locale.LC_ALL, 'en') + except: + sys.stdout.write(_('new local (since wx 4.1.0) setting not applied')) translation = gettext.translation(domain, localedir, languages=['en']) # English elif self.language =='fr': - locale.setlocale(locale.LC_ALL, 'fr') + try: + locale.setlocale(locale.LC_ALL, 'fr') + except: + sys.stdout.write(_('new local (since wx 4.1.0) setting not applied')) translation = gettext.translation(domain, localedir, languages=['fr']) # French else: - locale.setlocale(locale.LC_ALL, '') + try: + locale.setlocale(locale.LC_ALL, '') + except: + sys.stdout.write(_('new local (since wx 4.1.0) setting not applied')) #installing os language by default translation = gettext.translation(domain, localedir, [self.locale.GetCanonicalName()], fallback = True) diff --git a/plugins/state_trajectory.py b/plugins/state_trajectory.py index 1d569a35..0865fa25 100644 --- a/plugins/state_trajectory.py +++ b/plugins/state_trajectory.py @@ -180,18 +180,16 @@ def PlotStateTrajectory(m): ### adapted to PyPDEVS times_lst = list(map(lambda a: a[0] if isinstance(a, tuple) else a, st.keys())) + ### display index instead of state as string #states_lst = [states.index(st[k]) for k in st] - states_lst = list(st.values()) + ### state can be specified as IDLE:4 with 4 for ta function ! + states_lst = [s.split(':')[0] for s in st.values()] items = zip(times_lst, states_lst) sorted_items = sorted(items, key=lambda x: (x[0], x[1])) - print(st) - - print(sorted_items) - x, y = zip(*sorted_items) assert len(x)==len(y)