1 change: 1 addition & 0 deletions sw/supervision/python/paparazzicenter.py
View file
Expand Up @@ -78,6 +78,7 @@ def handle_set_changed(self, conf_file):
self.conf = Conf(conf_file)
Conf.set_current_conf(conf_file)
self.configuration_panel.build_widget.set_conf(self.conf)
self.log_widget.set_conf(self.conf)
acs = [ac.name for ac in self.conf.aircrafts]
self.header.set_acs(acs)

Expand Down
Binary file added sw/supervision/python/ui/icons/help.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added sw/supervision/python/ui/icons/open.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added sw/supervision/python/ui/icons/undo.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions sw/supervision/python/ui/resources.qrc
View file
@@ -1,5 +1,8 @@
<RCC>
<qresource prefix="icons">
<file>icons/help.png</file>
<file>icons/undo.png</file>
<file>icons/open.png</file>
<file>icons/error.svg</file>
<file>icons/running.svg</file>
<file>icons/edit.png</file>
Expand Down
56 changes: 36 additions & 20 deletions sw/supervision/python/ui/ui_app_settings.ui
View file
Expand Up @@ -6,32 +6,32 @@
<rect>
<x>0</x>
<y>0</y>
<width>381</width>
<height>131</height>
<width>364</width>
<height>212</height>
</rect>
</property>
<property name="windowTitle">
<string>Settings</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<item row="3" column="1">
<widget class="QCheckBox" name="keep_build_programs_checkbox">
<property name="text">
<string>Text editor</string>
<string/>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="text_editor_edit"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Keep changes on exit</string>
<string>Terminal Emulator</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<item row="0" column="1">
<widget class="QLineEdit" name="text_editor_edit"/>
</item>
<item row="6" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
Expand All @@ -41,22 +41,29 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="terminal_emulator_edit"/>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="keep_changes_checkbox">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Terminal Emulator</string>
<string>Keep changes on exit</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="terminal_emulator_edit"/>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Text editor</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
Expand All @@ -68,13 +75,22 @@
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="keep_build_programs_checkbox">
<item row="4" column="0">
<widget class="QLabel" name="label_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
<string>Default log path</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="log_path_edit"/>
</item>
</layout>
</widget>
<resources/>
Expand Down
117 changes: 117 additions & 0 deletions sw/supervision/python/ui/ui_log_widget.ui
View file
@@ -0,0 +1,117 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>LogWidget</class>
<widget class="QWidget" name="LogWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>359</width>
<height>128</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>SD log file</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QToolButton" name="input_button">
<property name="toolTip">
<string>Select SD LOG file</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icons/icons/open.png</normaloff>:/icons/icons/open.png</iconset>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QToolButton" name="output_button">
<property name="toolTip">
<string>Select output directory</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icons/icons/open.png</normaloff>:/icons/icons/open.png</iconset>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Output dir</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="output_edit"/>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="input_edit"/>
</item>
<item row="1" column="3">
<widget class="QToolButton" name="reset_output_button">
<property name="toolTip">
<string>reset to default</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icons/icons/undo.png</normaloff>:/icons/icons/undo.png</iconset>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QToolButton" name="help_button">
<property name="toolTip">
<string>help</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icons/icons/help.png</normaloff>:/icons/icons/help.png</iconset>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="status_label">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QPushButton" name="process_button">
<property name="text">
<string>Process</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources>
<include location="resources.qrc"/>
</resources>
<connections/>
</ui>
51 changes: 51 additions & 0 deletions sw/supervision/python/ui/ui_supervision_window.ui
View file
Expand Up @@ -38,6 +38,51 @@
<string>Documentation</string>
</attribute>
</widget>
<widget class="QWidget" name="tools_panel">
<attribute name="title">
<string>Utilities</string>
</attribute>
<layout class="QGridLayout" name="gridLayout" rowstretch="0,0" columnstretch="2,1">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Extract SD logs</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="LogWidget" name="log_widget" native="true"/>
</item>
</layout>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
Expand Down Expand Up @@ -103,6 +148,12 @@
<header>doc_panel.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>LogWidget</class>
<extends>QWidget</extends>
<header>log_widget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>
Expand Down