From 0bdd420ed7219642944ee93dfde55bc9e8686925 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Tue, 29 Aug 2017 22:07:21 +0200 Subject: [PATCH] #3121 BBTK Bug New Normal - branch changestoITK3and4 --- kernel/src/bbtkAtomicBlackBoxMacros.h | 10 +++++++- .../itk/src/bbitkBinaryThresholdImageFilter.h | 23 ++++++++++--------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/kernel/src/bbtkAtomicBlackBoxMacros.h b/kernel/src/bbtkAtomicBlackBoxMacros.h index 731ceed..a57dc65 100644 --- a/kernel/src/bbtkAtomicBlackBoxMacros.h +++ b/kernel/src/bbtkAtomicBlackBoxMacros.h @@ -79,9 +79,17 @@ //============================================================================ + + //============================================================================ /// Declares the standard interface of a AtomicBlackBox /// (ctor, New, descriptor related methods) + +//EED 2017-08-29 itk3to4 +/* + std::string GetObjectName() const \ +*/ + #define BBTK_BLACK_BOX_INTERFACE_INTERNAL(CLASS,PARENT) \ BBTK_OBJECT_MINIMAL_INTERFACE; \ private: \ @@ -91,7 +99,7 @@ bool allocate_connectors = true); \ ~CLASS(); \ public: \ - std::string GetObjectName() const \ + std::string GetObjectName() \ { return std::string(#CLASS)+std::string(" '") \ +bbGetNameWithParent()+std::string("'"); } \ inline static Pointer New(const std::string& name) \ diff --git a/packages/itk/src/bbitkBinaryThresholdImageFilter.h b/packages/itk/src/bbitkBinaryThresholdImageFilter.h index dcc7ecd..ed7167b 100644 --- a/packages/itk/src/bbitkBinaryThresholdImageFilter.h +++ b/packages/itk/src/bbitkBinaryThresholdImageFilter.h @@ -209,20 +209,21 @@ namespace bbitk <()<<">()"< FilterType; - typename FilterType::Pointer f = FilterType::New("Temp"); - typedef T* TPointer; - f->bbSetInputIn( this->bbGetInputIn().get < TPointer > () ); - f->bbSetInputLowerThreshold ( (typename T::PixelType) - this->bbGetInputLowerThreshold() ); - f->bbSetInputUpperThreshold ( (typename T::PixelType) - this->bbGetInputUpperThreshold() ); - f->bbSetInputInsideValue ( (typename T::PixelType) - this->bbGetInputInsideValue() ); - f->bbSetInputOutsideValue ( (typename T::PixelType) - this->bbGetInputOutsideValue() ); + typename FilterType::Pointer f + + = FilterType::New("Temp"); + +/* + typedef T* TPointer; + f->bbSetInputIn( this->bbGetInputIn().get < TPointer > () ); + f->bbSetInputLowerThreshold ( (typename T::PixelType)this->bbGetInputLowerThreshold() ); + f->bbSetInputUpperThreshold ( (typename T::PixelType)this->bbGetInputUpperThreshold() ); + f->bbSetInputInsideValue ( (typename T::PixelType)this->bbGetInputInsideValue() ); + f->bbSetInputOutsideValue ( (typename T::PixelType)this->bbGetInputOutsideValue() ); f->bbExecute(); f->bbGetOutputOut()->Register(); this->bbSetOutputOut( f->bbGetOutputOut() ); +*/ bbtkDebugDecTab("Core",9); } -- 2.47.1