Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+7
-7
@@ -79,12 +79,12 @@ ExerciseStateMachine::ExerciseStateMachine(ObjectExercise* objExe, QObject *pare
|
||||
//States zur StateMachine hinzufügen
|
||||
for (ExerciseStateBase *state : std::as_const(m_exerciseStates))
|
||||
{
|
||||
DEBUG_LOG() << "Ex " << exerciseId() << ": state: " << state->exerciseState();
|
||||
DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": state: " << state->exerciseState();
|
||||
m_stateMachine->addState(state);
|
||||
connect(state, &ExerciseStateBase::entered, this, &ExerciseStateMachine::onEnteredState);
|
||||
}
|
||||
|
||||
DEBUG_LOG() << "Ex " << exerciseId() << ": Constructor ExerciseStateMachine: size m_exerciseStates = " << m_exerciseStates.size();
|
||||
DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": Constructor ExerciseStateMachine: size m_exerciseStates = " << m_exerciseStates.size();
|
||||
}
|
||||
|
||||
ExerciseStateMachine::~ExerciseStateMachine()
|
||||
@@ -99,11 +99,11 @@ bool ExerciseStateMachine::init()
|
||||
if (m_stateMachine->isRunning())
|
||||
return false;
|
||||
|
||||
DEBUG_LOG() << "Ex " << exerciseId() << ": Init ExerciseStateMachine ";
|
||||
DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": Init ExerciseStateMachine ";
|
||||
// initialise current exerciseState
|
||||
ExerciseStateBase *currentExerciseState = getStateFromId(m_exercise->exerciseState());
|
||||
|
||||
DEBUG_LOG() << "Ex " << exerciseId() << ": State = "
|
||||
DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": State = "
|
||||
<< ExerciseStateManager::toString(m_exercise->exerciseState());
|
||||
|
||||
m_stateMachine->setInitialState(currentExerciseState);
|
||||
@@ -111,7 +111,7 @@ bool ExerciseStateMachine::init()
|
||||
|
||||
m_stateManager->setInitial(m_exercise->exerciseState());
|
||||
|
||||
DEBUG_LOG() << "Ex " << exerciseId() << ": ==> Done Init ExerciseStateMachine ";
|
||||
DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": ==> Done Init ExerciseStateMachine ";
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -128,13 +128,13 @@ bool ExerciseStateMachine::switchToState(ExerciseState newExerciseState)
|
||||
|
||||
void ExerciseStateMachine::onEnteredState()
|
||||
{
|
||||
DEBUG_LOG() << "Ex " << exerciseId() << ": ExerciseStateMachine - onEnteredState";
|
||||
DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": ExerciseStateMachine - onEnteredState";
|
||||
|
||||
ExerciseStateBase *s = qobject_cast<ExerciseStateBase*>(sender());
|
||||
if (!s)
|
||||
return;
|
||||
|
||||
DEBUG_LOG() << "Ex " << exerciseId() << ": ExerciseStateBase : " << s->exerciseState();
|
||||
DEBUG_LOG(m_logger) << "Ex " << exerciseId() << ": ExerciseStateBase : " << s->exerciseState();
|
||||
|
||||
m_stateManager->setCurrent(s->exerciseState());
|
||||
|
||||
|
||||
Reference in new issue
Block a user