Permalink
Browse files

Merge branch 'refs/heads/ProcessorToolbox' into develop

  • Loading branch information...
Noah Oblath
Noah Oblath committed Oct 2, 2012
2 parents 3dbcef0 + 3fc9a82 commit 9b8269feb5cfb78e6b243070dd98a801f742cae6
Showing with 17 additions and 1 deletion.
  1. +16 −1 Source/Core/KTProcessorToolbox.cc
  2. +1 −0 Source/Core/KTProcessorToolbox.hh
@@ -105,9 +105,24 @@ namespace Katydid
string signalName = subNode.GetData("signal-name");
string slotName = subNode.GetData("slot-name");
+ Bool_t useGroupOrdering = false;
+ Int_t groupOrder = 0;
+ if (subNode.HasData("group-order"))
+ {
+ useGroupOrdering = true;
+ groupOrder = subNode.GetData< Int_t >("group-order");
+ }
+
try
{
- signalProc->ConnectASlot(signalName, slotProc, slotName);
+ if (useGroupOrdering)
+ {
+ signalProc->ConnectASlot(signalName, slotProc, slotName, groupOrder);
+ }
+ else
+ {
+ signalProc->ConnectASlot(signalName, slotProc, slotName);
+ }
}
catch (std::exception& e)
{
@@ -55,6 +55,7 @@ namespace Katydid
<li>signal-name -- name of the signal being emitted.</li>
<li>slot-processor -- <i>name</li> of the processor with the slot that will receive the signal.</li>
<li>slot-name -- name of the slot being used to receive the signal.</li>
+ <li>group-order -- (optional) integer specifying the order in which slots should be called.
</ul>
</li>
<li>run-queue -- define the queue of processors for which Run() will be called (this option should NOT be repeated)

0 comments on commit 9b8269f

Please sign in to comment.