From: Eduardo DAVILA Date: Thu, 12 Jul 2018 13:13:14 +0000 (+0200) Subject: #3205 BBTK Feature New Normal - branch vtk7itk4wx3-mxecc X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=refs%2Fheads%2Fvtk7itk4wx3-mxecc;p=bbtk.git #3205 BBTK Feature New Normal - branch vtk7itk4wx3-mxecc --- diff --git a/kernel/src/bbtkAtomicBlackBox.h b/kernel/src/bbtkAtomicBlackBox.h index f9d09f6..faec100 100644 --- a/kernel/src/bbtkAtomicBlackBox.h +++ b/kernel/src/bbtkAtomicBlackBox.h @@ -47,7 +47,7 @@ #ifndef __bbtkAtomicBlackBox_h__ #define __bbtkAtomicBlackBox_h__ -#include "bbtkBlackBox.h" +#include "bbtkBlackBox.h" #include "bbtkAtomicBlackBoxDescriptor.h" namespace bbtk diff --git a/kernel/src/bbtkAtomicBlackBoxDescriptor.cxx b/kernel/src/bbtkAtomicBlackBoxDescriptor.cxx index aafb10d..b1398a5 100644 --- a/kernel/src/bbtkAtomicBlackBoxDescriptor.cxx +++ b/kernel/src/bbtkAtomicBlackBoxDescriptor.cxx @@ -33,8 +33,8 @@ Version: $Revision: 1.6 $ =========================================================================*/ -#include "bbtkAtomicBlackBoxDescriptor.h" #include "bbtkBlackBox.h" +#include "bbtkAtomicBlackBoxDescriptor.h" #include "bbtkPackage.h" #define bbtkDMessage(key,level,mess) \ bbtkMessage(key,level,"["< +#include + #include "bbtkSystem.h" #include "bbtkMessageManager.h" #include "bbtkBlackBoxDescriptor.h" #include "bbtkBlackBoxInputConnector.h" + //#include "bbtkBlackBoxOutputConnector.h" #include // Signal/slot mechanism for output change events -#include +*/ + #include +#include + +#include "bbtkSystem.h" +#include "bbtkMessageManager.h" +#include "bbtkBlackBoxDescriptor.h" +#include "bbtkBlackBoxInputConnector.h" + +//#include "bbtkBlackBoxOutputConnector.h" +#include + +// Signal/slot mechanism for output change events + #define bbtkBlackBoxMessage(key,level,mess) \ diff --git a/kernel/src/bbtkBlackBoxInputConnector.h b/kernel/src/bbtkBlackBoxInputConnector.h index c35709d..aadd26f 100644 --- a/kernel/src/bbtkBlackBoxInputConnector.h +++ b/kernel/src/bbtkBlackBoxInputConnector.h @@ -50,6 +50,7 @@ #include "bbtkPimpl.h" #include + namespace bbtk { diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.h b/kernel/src/bbtkComplexBlackBoxDescriptor.h index e39b6d7..182c2f9 100644 --- a/kernel/src/bbtkComplexBlackBoxDescriptor.h +++ b/kernel/src/bbtkComplexBlackBoxDescriptor.h @@ -46,10 +46,10 @@ #ifndef __bbtkComplexBlackBoxDescriptor_h__ #define __bbtkComplexBlackBoxDescriptor_h__ +#include "bbtkFactory.h" #include "bbtkBlackBoxDescriptor.h" #include "bbtkComplexBlackBoxInputDescriptor.h" #include "bbtkComplexBlackBoxOutputDescriptor.h" -#include "bbtkFactory.h" #include #include #include "bbtkUtilities.h" diff --git a/kernel/src/bbtkExecuter.h b/kernel/src/bbtkExecuter.h index 6376961..44cac2b 100644 --- a/kernel/src/bbtkExecuter.h +++ b/kernel/src/bbtkExecuter.h @@ -47,11 +47,10 @@ #ifndef __bbtkExecuter_h__ #define __bbtkExecuter_h__ -#include "bbtkVirtualExec.h" +#include "bbtkFactory.h" #include "bbtkSystem.h" #include "bbtkComplexBlackBox.h" -#include "bbtkFactory.h" #include #include diff --git a/kernel/src/bbtkInterpreterVirtual.h b/kernel/src/bbtkInterpreterVirtual.h index 8370cc2..b815ac2 100644 --- a/kernel/src/bbtkInterpreterVirtual.h +++ b/kernel/src/bbtkInterpreterVirtual.h @@ -47,6 +47,11 @@ #ifndef __bbtkInterpreterVirtual_h__ #define __bbtkInterpreterVirtual_h__ + +// Signal/slot mechanism for 'break' commands +//#include +#include + //#include "bbtkSystem.h" #include "bbtkMessageManager.h" @@ -57,9 +62,6 @@ #include #include -// Signal/slot mechanism for 'break' commands -//#include -#include namespace bbtk { diff --git a/kernel/src/bbtkVirtualExec.h b/kernel/src/bbtkVirtualExec.h index 27d3a6e..b5259e7 100644 --- a/kernel/src/bbtkVirtualExec.h +++ b/kernel/src/bbtkVirtualExec.h @@ -48,8 +48,8 @@ #define __bbtkVirtualExec_h__ #include "bbtkSystem.h" -#include "bbtkComplexBlackBoxDescriptor.h" #include "bbtkFactory.h" +#include "bbtkComplexBlackBoxDescriptor.h" namespace bbtk {