diff --git a/sw/ground_segment/python/onboard_log_transform.py b/sw/ground_segment/python/onboard_log_transform.py index 821aba060e..1e4551b44e 100755 --- a/sw/ground_segment/python/onboard_log_transform.py +++ b/sw/ground_segment/python/onboard_log_transform.py @@ -32,7 +32,7 @@ class OnboardLogTransformTool(): def ProcessLine(self, line): fields = line.strip().split(' ') [timestamp, pprz_tstamp, ac_id, msg_id] = fields[0:4] - data_fields = map(lambda x: chr(int(x, 16)), fields[5:]) + data_fields = list(map(lambda x: chr(int(x, 16)), fields[5:])) ac_id = int(ac_id) timestamp = float(pprz_tstamp) msg_id = int(msg_id) diff --git a/sw/ground_segment/python/real_time_plot/plotframe.py b/sw/ground_segment/python/real_time_plot/plotframe.py index 7763af1ef6..f438db580b 100644 --- a/sw/ground_segment/python/real_time_plot/plotframe.py +++ b/sw/ground_segment/python/real_time_plot/plotframe.py @@ -1,5 +1,7 @@ #Boa:Frame:PlotFrame +from __future__ import division + import wx import plotpanel @@ -190,41 +192,41 @@ class PlotFrame(wx.Frame): self.dynamic_menus[menu_id] = self.menuCurves.AppendSubMenu(submenu=curveMenu, text=title) def OnMenuDeleteCurve(self, event): - menu_id = event.GetId() / 10 - item = self.dynamic_menus[ menu_id] - self.canvas.RemovePlot( menu_id) + menu_id = event.GetId() // 10 + item = self.dynamic_menus[menu_id] + self.canvas.RemovePlot(menu_id) self.menuCurves.DestroyItem(item) del self.dynamic_menus[menu_id] def OnMenuOffsetCurve(self, event): - menu_id = (event.GetId()-1) / 10 + menu_id = (event.GetId()-1) // 10 default_value = str(self.canvas.FindPlot(menu_id).offset) value = wx.GetTextFromUser("Enter a value to offset the plot", "Offset", default_value) try: value = float(value) - self.canvas.OffsetPlot( menu_id, value) + self.canvas.OffsetPlot(menu_id, value) except: pass def OnMenuScaleCurve(self, event): - menu_id = (event.GetId()-2) / 10 + menu_id = (event.GetId()-2) // 10 default_value = str(self.canvas.FindPlot(menu_id).scale) value = wx.GetTextFromUser("Enter a factor to scale the plot", "Scale", default_value) try: value = float(value) - self.canvas.ScalePlot( menu_id, value) + self.canvas.ScalePlot(menu_id, value) except: pass def OnMenuRealTime(self,event): - menu_id = (event.GetId()-3) / 10 - self.canvas.SetRealTime( menu_id, event.IsChecked()) + menu_id = (event.GetId()-3) // 10 + self.canvas.SetRealTime(menu_id, event.IsChecked()) def OnMenuUseAsXAxis(self,event): event_id = event.GetId() - menu_id = (event_id-4) / 10 + menu_id = (event_id-4) // 10 value = event.IsChecked() if value: diff --git a/sw/ground_segment/python/real_time_plot/plotpanel.py b/sw/ground_segment/python/real_time_plot/plotpanel.py index 278b9fca3e..5793ecbf79 100644 --- a/sw/ground_segment/python/real_time_plot/plotpanel.py +++ b/sw/ground_segment/python/real_time_plot/plotpanel.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, print_function +from __future__ import absolute_import, print_function, division import wx from ivy.std_api import * @@ -85,8 +85,10 @@ class plot_data: (x_min, x_max) = x_axis.GetXMinMax() dc.SetPen(wx.Pen(self.color,1)) - if _max_ < _min_: (_min_, _max_) = (-1,1) #prevent divide by zero or inversion - if _max_ == _min_: (_min_, _max_) = (_max_-0.5, _max_+0.5) + if _max_ < _min_: + (_min_, _max_) = (-1,1) #prevent divide by zero or inversion + if _max_ == _min_: + (_min_, _max_) = (_max_-0.5, _max_+0.5) delta = _max_-_min_ dy = (height - margin*2) / delta @@ -98,14 +100,16 @@ class plot_data: for i in range(self.size): ix = (i+self.index) % self.size point = self.data[ix] - if point == None: continue + if point == None: + continue n += 1 sums = sums + point sum_squares = sum_squares + (point*point) if x_axis != None: x = x_axis.data[ix] - if x == None: continue + if x == None: + continue dx = (width-1) / (x_max-x_min) x = int((x-x_min) * dx) diff --git a/sw/ground_segment/python/settings_app/settingsframe.py b/sw/ground_segment/python/settings_app/settingsframe.py index 97aff05ae7..ce0d7e14fe 100644 --- a/sw/ground_segment/python/settings_app/settingsframe.py +++ b/sw/ground_segment/python/settings_app/settingsframe.py @@ -1,5 +1,7 @@ #Boa:Frame:PlotFrame +from __future__ import division + import wx import sys import os @@ -92,7 +94,7 @@ class SettingCtrl(wx.Slider): if (self.setting.step < 1): return float(self.GetValue()) / SLIDER_FACTOR else: - return int(self.GetValue()) / SLIDER_FACTOR + return int(self.GetValue()) // SLIDER_FACTOR class SettingsFrame(wx.Frame): edits = []