Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-23 00:05:13 +03:00
Code Activity

[Simulator] Cosmetics: rename SimulatorDialog -> SimulatorWidget.

Browse source
This commit is contained in:
Max Paperno 2017-02-08 00:35:43 -05:00
parent c4acbf6054
commit a60e080ce1
7 changed files with 65 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

6
companion/src/simulation/CMakeLists.txt
View file

@ -1,7 +1,6 @@
set(simulation_SRCS set(simulation_SRCS
debugoutput.cpp debugoutput.cpp
radiooutputswidget.cpp radiooutputswidget.cpp
simulatordialog.cpp
simulateduiwidget.cpp simulateduiwidget.cpp
simulateduiwidget9X.cpp simulateduiwidget9X.cpp
simulateduiwidgetX7.cpp simulateduiwidgetX7.cpp
@ -11,6 +10,7 @@ set(simulation_SRCS
simulatorinterface.cpp simulatorinterface.cpp
simulatormainwindow.cpp simulatormainwindow.cpp
simulatorstartupdialog.cpp simulatorstartupdialog.cpp
simulatorwidget.cpp
telemetrysimu.cpp telemetrysimu.cpp
trainersimu.cpp trainersimu.cpp
widgets/radiowidget.cpp widgets/radiowidget.cpp
@ -20,7 +20,6 @@ set(simulation_SRCS
set(simulation_UIS set(simulation_UIS
debugoutput.ui debugoutput.ui
radiooutputswidget.ui radiooutputswidget.ui
simulatordialog.ui
simulateduiwidget9X.ui simulateduiwidget9X.ui
simulateduiwidgetX7.ui simulateduiwidgetX7.ui
simulateduiwidgetX9.ui simulateduiwidgetX9.ui
@ -28,6 +27,7 @@ set(simulation_UIS
simulateduiwidgetX12.ui simulateduiwidgetX12.ui
simulatormainwindow.ui simulatormainwindow.ui
simulatorstartupdialog.ui simulatorstartupdialog.ui
simulatorwidget.ui
telemetrysimu.ui telemetrysimu.ui
trainersimu.ui trainersimu.ui
) )
@ -38,9 +38,9 @@ set(simulation_HDRS
radiouiaction.h radiouiaction.h
simulateduiwidget.h simulateduiwidget.h
# simulator.h # simulator.h
simulatordialog.h
simulatormainwindow.h simulatormainwindow.h
simulatorstartupdialog.h simulatorstartupdialog.h
simulatorwidget.h
telemetrysimu.h telemetrysimu.h
trainersimu.h trainersimu.h
widgets/buttonswidget.h widgets/buttonswidget.h

3
companion/src/simulation/simulateduiwidget.h
View file

@ -21,8 +21,9 @@
#ifndef SIMULATEDUIWIDGET_H #ifndef SIMULATEDUIWIDGET_H
#define SIMULATEDUIWIDGET_H #define SIMULATEDUIWIDGET_H
#include "boards.h"
#include "constants.h" #include "constants.h"
#include "simulatordialog.h" #include "simulator.h"
#include <QWidget> #include <QWidget>
#include <QMouseEvent> #include <QMouseEvent>

12
companion/src/simulation/simulatormainwindow.cpp
View file

@ -24,7 +24,7 @@
#include "appdata.h" #include "appdata.h"
#include "debugoutput.h" #include "debugoutput.h"
#include "radiooutputswidget.h" #include "radiooutputswidget.h"
#include "simulatordialog.h" #include "simulatorwidget.h"
#include "simulatorinterface.h" #include "simulatorinterface.h"
#include "telemetrysimu.h" #include "telemetrysimu.h"
#include "trainersimu.h" #include "trainersimu.h"
@ -63,7 +63,7 @@ SimulatorMainWindow::SimulatorMainWindow(QWidget *parent, SimulatorInterface * s
setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea); setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
m_simulatorWidget = new SimulatorDialog(this, m_simulator, flags); m_simulatorWidget = new SimulatorWidget(this, m_simulator, flags);
setWindowTitle(m_simulatorWidget->windowTitle()); setWindowTitle(m_simulatorWidget->windowTitle());
toggleRadioDocked(true); toggleRadioDocked(true);
@ -116,9 +116,9 @@ SimulatorMainWindow::SimulatorMainWindow(QWidget *parent, SimulatorInterface * s
connect(ui->actionFixedRadioHeight, &QAction::toggled, this, &SimulatorMainWindow::showRadioFixedHeight); connect(ui->actionFixedRadioHeight, &QAction::toggled, this, &SimulatorMainWindow::showRadioFixedHeight);
connect(ui->actionDockRadio, &QAction::toggled, this, &SimulatorMainWindow::showRadioDocked); connect(ui->actionDockRadio, &QAction::toggled, this, &SimulatorMainWindow::showRadioDocked);
if (m_simulatorWidget) { if (m_simulatorWidget) {
connect(ui->actionScreenshot, &QAction::triggered, m_simulatorWidget, &SimulatorDialog::captureScreenshot); connect(ui->actionScreenshot, &QAction::triggered, m_simulatorWidget, &SimulatorWidget::captureScreenshot);
connect(ui->actionReloadRadioData, &QAction::triggered, m_simulatorWidget, &SimulatorDialog::restart); connect(ui->actionReloadRadioData, &QAction::triggered, m_simulatorWidget, &SimulatorWidget::restart);
connect(m_simulatorWidget, &SimulatorDialog::windowTitleChanged, this, &SimulatorMainWindow::setWindowTitle); connect(m_simulatorWidget, &SimulatorWidget::windowTitleChanged, this, &SimulatorMainWindow::setWindowTitle);
} }
if (m_outputsWidget) if (m_outputsWidget)
connect(ui->actionReloadRadioData, &QAction::triggered, m_outputsWidget, &RadioOutputsWidget::restart); connect(ui->actionReloadRadioData, &QAction::triggered, m_outputsWidget, &RadioOutputsWidget::restart);
@ -411,7 +411,7 @@ void SimulatorMainWindow::toggleRadioDocked(bool dock)
m_simulatorDockWidget->move(newPos); m_simulatorDockWidget->move(newPos);
} }
connect(m_simulatorWidget, &SimulatorDialog::windowTitleChanged, m_simulatorDockWidget, &QDockWidget::setWindowTitle); connect(m_simulatorWidget, &SimulatorWidget::windowTitleChanged, m_simulatorDockWidget, &QDockWidget::setWindowTitle);
connect(m_simulatorDockWidget, &QDockWidget::topLevelChanged, [this](bool top) { connect(m_simulatorDockWidget, &QDockWidget::topLevelChanged, [this](bool top) {
showRadioDocked(!top); showRadioDocked(!top);
}); });

4
companion/src/simulation/simulatormainwindow.h
View file

@ -30,7 +30,7 @@
class DebugOutput; class DebugOutput;
class RadioData; class RadioData;
class RadioOutputsWidget; class RadioOutputsWidget;
class SimulatorDialog; class SimulatorWidget;
class SimulatorInterface; class SimulatorInterface;
class TrainerSimulator; class TrainerSimulator;
class TelemetrySimulator; class TelemetrySimulator;
@ -84,7 +84,7 @@ class SimulatorMainWindow : public QMainWindow
SimulatorInterface * m_simulator; SimulatorInterface * m_simulator;
Ui::SimulatorMainWindow * ui; Ui::SimulatorMainWindow * ui;
SimulatorDialog * m_simulatorWidget; SimulatorWidget * m_simulatorWidget;
DebugOutput * m_consoleWidget; DebugOutput * m_consoleWidget;
RadioOutputsWidget * m_outputsWidget; RadioOutputsWidget * m_outputsWidget;

84
companion/src/simulation/simulatordialog.cpp → companion/src/simulation/simulatorwidget.cpp
View file

@ -18,8 +18,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include "simulatordialog.h" #include "simulatorwidget.h"
#include "ui_simulatordialog.h" #include "ui_simulatorwidget.h"
#include "appdata.h" #include "appdata.h"
#include "radiofaderwidget.h" #include "radiofaderwidget.h"
@ -40,9 +40,9 @@
#include <QFile> #include <QFile>
#include <iostream> #include <iostream>
SimulatorDialog::SimulatorDialog(QWidget * parent, SimulatorInterface *simulator, quint8 flags): SimulatorWidget::SimulatorWidget(QWidget * parent, SimulatorInterface *simulator, quint8 flags):
QWidget(parent), QWidget(parent),
ui(new Ui::SimulatorDialog), ui(new Ui::SimulatorWidget),
simulator(simulator), simulator(simulator),
firmware(getCurrentFirmware()), firmware(getCurrentFirmware()),
radioSettings(GeneralSettings()), radioSettings(GeneralSettings()),
@ -103,7 +103,7 @@ SimulatorDialog::SimulatorDialog(QWidget * parent, SimulatorInterface *simulator
radioUiWidget->setFocusPolicy(Qt::WheelFocus); radioUiWidget->setFocusPolicy(Qt::WheelFocus);
radioUiWidget->setFocus(); radioUiWidget->setFocus();
connect(radioUiWidget, &SimulatedUIWidget::customStyleRequest, this, &SimulatorDialog::setUiAreaStyle); connect(radioUiWidget, &SimulatedUIWidget::customStyleRequest, this, &SimulatorWidget::setUiAreaStyle);
vJoyLeft = new VirtualJoystickWidget(this, 'L'); vJoyLeft = new VirtualJoystickWidget(this, 'L');
ui->leftStickLayout->addWidget(vJoyLeft); ui->leftStickLayout->addWidget(vJoyLeft);
@ -120,7 +120,7 @@ SimulatorDialog::SimulatorDialog(QWidget * parent, SimulatorInterface *simulator
connect(vJoyRight, SIGNAL(trimSliderMoved(int,int)), this, SLOT(onTrimSliderMoved(int,int))); connect(vJoyRight, SIGNAL(trimSliderMoved(int,int)), this, SLOT(onTrimSliderMoved(int,int)));
} }
SimulatorDialog::~SimulatorDialog() SimulatorWidget::~SimulatorWidget()
{ {
shutdown(); shutdown();
@ -148,17 +148,17 @@ SimulatorDialog::~SimulatorDialog()
* Public slots/setters * Public slots/setters
*/ */
void SimulatorDialog::setSdPath(const QString & sdPath) void SimulatorWidget::setSdPath(const QString & sdPath)
{ {
setPaths(sdPath, radioDataPath); setPaths(sdPath, radioDataPath);
} }
void SimulatorDialog::setDataPath(const QString & dataPath) void SimulatorWidget::setDataPath(const QString & dataPath)
{ {
setPaths(sdCardPath, dataPath); setPaths(sdCardPath, dataPath);
} }
void SimulatorDialog::setPaths(const QString & sdPath, const QString & dataPath) void SimulatorWidget::setPaths(const QString & sdPath, const QString & dataPath)
{ {
sdCardPath = sdPath; sdCardPath = sdPath;
radioDataPath = dataPath; radioDataPath = dataPath;
@ -166,7 +166,7 @@ void SimulatorDialog::setPaths(const QString & sdPath, const QString & dataPath)
simulator->setSdPath(sdPath, dataPath); simulator->setSdPath(sdPath, dataPath);
} }
void SimulatorDialog::setRadioSettings(const GeneralSettings settings) void SimulatorWidget::setRadioSettings(const GeneralSettings settings)
{ {
radioSettings = settings; radioSettings = settings;
} }
@ -181,7 +181,7 @@ void SimulatorDialog::setRadioSettings(const GeneralSettings settings)
* with the same data when start() is called. * with the same data when start() is called.
* If you already have a valid RadioData structure, call setRadioData() instead. * If you already have a valid RadioData structure, call setRadioData() instead.
*/ */
bool SimulatorDialog::setStartupData(const QByteArray & dataSource, bool fromFile) bool SimulatorWidget::setStartupData(const QByteArray & dataSource, bool fromFile)
{ {
RadioData simuData; RadioData simuData;
quint16 ret = 1; quint16 ret = 1;
@ -246,7 +246,7 @@ bool SimulatorDialog::setStartupData(const QByteArray & dataSource, bool fromFil
return true; return true;
} }
bool SimulatorDialog::setRadioData(RadioData * radioData) bool SimulatorWidget::setRadioData(RadioData * radioData)
{ {
bool ret = true; bool ret = true;
@ -273,7 +273,7 @@ bool SimulatorDialog::setRadioData(RadioData * radioData)
return ret; return ret;
} }
bool SimulatorDialog::setOptions(SimulatorOptions & options, bool withSave) bool SimulatorWidget::setOptions(SimulatorOptions & options, bool withSave)
{ {
bool ret = false; bool ret = false;
@ -301,7 +301,7 @@ bool SimulatorDialog::setOptions(SimulatorOptions & options, bool withSave)
return ret; return ret;
} }
bool SimulatorDialog::saveRadioData(RadioData * radioData, const QString & path, QString * error) bool SimulatorWidget::saveRadioData(RadioData * radioData, const QString & path, QString * error)
{ {
QString dir = path; QString dir = path;
if (dir.isEmpty()) if (dir.isEmpty())
@ -318,7 +318,7 @@ bool SimulatorDialog::saveRadioData(RadioData * radioData, const QString & path,
return false; return false;
} }
bool SimulatorDialog::useTempDataPath(bool deleteOnClose) bool SimulatorWidget::useTempDataPath(bool deleteOnClose)
{ {
if (deleteTempRadioData) if (deleteTempRadioData)
deleteTempData(); deleteTempData();
@ -338,7 +338,7 @@ bool SimulatorDialog::useTempDataPath(bool deleteOnClose)
} }
// This will save radio data from temporary folder structure back into an .otx file, eg. for Horus. // This will save radio data from temporary folder structure back into an .otx file, eg. for Horus.
bool SimulatorDialog::saveTempData() bool SimulatorWidget::saveTempData()
{ {
bool ret = false; bool ret = false;
QString error; QString error;
@ -390,7 +390,7 @@ bool SimulatorDialog::saveTempData()
return ret; return ret;
} }
void SimulatorDialog::deleteTempData() void SimulatorWidget::deleteTempData()
{ {
if (!radioDataPath.isEmpty()) { if (!radioDataPath.isEmpty()) {
QDir tpath(radioDataPath); QDir tpath(radioDataPath);
@ -400,7 +400,7 @@ void SimulatorDialog::deleteTempData()
} }
} }
void SimulatorDialog::saveState() void SimulatorWidget::saveState()
{ {
SimulatorOptions opts = g.profile[radioProfileId].simulatorOptions(); SimulatorOptions opts = g.profile[radioProfileId].simulatorOptions();
//opts.windowGeometry = saveGeometry(); //opts.windowGeometry = saveGeometry();
@ -408,12 +408,12 @@ void SimulatorDialog::saveState()
g.profile[radioProfileId].simulatorOptions(opts); g.profile[radioProfileId].simulatorOptions(opts);
} }
void SimulatorDialog::setUiAreaStyle(const QString & style) void SimulatorWidget::setUiAreaStyle(const QString & style)
{ {
setStyleSheet(style); setStyleSheet(style);
} }
void SimulatorDialog::captureScreenshot(bool) void SimulatorWidget::captureScreenshot(bool)
{ {
if (radioUiWidget) if (radioUiWidget)
radioUiWidget->captureScreenshot(); radioUiWidget->captureScreenshot();
@ -423,7 +423,7 @@ void SimulatorDialog::captureScreenshot(bool)
* Startup * Startup
*/ */
void SimulatorDialog::start() void SimulatorWidget::start()
{ {
setupRadioWidgets(); setupRadioWidgets();
setupJoysticks(); setupJoysticks();
@ -441,7 +441,7 @@ void SimulatorDialog::start()
setupTimer(); setupTimer();
} }
void SimulatorDialog::stop() void SimulatorWidget::stop()
{ {
timer->stop(); timer->stop();
simulator->stop(); simulator->stop();
@ -451,7 +451,7 @@ void SimulatorDialog::stop()
} }
} }
void SimulatorDialog::restart() void SimulatorWidget::restart()
{ {
stop(); stop();
saveState(); saveState();
@ -459,7 +459,7 @@ void SimulatorDialog::restart()
start(); start();
} }
void SimulatorDialog::shutdown() void SimulatorWidget::shutdown()
{ {
stop(); stop();
saveState(); saveState();
@ -473,14 +473,14 @@ void SimulatorDialog::shutdown()
* Setup * Setup
*/ */
void SimulatorDialog::setRadioProfileId(int value) void SimulatorWidget::setRadioProfileId(int value)
{ {
radioProfileId = value; radioProfileId = value;
if (simulator) if (simulator)
simulator->setVolumeGain(g.profile[radioProfileId].volumeGain()); simulator->setVolumeGain(g.profile[radioProfileId].volumeGain());
} }
void SimulatorDialog::setupRadioWidgets() void SimulatorWidget::setupRadioWidgets()
{ {
int i, midpos, aIdx; int i, midpos, aIdx;
QString wname; QString wname;
@ -572,7 +572,7 @@ void SimulatorDialog::setupRadioWidgets()
} }
} }
void SimulatorDialog::setupJoysticks() void SimulatorWidget::setupJoysticks()
{ {
#ifdef JOYSTICKS #ifdef JOYSTICKS
static bool joysticksEnabled = false; static bool joysticksEnabled = false;
@ -627,7 +627,7 @@ void SimulatorDialog::setupJoysticks()
#endif #endif
} }
void SimulatorDialog::setupTimer() void SimulatorWidget::setupTimer()
{ {
if (timer) { if (timer) {
timer->stop(); timer->stop();
@ -643,7 +643,7 @@ void SimulatorDialog::setupTimer()
timer->start(10); timer->start(10);
} }
void SimulatorDialog::restoreRadioWidgetsState() void SimulatorWidget::restoreRadioWidgetsState()
{ {
RadioWidget::RadioWidgetState state; RadioWidget::RadioWidgetState state;
QMap<int, QByteArray> switchesMap; QMap<int, QByteArray> switchesMap;
@ -680,7 +680,7 @@ void SimulatorDialog::restoreRadioWidgetsState()
} }
} }
QList<QByteArray> SimulatorDialog::saveRadioWidgetsState() QList<QByteArray> SimulatorWidget::saveRadioWidgetsState()
{ {
QList<QByteArray> states; QList<QByteArray> states;
@ -698,7 +698,7 @@ QList<QByteArray> SimulatorDialog::saveRadioWidgetsState()
*/ */
// Read various values from firmware simulator and populate values in this UI // Read various values from firmware simulator and populate values in this UI
void SimulatorDialog::setValues() void SimulatorWidget::setValues()
{ {
int currentPhase = simulator->getPhase(); int currentPhase = simulator->getPhase();
@ -713,7 +713,7 @@ void SimulatorDialog::setValues()
} }
// "get" values from this UI and send them to the firmware simulator. // "get" values from this UI and send them to the firmware simulator.
void SimulatorDialog::getValues() void SimulatorWidget::getValues()
{ {
static const int numTrims = firmware->getCapability(NumTrimSwitches); static const int numTrims = firmware->getCapability(NumTrimSwitches);
int i; int i;
@ -747,7 +747,7 @@ void SimulatorDialog::getValues()
} }
// Read stick trim values from firmware simulator and set joystick widgets as needed. // Read stick trim values from firmware simulator and set joystick widgets as needed.
void SimulatorDialog::setTrims() void SimulatorWidget::setTrims()
{ {
typedef VirtualJoystickWidget VJW; typedef VirtualJoystickWidget VJW;
static Trims lastTrims; static Trims lastTrims;
@ -792,25 +792,25 @@ void SimulatorDialog::setTrims()
//{ //{
//} //}
void SimulatorDialog::mousePressEvent(QMouseEvent *event) void SimulatorWidget::mousePressEvent(QMouseEvent *event)
{ {
if (radioUiWidget) if (radioUiWidget)
radioUiWidget->mousePressEvent(event); radioUiWidget->mousePressEvent(event);
} }
void SimulatorDialog::mouseReleaseEvent(QMouseEvent *event) void SimulatorWidget::mouseReleaseEvent(QMouseEvent *event)
{ {
if (radioUiWidget) if (radioUiWidget)
radioUiWidget->mouseReleaseEvent(event); radioUiWidget->mouseReleaseEvent(event);
} }
void SimulatorDialog::wheelEvent(QWheelEvent *event) void SimulatorWidget::wheelEvent(QWheelEvent *event)
{ {
if (radioUiWidget) if (radioUiWidget)
radioUiWidget->wheelEvent(event); radioUiWidget->wheelEvent(event);
} }
void SimulatorDialog::onTimerEvent() void SimulatorWidget::onTimerEvent()
{ {
static unsigned int lcd_counter = 0; static unsigned int lcd_counter = 0;
@ -829,22 +829,22 @@ void SimulatorDialog::onTimerEvent()
} }
} }
void SimulatorDialog::onTrimPressed(int which) void SimulatorWidget::onTrimPressed(int which)
{ {
trimPressed = which; trimPressed = which;
} }
void SimulatorDialog::onTrimReleased() void SimulatorWidget::onTrimReleased()
{ {
trimPressed = TRIM_NONE; trimPressed = TRIM_NONE;
} }
void SimulatorDialog::onTrimSliderMoved(int which, int value) void SimulatorWidget::onTrimSliderMoved(int which, int value)
{ {
simulator->setTrim(which, value); simulator->setTrim(which, value);
} }
void SimulatorDialog::centerSticks() void SimulatorWidget::centerSticks()
{ {
if (vJoyLeft) if (vJoyLeft)
vJoyLeft->centerStick(); vJoyLeft->centerStick();
@ -853,7 +853,7 @@ void SimulatorDialog::centerSticks()
vJoyRight->centerStick(); vJoyRight->centerStick();
} }
void SimulatorDialog::onjoystickAxisValueChanged(int axis, int value) void SimulatorWidget::onjoystickAxisValueChanged(int axis, int value)
{ {
#ifdef JOYSTICKS #ifdef JOYSTICKS
int stick; int stick;

16
companion/src/simulation/simulatordialog.h → companion/src/simulation/simulatorwidget.h
View file

@ -18,8 +18,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#ifndef _SIMULATORDIALOG_H_ #ifndef _SIMULATORWIDGET_H_
#define _SIMULATORDIALOG_H_ #define _SIMULATORWIDGET_H_
#include "constants.h" #include "constants.h"
#include "helpers.h" #include "helpers.h"
@ -52,18 +52,18 @@ class QLabel;
class QFrame; class QFrame;
namespace Ui { namespace Ui {
class SimulatorDialog; class SimulatorWidget;
} }
using namespace Simulator; using namespace Simulator;
class SimulatorDialog : public QWidget class SimulatorWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit SimulatorDialog(QWidget * parent, SimulatorInterface *simulator, quint8 flags=0); explicit SimulatorWidget(QWidget * parent, SimulatorInterface *simulator, quint8 flags=0);
virtual ~SimulatorDialog(); virtual ~SimulatorWidget();
void setSdPath(const QString & sdPath); void setSdPath(const QString & sdPath);
void setDataPath(const QString & dataPath); void setDataPath(const QString & dataPath);
@ -103,7 +103,7 @@ class SimulatorDialog : public QWidget
void setTrims(); void setTrims();
Ui::SimulatorDialog * ui; Ui::SimulatorWidget * ui;
SimulatorInterface * simulator; SimulatorInterface * simulator;
Firmware * firmware; Firmware * firmware;
GeneralSettings radioSettings; GeneralSettings radioSettings;
@ -156,4 +156,4 @@ class SimulatorDialog : public QWidget
}; };
#endif // _SIMULATORDIALOG_H_ #endif // _SIMULATORWIDGET_H_

4
companion/src/simulation/simulatordialog.ui → companion/src/simulation/simulatorwidget.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>SimulatorDialog</class> <class>SimulatorWidget</class>
<widget class="QWidget" name="SimulatorDialog"> <widget class="QWidget" name="SimulatorWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>