diff --git a/src/analysis.py b/src/analysis.py index f370b0b..8139267 100644 --- a/src/analysis.py +++ b/src/analysis.py @@ -13,6 +13,9 @@ from pyulog.core import ULog from pyqtgraph.Qt import QtCore, QtGui import pyqtgraph as pg +from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas +from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT as NavigationToolbar + sys.path.append(os.path.dirname(os.path.abspath(__file__))) @@ -338,9 +341,11 @@ def animation_update(self): start, end = self.ROI_region.getRegion() t = self.current_time + start # emit data + indexes = list(map(self.getIndex, [self.time_stamp_position, self.time_stamp_attitude, self.time_stamp_output], [t, t, t])) state_data = [self.position_history[indexes[0]], self.attitude_history[indexes[1]], self.output_history[indexes[2]]] + self.quadrotorStateChanged.emit(state_data) # update slider self.time_slider.setValue(int(dV * (self.current_time + start - self.time_range[0]))) @@ -354,9 +359,11 @@ def animation_update(self): t = self.current_time + self.time_range[0] self.time_slider.setValue(int(dV * self.current_time)) # update quadrotor position and attitude and motor speed + indexes = list(map(self.getIndex, [self.time_stamp_position, self.time_stamp_attitude, self.time_stamp_output], [t, t, t])) state_data = [self.position_history[indexes[0]], self.attitude_history[indexes[1]], self.output_history[indexes[2]]] + self.quadrotorStateChanged.emit(state_data) # update vLine pos self.vLine.setPos(t) @@ -669,6 +676,13 @@ def __init__(self, loading_widget, parent=None, *args, **kwargs): self.dialog.hide() self.loading_widget = loading_widget self.loading_widget.loadFinished.connect(self.callback_close) + + + #self.connect(self.lineedit, SIGNAL("returnProcessed()"), self.updateUi) + #self.lineedit.returnPressed.connect(self.updateUi) + + #self..connect(self.loading_widget,QtCore.SIGNAL('loadFinished(bool)'),self.callback_close) + def run(self): self.dialog.setText('Loading...') diff --git a/src/widgets.py b/src/widgets.py index a67cfef..24168c7 100644 --- a/src/widgets.py +++ b/src/widgets.py @@ -7,6 +7,13 @@ from objloader import WFObject import numpy as np + +//from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas +from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT as NavigationToolbar + + + + try: from OpenGL.GL import * from OpenGL.GLUT import *