Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -19,14 +19,12 @@ namespace EffectShowClient
|
||||
{
|
||||
//=============================================================================
|
||||
HandlerVehicle::HandlerVehicle(MainHandler *mainHandler,
|
||||
QObject *parent)
|
||||
|
||||
: QObject(parent)
|
||||
QObject *parent) : QObject(parent)
|
||||
, m_mainHandler(mainHandler)
|
||||
, m_volleyTimer(new QTimer(this))
|
||||
, m_remainingTimer(new QTimer(this))
|
||||
{
|
||||
DEBUG_LOG() << "HandlerVehicle ctor";
|
||||
, m_remainingTimer(new QTimer(this)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
|
||||
DEBUG_LOG(m_logger) << "HandlerVehicle ctor";
|
||||
m_volleyTimer->setSingleShot(true);
|
||||
m_remainingTimer->setInterval(1000);
|
||||
m_statusExplosionFiring.remainingTime_s = -1;
|
||||
@@ -41,7 +39,7 @@ HandlerVehicle::~HandlerVehicle()
|
||||
//=============================================================================
|
||||
bool HandlerVehicle::init()
|
||||
{
|
||||
DEBUG_LOG() << "HandlerVehicle::init()";
|
||||
DEBUG_LOG(m_logger) << "HandlerVehicle::init()";
|
||||
connect(m_mainHandler->handlerControlUnit().get(), &ControlUnitHandler::vehicleBattery, this, &HandlerVehicle::vehicleBattery);
|
||||
connect(m_mainHandler->handlerControlUnit().get(), &ControlUnitHandler::vehicleFinshedVolley, this, &HandlerVehicle::onVolleyFinished);
|
||||
//connect(m_mainHandler->handlerControlUnit().get(), &ControlUnitHandler::vehicleShutDown, this, &HandlerVehicle::vehicleShutDown);
|
||||
@@ -75,7 +73,7 @@ int HandlerVehicle::burningTimeSmokeCartridge_s() const
|
||||
//=============================================================================
|
||||
void HandlerVehicle::setExplosionParameter(int numberOfVolley, int numberOfShot, qint64 duration)
|
||||
{
|
||||
DEBUG_LOG() << "Duration: " << duration << " number of shots: " << numberOfShot << " number of volles" << numberOfVolley;
|
||||
DEBUG_LOG(m_logger) << "Duration: " << duration << " number of shots: " << numberOfShot << " number of volles" << numberOfVolley;
|
||||
m_statusExplosionFiring.remainingShots = numberOfShot;
|
||||
m_statusExplosionFiring.remainingTime_s = duration;
|
||||
m_statusExplosionFiring.remainingVolley = numberOfVolley;
|
||||
@@ -196,7 +194,7 @@ void HandlerVehicle::spreadShotsInVolleys(int shots, int volleys)
|
||||
|
||||
void HandlerVehicle::onVolleyStopped(int shots)
|
||||
{
|
||||
DEBUG_LOG() << "Volles Stopped after " << shots << " rounds";
|
||||
DEBUG_LOG(m_logger) << "Volles Stopped after " << shots << " rounds";
|
||||
//m_statusExplosionFiring.remainingTime_s = 0;
|
||||
//stopp timer and take current seconds
|
||||
m_remainingTimer->stop();
|
||||
@@ -220,7 +218,7 @@ void HandlerVehicle::onVolleyStopped(int shots)
|
||||
|
||||
void HandlerVehicle::onVolleyFinished(int shots)
|
||||
{
|
||||
DEBUG_LOG() << "Volley finished after shots: " << shots;
|
||||
DEBUG_LOG(m_logger) << "Volley finished after shots: " << shots;
|
||||
m_remainingTimer->stop();
|
||||
if (m_volleyTimer->isActive())
|
||||
m_volleyTimer->stop();
|
||||
@@ -234,7 +232,7 @@ void HandlerVehicle::onVolleyFinished(int shots)
|
||||
|
||||
//m_statusExplosionFiring.remainingTime_s = m_statusExplosionFiring.remainingTime_s - (m_timeBetweenShots * (shots - 1)) - pauseTime;
|
||||
m_statusExplosionFiring.remainingTime_s = m_oldTime - (m_timeBetweenShots * shots) - pauseTime;
|
||||
DEBUG_LOG() << "Remaining time: " << m_statusExplosionFiring.remainingTime_s;
|
||||
DEBUG_LOG(m_logger) << "Remaining time: " << m_statusExplosionFiring.remainingTime_s;
|
||||
m_oldTime = m_statusExplosionFiring.remainingTime_s;
|
||||
if (m_statusExplosionFiring.remainingTime_s < 0 || m_statusExplosionFiring.remainingShots == 0)
|
||||
m_statusExplosionFiring.remainingTime_s = 0;
|
||||
@@ -261,7 +259,7 @@ void HandlerVehicle::onVolleyFinished(int shots)
|
||||
|
||||
void HandlerVehicle::onStartVolley()
|
||||
{
|
||||
DEBUG_LOG() << "Send Start Volley";
|
||||
DEBUG_LOG(m_logger) << "Send Start Volley";
|
||||
if (!m_remainingTimer->isActive())
|
||||
m_remainingTimer->start();
|
||||
if (m_volleyTimer->isActive())
|
||||
|
||||
Reference in new issue
Block a user