autotune: remember log once selected

Author: bresch

autotune/autotune.py

@@ -688,23 +688,19 @@ def plotInputOutput(self, redraw=False):
         self.canvas.draw()
 
     def loadLog(self):
-        options = QFileDialog.Options()
-        options |= QFileDialog.DontUseNativeDialog
-        self.file_name, _ = QFileDialog.getOpenFileName(self,"QFileDialog.getOpenFileName()", "","ULog (*.ulg)", options=options)
-
-        if self.file_name:
-            select = DataSelectionWindow(self.file_name)
-
-            if select.exec_():
-                    self.reset()
-                    self.t = select.t - select.t[0]
-                    self.input = select.u
-                    self.u = self.input
-                    self.y = select.y
-                    self.true_airspeed = select.v
-                    self.refreshInputOutputData()
-                    self.runIdentification()
-                    self.computeController()
+        select = DataSelectionWindow(self.file_name)
+
+        if select.exec_():
+                self.reset()
+                self.file_name = select.file_name
+                self.t = select.t - select.t[0]
+                self.input = select.u
+                self.u = self.input
+                self.y = select.y
+                self.true_airspeed = select.v
+                self.refreshInputOutputData()
+                self.runIdentification()
+                self.computeController()
 
     def refreshInputOutputData(self):
         self.reset()

autotune/data_selection_window.py

@@ -1,4 +1,4 @@
-from PyQt5.QtWidgets import QDialog, QVBoxLayout, QHBoxLayout, QPushButton, QLabel, QFormLayout, QRadioButton, QMessageBox
+from PyQt5.QtWidgets import QDialog, QVBoxLayout, QHBoxLayout, QPushButton, QLabel, QFormLayout, QRadioButton, QMessageBox, QFileDialog
 
 import matplotlib.pyplot as plt
 from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
@@ -12,13 +12,17 @@ class DataSelectionWindow(QDialog):
     def __init__(self, filename):
         QDialog.__init__(self)
 
-        self.file_name = filename
-
         self.figure = plt.figure(1)
         self.canvas = FigureCanvas(self.figure)
 
         layout_v = QVBoxLayout()
 
+        top_group = QHBoxLayout()
+        btn_browse = QPushButton("Browse files")
+        btn_browse.clicked.connect(self.browseFiles)
+        top_group.addWidget(btn_browse)
+
+        layout_v.addLayout(top_group)
         layout_v.addWidget(self.canvas)
 
         xyz_group = QHBoxLayout()
@@ -42,7 +46,12 @@ def __init__(self, filename):
 
         self.setLayout(layout_v)
 
-        self.refreshInputOutputData()
+        if filename:
+            self.file_name = filename
+            self.refreshInputOutputData()
+
+        else:
+            self.browseFiles()
 
     def loadLog(self):
         if self.t_stop > self.t_start:
@@ -51,6 +60,14 @@ def loadLog(self):
         else:
             self.printRangeError()
 
+    def browseFiles(self):
+        options = QFileDialog.Options()
+        options |= QFileDialog.DontUseNativeDialog
+        self.file_name, _ = QFileDialog.getOpenFileName(self,"QFileDialog.getOpenFileName()", "","ULog (*.ulg)", options=options)
+
+        if self.file_name:
+            self.refreshInputOutputData()
+
     def printRangeError(self):
         msg = QMessageBox()
         msg.setIcon(QMessageBox.Critical)