Commit 43294828 authored by Marc R.'s avatar Marc R.

Merge branch...

Merge branch '216-deletion-of-seed-actor-does-not-remove-actor-completely-from-trajectory-actor' into 'master'

Resolve "Deletion of Seed Actor does NOT remove Actor completely from Trajectory Actor"

Closes #216

See merge request !200
parents 0e203ac2 5ff46023
......@@ -1577,6 +1577,12 @@ void MTrajectoryActor::onActorDeleted(MActor *actor)
if (sas.actor == actor)
{
removeSeedActor(sas.actor->getName());
releaseData();
updateActorData();
asynchronousDataRequest();
emitActorChangedSignal();
}
}
}
......@@ -1651,12 +1657,22 @@ bool MTrajectoryActor::isConnectedTo(MActor *actor)
}
// This actor is connected to the argument actor if the argument actor is
// the transfer function this actor.
// the transfer function of this actor.
if (transferFunction == actor)
{
return true;
}
// This actor is connected to the argument actor if the argument actor is
// a seeding actor of this actor.
for (SeedActorSettings& sas : computationSeedActorProperties)
{
if (sas.actor == actor)
{
return true;
}
}
return false;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment