From bb6b87a2685c0d71b5c38be33c100f85ac0b9cee Mon Sep 17 00:00:00 2001 From: Renaud G Date: Thu, 25 Jul 2019 09:59:29 +0200 Subject: Rework of the component to be a proper lib --- node/mergenode.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'node/mergenode.cpp') diff --git a/node/mergenode.cpp b/node/mergenode.cpp index 4a11a76..c4c1543 100644 --- a/node/mergenode.cpp +++ b/node/mergenode.cpp @@ -29,7 +29,7 @@ void MergeNode::run(ExecutionNode* previous) { if(nullptr == previous) { - m_errors.insert(ExecutionNode::NO_PREVIOUS_ERROR, QObject::tr("No previous node before Merge operator")); + m_errors.insert(Dice::ERROR_CODE::NO_PREVIOUS_ERROR, QObject::tr("No previous node before Merge operator")); return; } @@ -69,7 +69,7 @@ void MergeNode::run(ExecutionNode* previous) } } auto it= std::find_if(pastResult.begin(), pastResult.end(), - [tmpResult](const Result* a) { return (a == tmpResult->getPrevious()); }); + [tmpResult](const Result* a) { return (a == tmpResult->getPrevious()); }); if(it == pastResult.end()) { pastResult.push_back(previousLast->getResult()); -- cgit v1.2.3-70-g09d2 From 6d6856fbcfa414d749bfc4358a8fc0184ceb18ae Mon Sep 17 00:00:00 2001 From: Renaud G Date: Sun, 28 Jul 2019 02:28:49 +0200 Subject: fix merge node against crash --- node/mergenode.cpp | 68 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'node/mergenode.cpp') diff --git a/node/mergenode.cpp b/node/mergenode.cpp index c4c1543..15f2fa7 100644 --- a/node/mergenode.cpp +++ b/node/mergenode.cpp @@ -40,46 +40,46 @@ void MergeNode::run(ExecutionNode* previous) for(auto start : *m_startList) { ExecutionNode* last= getLatestNode(start); - if(nullptr != last) + if(nullptr == last || nullptr == previousLast) + continue; + + auto startResult= start->getResult(); + if(nullptr == startResult) + continue; + + startResult->setPrevious(previousLast->getResult()); + previousLast->setNextNode(start); + + previousLast= last; + Result* tmpResult= last->getResult(); + while(nullptr != tmpResult) { - if(nullptr != previousLast) + DiceResult* dice= dynamic_cast(tmpResult); + if(nullptr == dice) { - auto startResult= start->getResult(); - startResult->setPrevious(previousLast->getResult()); - previousLast->setNextNode(start); - } - previousLast= last; - Result* tmpResult= last->getResult(); - while(nullptr != tmpResult) - { - DiceResult* dice= dynamic_cast(tmpResult); - if(nullptr != dice) + ///@todo TODO improve here to set homogeneous while is really + m_diceResult->setHomogeneous(false); + for(auto& die : dice->getResultList()) { - ///@todo TODO improve here to set homogeneous while is really - m_diceResult->setHomogeneous(false); - for(auto& die : dice->getResultList()) + if(!m_diceResult->getResultList().contains(die) && (!die->hasBeenDisplayed())) { - if(!m_diceResult->getResultList().contains(die) && (!die->hasBeenDisplayed())) - { - Die* tmpdie= new Die(*die); - //*tmpdie= *die; - die->displayed(); - m_diceResult->getResultList().append(tmpdie); - } + Die* tmpdie= new Die(*die); + die->displayed(); + m_diceResult->getResultList().append(tmpdie); } } - auto it= std::find_if(pastResult.begin(), pastResult.end(), - [tmpResult](const Result* a) { return (a == tmpResult->getPrevious()); }); - if(it == pastResult.end()) - { - pastResult.push_back(previousLast->getResult()); - tmpResult= tmpResult->getPrevious(); - } - else - { - tmpResult->setPrevious(nullptr); - tmpResult= nullptr; - } + } + auto it= std::find_if(pastResult.begin(), pastResult.end(), + [tmpResult](const Result* a) { return (a == tmpResult->getPrevious()); }); + if(it == pastResult.end()) + { + pastResult.push_back(previousLast->getResult()); + tmpResult= tmpResult->getPrevious(); + } + else + { + tmpResult->setPrevious(nullptr); + tmpResult= nullptr; } } } -- cgit v1.2.3-70-g09d2