[Simulator] Dyanamic Simulator virtual hardware generation and many other improvements (#4260)
* Move simulator widgets to subfolder (no code changes).
* [Simulator] Major Simulator re-structuring to reduce code redundancies and allow for fully dynamic simulated hardware setup:
SimulatorDialog is no longer sub-classed by individual radio UIs, instead a new class is added which handles just the "skin," LCD, and navigation controls (also makes setting up new models much quicker);
All radio switches/knobs/sliders are populated dynamically based on loaded hardware configuration data (eeprom/bin), including control types and names (in case of no hardware config data, reasonable "factory defaults" are loaded);
Starting Horus sim with alternate path for RADIO and MODEL data folders is now supported (.otx file is WIP);
6-way switch now works properly and various other inconsistencies addressed (eg. some Horus analogs were backwards).
* Add missing OpenTX headers to new files.
* [Simulator] Fix loading of Horus hardware settings from Companion simulation.
* Update Travis CI build environment to Qt 5.7.
* [Simulator] Fix 9X missing colored side LCD images, an #include fix, and some cleanup.
* [TravisCI] Set up for parallel Travis builds and use Qt5.7 (#4263)
* Fix starting Simulator with non-existing file/folder structure (now properly creates new ones as needed, including Horus directories with default radio/model); Temporarily remove option for using .otx file with Horus (until that feature is added).
* Load correct simulator skin for X7 when launching from Companion.
* X7 hardware defaults changed to match production hardware
* Fix minor compiler warning in mdichild.cpp, and some cleanup in eeprominterface.cpp.
* [Simulator] Centralize radio UI flavor determination.
* [Simulator] Updates:
Add X7 UI flavor;
Centralize LCD settings;
Simplify drawing curved UI widgets;
LCD color can be changed for any 1/4-bit display radio;
Slight change on default LCD "off" color;
Refactor LcdWidget to not use globals.
* [Companion] X7 EEPROM import fix
+ cosmetics
+ compilation error fixed on Manjaro
* [Companion] 9XR-PRO EEPROM import fix
+ cosmetics
+ compilation error fixed on Manjaro
* Navigation fix
French translations
* [X7] Main view cosmetics
* Fix switch/ana custom name import
* [Simulator] Add white border above/below X7 bezel, and use white-colored padding on sides; Adjust X7 default LCD color.
* Does this work? (#4269)
Read an Horus SD card produces a temporary .otx file now
* Bsongis/companion warning before automatic conversions (#4271)
* Does this work?
* Warning before automatic conversions
* Force different file name after conversion (#4272)
* Force different file name after conversion
* More detailed instructions
* [Companion] Files automatically named during XXX => Horus conversions
This commit is contained in:
committed by
Bertrand Songis
parent
b3f4870da7
commit
17a03e6c18
@@ -0,0 +1,164 @@
|
||||
/*
|
||||
* 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 SIMULATEDUIWIDGET_H
|
||||
#define SIMULATEDUIWIDGET_H
|
||||
|
||||
#include "constants.h"
|
||||
#include "simulatordialog.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include <QMouseEvent>
|
||||
|
||||
class SimulatorInterface;
|
||||
class LcdWidget;
|
||||
class RadioUiAction;
|
||||
|
||||
/*
|
||||
* This is a base class for the main hardware-specific radio user interface, including LCD screen and navigation buttons/widgets.
|
||||
* It is responsible for hanlding all interactions with this part of the simulation (vs. common radio widgets like sticks/switches/knobs).
|
||||
* Sub-classes are responsible for building the actual UI form they need for presentation.
|
||||
* This base class should not be instantiated directly.
|
||||
*/
|
||||
class SimulatedUIWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
protected:
|
||||
|
||||
explicit SimulatedUIWidget(SimulatorInterface * simulator, SimulatorDialog * simuDialog = NULL, QWidget * parent = NULL);
|
||||
~SimulatedUIWidget();
|
||||
|
||||
public:
|
||||
|
||||
RadioUiAction * addRadioUiAction(RadioUiAction * act);
|
||||
RadioUiAction * addRadioUiAction(int index = -1, int key = 0, const QString &text = "", const QString &descript = "");
|
||||
RadioUiAction * addRadioUiAction(int index, QList<int> keys, const QString &text = "", const QString &descript = "");
|
||||
|
||||
QVector<keymapHelp_t> * getKeymapHelp() { return &m_keymapHelp; }
|
||||
QList<RadioUiAction *> getActions() const { return m_actions; }
|
||||
RadioUiAction * getRotEncAction() const { return m_rotEncClickAction; }
|
||||
|
||||
QPolygon polyArc(int ctrX, int ctrY, int radius, int startAngle = 0, int endAngle = 360, int step = 10);
|
||||
|
||||
public slots:
|
||||
|
||||
void timedUpdate(unsigned loop);
|
||||
void saveScreenshot(int idx = -1);
|
||||
void captureScreenshot() { saveScreenshot(); }
|
||||
void simulatorWheelEvent(qint8 steps);
|
||||
|
||||
void wheelEvent(QWheelEvent *event);
|
||||
void mousePressEvent(QMouseEvent *event);
|
||||
void mouseReleaseEvent(QMouseEvent *event);
|
||||
|
||||
protected:
|
||||
void setLcd(LcdWidget * lcd);
|
||||
void connectScrollActions();
|
||||
virtual void setLightOn(bool enable) { }
|
||||
|
||||
SimulatorInterface * m_simulator;
|
||||
SimulatorDialog * m_simuDialog;
|
||||
LcdWidget * m_lcd;
|
||||
QVector<QColor> m_backlightColors;
|
||||
QVector<keymapHelp_t> m_keymapHelp;
|
||||
QList<RadioUiAction *> m_actions;
|
||||
RadioUiAction * m_scrollUpAction;
|
||||
RadioUiAction * m_scrollDnAction;
|
||||
RadioUiAction * m_rotEncClickAction;
|
||||
RadioUiAction * m_screenshotAction;
|
||||
BoardEnum m_board;
|
||||
unsigned int m_backLight;
|
||||
bool m_lightOn;
|
||||
int m_beepShow;
|
||||
int m_beepVal;
|
||||
|
||||
};
|
||||
|
||||
|
||||
// Each subclass is responsible for its own Ui
|
||||
namespace Ui {
|
||||
class SimulatedUIWidget9X;
|
||||
class SimulatedUIWidgetX7;
|
||||
class SimulatedUIWidgetX9;
|
||||
class SimulatedUIWidgetX12;
|
||||
}
|
||||
|
||||
class SimulatedUIWidget9X: public SimulatedUIWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit SimulatedUIWidget9X(SimulatorInterface * simulator, SimulatorDialog * simuDialog = NULL, QWidget * parent = NULL);
|
||||
virtual ~SimulatedUIWidget9X();
|
||||
|
||||
protected:
|
||||
void setLightOn(bool enable);
|
||||
|
||||
protected slots:
|
||||
|
||||
private:
|
||||
Ui::SimulatedUIWidget9X * ui;
|
||||
|
||||
};
|
||||
|
||||
class SimulatedUIWidgetX7: public SimulatedUIWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit SimulatedUIWidgetX7(SimulatorInterface * simulator, SimulatorDialog * simuDialog = NULL, QWidget * parent = NULL);
|
||||
virtual ~SimulatedUIWidgetX7();
|
||||
|
||||
protected:
|
||||
|
||||
private:
|
||||
Ui::SimulatedUIWidgetX7 * ui;
|
||||
};
|
||||
|
||||
class SimulatedUIWidgetX9: public SimulatedUIWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit SimulatedUIWidgetX9(SimulatorInterface * simulator, SimulatorDialog * simuDialog = NULL, QWidget * parent = NULL);
|
||||
virtual ~SimulatedUIWidgetX9();
|
||||
|
||||
protected:
|
||||
|
||||
private:
|
||||
Ui::SimulatedUIWidgetX9 * ui;
|
||||
};
|
||||
|
||||
class SimulatedUIWidgetX12: public SimulatedUIWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit SimulatedUIWidgetX12(SimulatorInterface * simulator, SimulatorDialog * simuDialog = NULL, QWidget * parent = NULL);
|
||||
virtual ~SimulatedUIWidgetX12();
|
||||
|
||||
protected:
|
||||
|
||||
private:
|
||||
Ui::SimulatedUIWidgetX12 * ui;
|
||||
};
|
||||
|
||||
#endif // SIMULATEDUIWIDGET_H
|
||||
Reference in New Issue
Block a user