[Simulator] Asynchronous SimulatorInterface & a few new features. (#4738)
* [Simulator] Create RadioKeyWidget class for UI buttons & refactor ButtonsWidget; Refactor SimulatedUIWidget (and subtypes) to use new RadioKeyWidgets/ButtonsWidget; Centralize help text for key mappings and get creative with some icons; Simplify some radio UI setups with rectangular buttons.
* [Simulator] Convert all simulator data I/O to signals/slots mechanism:
* SimulatorInterface/OpenTxSimulator:
- Now inherits from QObject to allow signal/slot interface;
- Allows data exchange on a per-item basis (eg. each I/O value is treated separately instead of sending whole arrays or structs of data);
- Checks for data changes and only emits signals when change is detected (GUI can now assume only new values are being sent);
- Manages its own 10ms timer (doesn't rely on GUI to do that);
- Sends "heartbeat" signals @ 1Hz for status monitoring;
* Simulator GUI:
- All data is exchanged between GUI elements as well as SimulatorInterface via signals/slots using standardized methods;
- Data is sent immediately, and only, when actually changed (eg. a control is moved) instead of in bulk at specific time intervals;
- Similarly, an asynchronous method is used for reading incoming data, w/out timers or loops;
- Improve VirtualJoystickWidget to be more encapsulated and configurable;
- Pause telemetry simulator if window is hidden;
* [Simulator] Move SimulatorInterface instance to separate thread, ensure safe asynchronous operations & proper timer interactions; Protect/remove some functions, & reorganize the order (cosmetics).
* [Simulator] Traces are now delivered to OpenTxSimulator and one or more QIODevice(s) can be added as recipient(s); Add SimulatorInterface::getCapability() for compile-time settings; Remove reversed POT1/SLIDER1 mixer exception (Taranis) requirement for SIMU; Fix plus/minus key delay on wheel event w/out encoder.
* [Simulator] Add current knob/slider/trim input value in tool-tips (KnobWidget and SliderWidget).
* [Simulator] Fix trims widget internal value not properly updating, and remove trim influence on virtual joystick X/Y value display (closes #4671).
* [SimulatorInterface] Add handling of transmitter input voltage, including a rough conversion of volts to ADC value for different boards, and default battery volts lookup function; Clear analogs array before starting.
* [Simulator] Add SimulatorInterface::init() method to separate pre-startup tasks; Report actual trim range, not just extended on/off; Change how radio widget states are restored; VirtualJoystickWidget: Connect trim changes directly from simulator, connect joystick events directly, report stick mode directly instead of setting values/constraints externally.
* [Simulator] Calculate default Tx V input based on configured range in radio settings (or warning V+2 for radios which don't support a range).
* [Simulator] Add functional aux. trims for Horus (closes #4699).
* [Companion] Remove problematic QMessageLogContext from AppDebugMessageHandler::messageOutput().
* [Simulator] Prevent trim change via slider if disabled for flight mode (closes #4600).
* [OpenTxSimulator] Fixes for Qt < 5.4.
* [OpenTxSimulator] Fix slot name.
This commit is contained in:
committed by
Bertrand Songis
parent
36bb951314
commit
57dc0159d6
@@ -22,47 +22,12 @@
|
||||
#define _BUTTONSWIDGET_H_
|
||||
|
||||
#include "radiouiaction.h"
|
||||
#include "radiokeywidget.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include <QtGui>
|
||||
#include <QStyleOption>
|
||||
|
||||
class Area : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit Area(const QPolygon & polygon, const QString &image, RadioUiAction * action = NULL, QObject * parent = NULL):
|
||||
QObject(parent),
|
||||
polygon(polygon),
|
||||
imgFile(image),
|
||||
action(action)
|
||||
{
|
||||
if (action)
|
||||
connect(action, &RadioUiAction::toggled, this, &Area::onActionToggled);
|
||||
}
|
||||
|
||||
bool contains(int x, int y)
|
||||
{
|
||||
return polygon.containsPoint(QPoint(x, y), Qt::OddEvenFill);
|
||||
}
|
||||
|
||||
void onActionToggled(int, bool active)
|
||||
{
|
||||
if (active)
|
||||
emit imageChanged(imgFile);
|
||||
else
|
||||
emit imageChanged("");
|
||||
}
|
||||
|
||||
QPolygon polygon;
|
||||
QString imgFile;
|
||||
RadioUiAction * action;
|
||||
|
||||
signals:
|
||||
void imageChanged(const QString image);
|
||||
};
|
||||
|
||||
class ButtonsWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -80,18 +45,17 @@ class ButtonsWidget : public QWidget
|
||||
QWidget::setStyleSheet(sheet);
|
||||
}
|
||||
|
||||
void addArea(int x1, int y1, int x2, int y2, const char * image, RadioUiAction * action = NULL)
|
||||
RadioKeyWidget * addArea(const QRect & rect, const char * image, RadioUiAction * action = NULL)
|
||||
{
|
||||
QPolygon polygon;
|
||||
polygon.setPoints(4, x1, y1, x1, y2, x2, y2, x2, y1);
|
||||
addArea(polygon, image, action);
|
||||
return addArea(QPolygon(rect), image, action);
|
||||
}
|
||||
|
||||
void addArea(const QPolygon & polygon, const char * image, RadioUiAction * action = NULL)
|
||||
RadioKeyWidget * addArea(const QPolygon & polygon, const char * image, RadioUiAction * action = NULL)
|
||||
{
|
||||
Area * area = new Area(polygon, image, action, this);
|
||||
areas.push_back(area);
|
||||
connect(area, &Area::imageChanged, this, &ButtonsWidget::setBitmap);
|
||||
RadioKeyWidget * btn = new RadioKeyWidget(polygon, image, action, this);
|
||||
m_buttons.append(btn);
|
||||
connect(btn, &RadioKeyWidget::imageChanged, this, &ButtonsWidget::setBitmap);
|
||||
return btn;
|
||||
}
|
||||
|
||||
protected:
|
||||
@@ -113,16 +77,14 @@ class ButtonsWidget : public QWidget
|
||||
return;
|
||||
}
|
||||
|
||||
foreach(Area * area, areas) {
|
||||
if (!area->action)
|
||||
continue;
|
||||
if (area->contains(event->x(), event->y())) {
|
||||
area->action->trigger(press);
|
||||
foreach(RadioKeyWidget * key, m_buttons) {
|
||||
if (key->contains(event->pos())) {
|
||||
key->toggle(press);
|
||||
event->accept();
|
||||
return;
|
||||
}
|
||||
else if (area->action->isActive()) {
|
||||
area->action->trigger(false);
|
||||
else if (key->getValue()) {
|
||||
key->toggle(false);
|
||||
}
|
||||
}
|
||||
event->ignore();
|
||||
@@ -145,7 +107,7 @@ class ButtonsWidget : public QWidget
|
||||
style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
|
||||
}
|
||||
|
||||
QList<Area *> areas;
|
||||
QList<RadioKeyWidget *> m_buttons;
|
||||
QString defaultStyleSheet;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user