Max PapernoandBertrand Songis
57dc0159d6
* [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.
144 lines
4.0 KiB
C++
144 lines
4.0 KiB
C++
/*
|
|
* Copyright (C) OpenTX
|
|
*
|
|
* Based on code named
|
|
* th9x - http://code.google.com/p/th9x
|
|
* er9x - http://code.google.com/p/er9x
|
|
* gruvin9x - http://code.google.com/p/gruvin9x
|
|
*
|
|
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#ifndef VIRTUALJOYSTICKWIDGET_H
|
|
#define VIRTUALJOYSTICKWIDGET_H
|
|
|
|
#include "radiowidget.h"
|
|
|
|
#include <QWidget>
|
|
#include <QResizeEvent>
|
|
#include <QBoxLayout>
|
|
#include <QGridLayout>
|
|
#include <QGraphicsView>
|
|
#include <QGraphicsScene>
|
|
#include <QToolButton>
|
|
#include <QTimer>
|
|
#include <QLabel>
|
|
|
|
class CustomGraphicsScene;
|
|
class Node;
|
|
class RadioTrimWidget;
|
|
|
|
class VirtualJoystickWidget : public QWidget
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
enum ConstraintTypes {
|
|
HOLD_X = 0x01,
|
|
HOLD_Y = 0x02,
|
|
FIX_X = 0x04,
|
|
FIX_Y = 0x08
|
|
};
|
|
|
|
explicit VirtualJoystickWidget(QWidget * parent = NULL, QChar side = 'L', bool showTrims = true, bool showBtns = true, bool showValues = true, QSize size = QSize(125, 125));
|
|
|
|
qreal getStickX();
|
|
qreal getStickY();
|
|
QPointF getStickPos();
|
|
int getTrimValue(int which);
|
|
virtual QSize sizeHint() const;
|
|
virtual void resizeEvent(QResizeEvent *event);
|
|
|
|
int getStickScale() const;
|
|
void setStickScale(int stickScale);
|
|
|
|
public slots:
|
|
void setStickX(qreal x);
|
|
void setStickY(qreal y);
|
|
void setStickPos(QPointF xy);
|
|
void setStickAxisValue(int index, int value);
|
|
void centerStick();
|
|
void setTrimsRange(int min, int max);
|
|
void setTrimsRange(int rng);
|
|
void setTrimRange(int index, int min, int max);
|
|
void setTrimValue(int index, int value);
|
|
void setWidgetValue(const RadioWidget::RadioWidgetType type, const int index, const int value);
|
|
|
|
void setStickIndices(int xIdx = -1, int yIdx = -1);
|
|
void setStickConstraint(quint8 index, bool active);
|
|
void setStickColor(const QColor & color);
|
|
void loadDefaultsForMode(const unsigned mode);
|
|
|
|
signals:
|
|
void valueChange(const RadioWidget::RadioWidgetType type, const int index, int value);
|
|
|
|
protected slots:
|
|
void onNodeXChanged();
|
|
void onNodeYChanged();
|
|
void onButtonChange(bool checked);
|
|
void updateNodeValueLabels();
|
|
void onGsMouseEvent(QGraphicsSceneMouseEvent * event);
|
|
|
|
protected:
|
|
void setSize(const QSize & size, const QSize &);
|
|
RadioTrimWidget * createTrimWidget(QChar type);
|
|
QToolButton * createButtonWidget(int type);
|
|
QLayout * createNodeValueLayout(QChar type, QLabel *& valLabel);
|
|
int getStickIndex(QChar type);
|
|
int getTrimSliderType(QChar type);
|
|
int getTrimButtonType(QChar type, int pos);
|
|
RadioTrimWidget * getTrimWidget(int which);
|
|
|
|
QChar stickSide;
|
|
QSize prefSize;
|
|
QGridLayout * layout;
|
|
QGraphicsView * gv;
|
|
CustomGraphicsScene * scene;
|
|
Node * node;
|
|
RadioTrimWidget * hTrimWidget;
|
|
RadioTrimWidget * vTrimWidget;
|
|
QToolButton * btnHoldX, * btnHoldY;
|
|
QToolButton * btnFixX, * btnFixY;
|
|
QLabel * nodeLabelX, * nodeLabelY;
|
|
QSize extraSize;
|
|
QTimer centerStickTimer;
|
|
float ar; // aspect ratio
|
|
int m_xIndex;
|
|
int m_yIndex;
|
|
int m_stickScale;
|
|
bool m_stickPressed;
|
|
};
|
|
|
|
|
|
/*
|
|
* Custom GraphicsScene for mouse handling
|
|
*/
|
|
class CustomGraphicsScene : public QGraphicsScene
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
CustomGraphicsScene(QObject *parent = Q_NULLPTR) :
|
|
QGraphicsScene(parent)
|
|
{}
|
|
|
|
signals:
|
|
void mouseEvent(QGraphicsSceneMouseEvent * event);
|
|
|
|
protected:
|
|
virtual void mousePressEvent(QGraphicsSceneMouseEvent * event);
|
|
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent * event);
|
|
virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event);
|
|
};
|
|
|
|
#endif // VIRTUALJOYSTICKWIDGET_H
|