Skip to content

Commit a94e615

Browse files
EzetowersEzetowers
committed
Merge branch 'arduino_manager'
2 parents 06cb335 + 741bff4 commit a94e615

28 files changed

+2973
-621
lines changed

‎MLC/GUI/Autogenerated/autogenerated.py‎

Lines changed: 493 additions & 82 deletions
Large diffs are not rendered by default.

‎MLC/GUI/Autogenerated/mlc_qtcreator/arduino_performance_test.cpp‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#include "arduino_performance_test.h"
2+
#include "ui_arduino_performance_test.h"
3+
4+
arduino_performance_test::arduino_performance_test(QWidget *parent) :
5+
QDialog(parent),
6+
ui(new Ui::arduino_performance_test)
7+
{
8+
ui->setupUi(this);
9+
}
10+
11+
arduino_performance_test::~arduino_performance_test()
12+
{
13+
delete ui;
14+
}

‎MLC/GUI/Autogenerated/mlc_qtcreator/arduino_performance_test.h‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#ifndef ARDUINO_PERFORMANCE_TEST_H
2+
#define ARDUINO_PERFORMANCE_TEST_H
3+
4+
#include <QDialog>
5+
6+
namespace Ui {
7+
class arduino_performance_test;
8+
}
9+
10+
class arduino_performance_test : public QDialog
11+
{
12+
Q_OBJECT
13+
14+
public:
15+
explicit arduino_performance_test(QWidget *parent = 0);
16+
~arduino_performance_test();
17+
18+
private:
19+
Ui::arduino_performance_test *ui;
20+
};
21+
22+
#endif // ARDUINO_PERFORMANCE_TEST_H

‎MLC/GUI/Autogenerated/mlc_qtcreator/arduino_performance_test.ui‎

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
3+
<class>arduino_performance_test</class>
4+
<widget class="QDialog" name="arduino_performance_test">
5+
<property name="geometry">
6+
<rect>
7+
<x>0</x>
8+
<y>0</y>
9+
<width>775</width>
10+
<height>500</height>
11+
</rect>
12+
</property>
13+
<property name="maximumSize">
14+
<size>
15+
<width>16777215</width>
16+
<height>16777215</height>
17+
</size>
18+
</property>
19+
<property name="windowTitle">
20+
<string>Dialog</string>
21+
</property>
22+
<layout class="QVBoxLayout" name="verticalLayout">
23+
<item>
24+
<widget class="QFrame" name="graph_base">
25+
<property name="frameShape">
26+
<enum>QFrame::StyledPanel</enum>
27+
</property>
28+
<property name="frameShadow">
29+
<enum>QFrame::Raised</enum>
30+
</property>
31+
</widget>
32+
</item>
33+
<item>
34+
<widget class="QGroupBox" name="groupBox">
35+
<property name="maximumSize">
36+
<size>
37+
<width>16777215</width>
38+
<height>150</height>
39+
</size>
40+
</property>
41+
<property name="autoFillBackground">
42+
<bool>false</bool>
43+
</property>
44+
<property name="title">
45+
<string>Stats</string>
46+
</property>
47+
<layout class="QFormLayout" name="formLayout">
48+
<item row="0" column="0">
49+
<widget class="QLabel" name="avg_op">
50+
<property name="text">
51+
<string>Avg. operations:</string>
52+
</property>
53+
</widget>
54+
</item>
55+
<item row="5" column="0">
56+
<widget class="QLabel" name="std_dev">
57+
<property name="text">
58+
<string>Standard deviation:</string>
59+
</property>
60+
</widget>
61+
</item>
62+
<item row="3" column="0">
63+
<widget class="QLabel" name="min_op">
64+
<property name="text">
65+
<string>Min. operations:</string>
66+
</property>
67+
</widget>
68+
</item>
69+
<item row="2" column="0">
70+
<widget class="QLabel" name="max_op">
71+
<property name="text">
72+
<string>Max operations:</string>
73+
</property>
74+
</widget>
75+
</item>
76+
<item row="5" column="1">
77+
<widget class="QLabel" name="std_dev_value">
78+
<property name="text">
79+
<string>0</string>
80+
</property>
81+
</widget>
82+
</item>
83+
<item row="3" column="1">
84+
<widget class="QLabel" name="min_op_value">
85+
<property name="text">
86+
<string>0</string>
87+
</property>
88+
</widget>
89+
</item>
90+
<item row="2" column="1">
91+
<widget class="QLabel" name="max_op_value">
92+
<property name="text">
93+
<string>0</string>
94+
</property>
95+
</widget>
96+
</item>
97+
<item row="0" column="1">
98+
<widget class="QLabel" name="avg_op_value">
99+
<property name="text">
100+
<string>0</string>
101+
</property>
102+
</widget>
103+
</item>
104+
</layout>
105+
</widget>
106+
</item>
107+
<item alignment="Qt::AlignHCenter">
108+
<widget class="QFrame" name="frame">
109+
<property name="maximumSize">
110+
<size>
111+
<width>16777215</width>
112+
<height>45</height>
113+
</size>
114+
</property>
115+
<property name="frameShape">
116+
<enum>QFrame::NoFrame</enum>
117+
</property>
118+
<property name="frameShadow">
119+
<enum>QFrame::Raised</enum>
120+
</property>
121+
<layout class="QHBoxLayout" name="horizontalLayout">
122+
<item>
123+
<widget class="QPushButton" name="resetButton">
124+
<property name="text">
125+
<string>Reset</string>
126+
</property>
127+
</widget>
128+
</item>
129+
<item>
130+
<widget class="QPushButton" name="closeButton">
131+
<property name="text">
132+
<string>Close</string>
133+
</property>
134+
</widget>
135+
</item>
136+
</layout>
137+
</widget>
138+
</item>
139+
</layout>
140+
</widget>
141+
<resources/>
142+
<connections>
143+
<connection>
144+
<sender>resetButton</sender>
145+
<signal>clicked()</signal>
146+
<receiver>arduino_performance_test</receiver>
147+
<slot>on_bench_reset()</slot>
148+
<hints>
149+
<hint type="sourcelabel">
150+
<x>352</x>
151+
<y>472</y>
152+
</hint>
153+
<hint type="destinationlabel">
154+
<x>746</x>
155+
<y>450</y>
156+
</hint>
157+
</hints>
158+
</connection>
159+
<connection>
160+
<sender>closeButton</sender>
161+
<signal>clicked()</signal>
162+
<receiver>arduino_performance_test</receiver>
163+
<slot>on_close()</slot>
164+
<hints>
165+
<hint type="sourcelabel">
166+
<x>443</x>
167+
<y>472</y>
168+
</hint>
169+
<hint type="destinationlabel">
170+
<x>706</x>
171+
<y>469</y>
172+
</hint>
173+
</hints>
174+
</connection>
175+
</connections>
176+
<slots>
177+
<slot>on_bench_reset()</slot>
178+
<slot>on_close()</slot>
179+
</slots>
180+
</ui>

‎MLC/GUI/Autogenerated/mlc_qtcreator/arduinoconnectiontest.ui‎

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,13 @@
1717
<property name="sizeConstraint">
1818
<enum>QLayout::SetMinimumSize</enum>
1919
</property>
20-
<item>
21-
<widget class="QLabel" name="loadingPanel">
22-
<property name="text">
23-
<string/>
24-
</property>
25-
<property name="alignment">
26-
<set>Qt::AlignCenter</set>
27-
</property>
20+
<item alignment="Qt::AlignHCenter">
21+
<widget class="QWidget" name="widget" native="true">
22+
<layout class="QVBoxLayout" name="verticalLayout_2"/>
2823
</widget>
2924
</item>
3025
<item>
31-
<widget class="QLabel" name="label_2">
26+
<widget class="QLabel" name="status_label">
3227
<property name="maximumSize">
3328
<size>
3429
<width>2400</width>
@@ -68,33 +63,17 @@
6863
<connections>
6964
<connection>
7065
<sender>buttonBox</sender>
71-
<signal>accepted()</signal>
72-
<receiver>ArduinoConnectionDialog</receiver>
73-
<slot>accept()</slot>
74-
<hints>
75-
<hint type="sourcelabel">
76-
<x>248</x>
77-
<y>254</y>
78-
</hint>
79-
<hint type="destinationlabel">
80-
<x>157</x>
81-
<y>274</y>
82-
</hint>
83-
</hints>
84-
</connection>
85-
<connection>
86-
<sender>buttonBox</sender>
87-
<signal>rejected()</signal>
66+
<signal>clicked(QAbstractButton*)</signal>
8867
<receiver>ArduinoConnectionDialog</receiver>
89-
<slot>reject()</slot>
68+
<slot>close()</slot>
9069
<hints>
9170
<hint type="sourcelabel">
92-
<x>316</x>
93-
<y>260</y>
71+
<x>199</x>
72+
<y>277</y>
9473
</hint>
9574
<hint type="destinationlabel">
96-
<x>286</x>
97-
<y>274</y>
75+
<x>199</x>
76+
<y>149</y>
9877
</hint>
9978
</hints>
10079
</connection>

0 commit comments

Comments
 (0)