piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Re #2260: class Profile dependency removed from simulatorinterface

Browse Source
This commit is contained in:
Damjan Adamic
2015-06-01 21:37:25 +02:00
parent 61c7abf214
commit 67cd321400
9 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/simulation/simulatordialog.cpp
+4 -2
View File
@@ -447,6 +447,8 @@ void SimulatorDialog::initUi(T * ui)
windowName = tr("Simulating Radio (%1)").arg(GetCurrentFirmware()->getName());
setWindowTitle(windowName);
simulator->setSdPath(g.profile[g.id()].sdPath());
simulator->setVolumeGain(g.profile[g.id()].volumeGain());
lcd->setData(simulator->getLcd(), lcdWidth, 64, lcdDepth);
if (flags & SIMULATOR_FLAGS_STICK_MODE_LEFT) {
@@ -694,7 +696,7 @@ void SimulatorDialog::start(QByteArray & eeprom)
lastPhase = -1;
numGvars = GetCurrentFirmware()->getCapability(Gvars);
numFlightModes = GetCurrentFirmware()->getCapability(FlightModes);
simulator->start(eeprom, g.profile[g.id()], (flags & SIMULATOR_FLAGS_NOTX) ? false : true);
simulator->start(eeprom, (flags & SIMULATOR_FLAGS_NOTX) ? false : true);
getValues();
setupTimer();
}
@@ -704,7 +706,7 @@ void SimulatorDialog::start(const char * filename)
lastPhase = -1;
numGvars = GetCurrentFirmware()->getCapability(Gvars);
numFlightModes = GetCurrentFirmware()->getCapability(FlightModes);
simulator->start(filename, g.profile[g.id()]);
simulator->start(filename);
getValues();
setupTimer();
}
companion/src/simulation/simulatorinterface.h
+6 -3
View File
@@ -23,7 +23,6 @@
#include <QByteArray>
#include <QMap>
#include <algorithm>
#include "appdata.h"
#if __GNUC__
#define PACK( __Declaration__ ) __Declaration__ __attribute__((__packed__))
@@ -66,9 +65,13 @@ class SimulatorInterface
virtual ~SimulatorInterface() {};
virtual void start(QByteArray &eeprom, const Profile & profile, bool tests=true) = 0;
virtual void setSdPath(const QString &sdPath) { };
virtual void start(const char *filename, const Profile & profile, bool tests=true) = 0;
virtual void setVolumeGain(int value) { };
virtual void start(QByteArray &eeprom, bool tests=true) = 0;
virtual void start(const char *filename, bool tests=true) = 0;
virtual void stop() = 0;