From 1e2df7fb6ae571ce1cf72e6af1715f0e34675cbf Mon Sep 17 00:00:00 2001 From: guigues Date: Tue, 25 Nov 2008 11:16:51 +0000 Subject: [PATCH] New widget pipeline : progressing ... --- kernel/appli/bbfy/bbfy.cpp | 5 ++-- kernel/src/bbtkAtomicBlackBox.cxx | 12 ++++----- kernel/src/bbtkAtomicBlackBox.h | 6 ++--- kernel/src/bbtkAtomicBlackBoxGetSetFunctor.h | 18 ++++++------- kernel/src/bbtkAtomicBlackBoxMacros.h | 10 +++---- kernel/src/bbtkBlackBox.cxx | 8 +++--- kernel/src/bbtkWxBlackBox.cxx | 6 ++--- kernel/src/bbtkWxBlackBox.h | 6 ++--- .../itk/src/bbitkBinaryThresholdImageFilter.h | 8 +++--- packages/itk/src/bbitkResampleImageFilter.h | 6 ++--- .../src/bbitkvtkitkImage2vtkImageData.cxx | 6 ++--- .../src/bbitkvtkitkImage2vtkImageData.h | 6 ++--- .../src/bbitkvtkvtkImageData2itkImage.cxx | 6 ++--- .../src/bbitkvtkvtkImageData2itkImage.h | 6 ++--- packages/std/src/bbstdASCII.cxx | 6 ++--- packages/std/src/bbstdASCII.h | 6 ++--- packages/vtk/src/bbvtkImagePlanes.cxx | 6 ++--- packages/vtk/src/bbvtkImagePlanes.h | 6 ++--- packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx | 26 +++++++++---------- packages/vtk/src/bbvtkIsoSurfaceExtractor.h | 6 ++--- packages/vtk/src/bbvtkMIPCreator.cxx | 6 ++--- packages/vtk/src/bbvtkMIPCreator.h | 6 ++--- .../vtk/src/bbvtkVecImageGaussianSmooth.cxx | 2 +- .../vtk/src/bbvtkVecImageGaussianSmooth.h | 2 +- .../vtk/src/bbvtkVecIsoSurfaceExtractor.cxx | 2 +- .../vtk/src/bbvtkVecIsoSurfaceExtractor.h | 2 +- packages/wx/src/bbwxColourSelectorButton.cxx | 25 +++++++++++------- packages/wx/src/bbwxColourSelectorButton.h | 7 ++--- packages/wxvtk/src/bbwxvtkViewer3D.cxx | 11 +++++--- 29 files changed, 119 insertions(+), 109 deletions(-) diff --git a/kernel/appli/bbfy/bbfy.cpp b/kernel/appli/bbfy/bbfy.cpp index db4161b..c22be32 100644 --- a/kernel/appli/bbfy/bbfy.cpp +++ b/kernel/appli/bbfy/bbfy.cpp @@ -589,7 +589,7 @@ void bbfy::CreateHeader() mFile << "virtual void bbUserConstructor();"<()<<","<< TypeName()<<","<< TypeName()<< @@ -133,7 +133,7 @@ namespace bbtk /// Concrete application of the Get method of object o Data Get(AtomicBlackBox* o) { - bbtkDebugMessage("Data",9,"AtomicBlackBoxTGetFunctor<"<< + bbtkDebugMessage("data",9,"AtomicBlackBoxTGetFunctor<"<< TypeName()<<","<< TypeName()<<","<< TypeName()<< @@ -170,7 +170,7 @@ namespace bbtk AtomicBlackBoxTSetFunctor(SetMethodPointerType s) : mSetMethodPointer(s) { - bbtkDebugMessage("Data",9,"AtomicBlackBoxTSetFunctor<"<< + bbtkDebugMessage("data",9,"AtomicBlackBoxTSetFunctor<"<< TypeName()<<","<< TypeName()<<","<< TypeName()<< @@ -180,7 +180,7 @@ namespace bbtk /// Concrete application of the Set method of object o void Set(AtomicBlackBox* o, const Data& d) { - bbtkDebugMessage("Data",9,"AtomicBlackBoxTSetfunctor<"<< + bbtkDebugMessage("data",9,"AtomicBlackBoxTSetfunctor<"<< TypeName()<<","<< TypeName()<<","<< TypeName()<< @@ -231,7 +231,7 @@ namespace bbtk AtomicBlackBoxTSetFunctor(SetMethodPointerType s) : mSetMethodPointer(s) { - bbtkDebugMessage("Data",9,"AtomicBlackBoxTSetFunctor<"<< + bbtkDebugMessage("data",9,"AtomicBlackBoxTSetFunctor<"<< TypeName()<<","<< TypeName()<<","<< TypeName()<< @@ -241,7 +241,7 @@ namespace bbtk /// Concrete application of the Set method of object o void Set(AtomicBlackBox* o, const Data& d) { - bbtkDebugMessage("Data",9,"AtomicBlackBoxTSetfunctor<"<< + bbtkDebugMessage("data",9,"AtomicBlackBoxTSetfunctor<"<< TypeName()<<","<< TypeName()<<","<< TypeName()<< @@ -260,7 +260,7 @@ namespace bbtk virtual void BruteForceSetPointer(AtomicBlackBox* o, void* p) { - bbtkDebugMessage("Data",9,"AtomicBlackBoxTSetFunctor<" + bbtkDebugMessage("data",9,"AtomicBlackBoxTSetFunctor<" <()<<"," <()<<"," <() diff --git a/kernel/src/bbtkAtomicBlackBoxMacros.h b/kernel/src/bbtkAtomicBlackBoxMacros.h index 8c026f2..69bcc7c 100644 --- a/kernel/src/bbtkAtomicBlackBoxMacros.h +++ b/kernel/src/bbtkAtomicBlackBoxMacros.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkAtomicBlackBoxMacros.h,v $ Language: C++ - Date: $Date: 2008/11/13 14:46:43 $ - Version: $Revision: 1.12 $ + Date: $Date: 2008/11/25 11:17:13 $ + Version: $Revision: 1.13 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -241,7 +241,7 @@ : PARENT(from,name,false) \ { \ BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \ - CLASS::bbUserCopyConstructor(); \ + CLASS::bbUserCopyConstructor(from.GetThisPointer()); \ BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from); \ } \ CLASS::~CLASS() \ @@ -524,7 +524,7 @@ : PARENT(from,name,false) \ { \ BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \ - CLASS::bbUserCopyConstructor(); \ + CLASS::bbUserCopyConstructor(from.GetThisPointer()); \ BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from); \ } \ template \ @@ -699,7 +699,7 @@ : PARENT(from,name,false) \ { \ BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from,allocate_connectors); \ - CLASS::bbUserCopyConstructor(); \ + CLASS::bbUserCopyConstructor(from.GetThisPointer()); \ BBTK_END_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,from); \ } \ template \ diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx index 3b39556..ddfc3ed 100644 --- a/kernel/src/bbtkBlackBox.cxx +++ b/kernel/src/bbtkBlackBox.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkBlackBox.cxx,v $ Language: C++ - Date: $Date: 2008/11/13 14:46:43 $ - Version: $Revision: 1.28 $ + Date: $Date: 2008/11/25 11:17:13 $ + Version: $Revision: 1.29 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -343,7 +343,7 @@ namespace bbtk /// Copies the input / output values from another box void BlackBox::bbCopyIOValues(BlackBox& from) { - bbtkDebugMessageInc("Kernel",9, + bbtkDebugMessageInc("Kernel",1, "BlackBox::bbCopyIOValues(" <second->GetCopyConstruct() ) continue; std::string input = i->second->GetName(); + bbtkDebugMessage("Kernel",2,"* Copying input "<bbSetInput(input, from.bbGetInput(input) ); } // copies the output values @@ -365,6 +366,7 @@ namespace bbtk { if (! o->second->GetCopyConstruct() ) continue; std::string output = o->second->GetName(); + bbtkDebugMessage("Kernel",2,"* Copying output "<bbSetOutput(output, from.bbGetOutput(output) ); } diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx index a5f2ce0..01ee471 100644 --- a/kernel/src/bbtkWxBlackBox.cxx +++ b/kernel/src/bbtkWxBlackBox.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWxBlackBox.cxx,v $ Language: C++ - Date: $Date: 2008/11/24 15:45:48 $ - Version: $Revision: 1.30 $ + Date: $Date: 2008/11/25 11:17:13 $ + Version: $Revision: 1.31 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -357,7 +357,7 @@ namespace bbtk //========================================================================= //========================================================================= - void WxBlackBox::bbUserCopyConstructor() + void WxBlackBox::bbUserCopyConstructor(bbtk::BlackBox::Pointer) { bbtkDebugMessage("Kernel",9,"WxBlackBox::bbUserCopyConstructor()" < void Process(); void bbUserConstructor() { Init(); } - void bbUserCopyConstructor() { Init(); } + void bbUserCopyConstructor(bbtk::BlackBox::Pointer) { Init(); } void Init(); }; diff --git a/packages/itk/src/bbitkResampleImageFilter.h b/packages/itk/src/bbitkResampleImageFilter.h index 127e229..0dae92d 100644 --- a/packages/itk/src/bbitkResampleImageFilter.h +++ b/packages/itk/src/bbitkResampleImageFilter.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkResampleImageFilter.h,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:21 $ - Version: $Revision: 1.7 $ + Date: $Date: 2008/11/25 11:17:15 $ + Version: $Revision: 1.8 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -58,7 +58,7 @@ namespace bbitk inline void ProcessSwitch(); template void Process(); void bbUserConstructor() { Init(); } - void bbUserCopyConstructor() { Init(); } + void bbUserCopyConstructor(bbtk::BlackBox::Pointer) { Init(); } void Init(); itk::Object* mOutput; }; diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx index ac14914..e3a4631 100644 --- a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx +++ b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkvtkitkImage2vtkImageData.cxx,v $ Language: C++ - Date: $Date: 2008/11/12 12:47:05 $ - Version: $Revision: 1.6 $ + Date: $Date: 2008/11/25 11:17:17 $ + Version: $Revision: 1.7 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -138,7 +138,7 @@ namespace bbitkvtk bbSetOutputOut(NULL); mConverter = 0; } - void itkImage2vtkImageData::bbUserCopyConstructor() + void itkImage2vtkImageData::bbUserCopyConstructor(bbtk::BlackBox::Pointer) { bbSetOutputOut(NULL); mConverter = 0; diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h index 476cddc..8e52ec6 100644 --- a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h +++ b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkvtkitkImage2vtkImageData.h,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:24 $ - Version: $Revision: 1.7 $ + Date: $Date: 2008/11/25 11:17:18 $ + Version: $Revision: 1.8 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -60,7 +60,7 @@ namespace bbitkvtk BBTK_PROCESS(Convert); void Convert(); void bbUserConstructor(); - void bbUserCopyConstructor(); + void bbUserCopyConstructor(bbtk::BlackBox::Pointer); void bbUserDestructor(); private: // Convert method template on type of the itk image diff --git a/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.cxx b/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.cxx index d8cde9d..a378afe 100644 --- a/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.cxx +++ b/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbitkvtkvtkImageData2itkImage.cxx,v $ Language: C++ - Date: $Date: 2008/05/14 07:01:00 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/11/25 11:17:18 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -137,7 +137,7 @@ namespace bbitkvtk mConverter = 0; } - void vtkImageData2itkImage::bbUserCopyConstructor() + void vtkImageData2itkImage::bbUserCopyConstructor(bbtk::BlackBox::Pointer) { // bbSetOutputOut(NULL); mConverter = 0; diff --git a/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.h b/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.h index 1ee762b..2af1182 100644 --- a/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.h +++ b/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbitkvtkvtkImageData2itkImage.h,v $ Language: C++ - Date: $Date: 2008/07/23 12:02:15 $ - Version: $Revision: 1.5 $ + Date: $Date: 2008/11/25 11:17:18 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -48,7 +48,7 @@ namespace bbitkvtk BBTK_PROCESS(Convert); void Convert(); void bbUserConstructor(); - void bbUserCopyConstructor(); + void bbUserCopyConstructor(bbtk::BlackBox::Pointer); void bbUserDestructor(); private: diff --git a/packages/std/src/bbstdASCII.cxx b/packages/std/src/bbstdASCII.cxx index 69b5047..10e630f 100644 --- a/packages/std/src/bbstdASCII.cxx +++ b/packages/std/src/bbstdASCII.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdASCII.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:26 $ - Version: $Revision: 1.5 $ + Date: $Date: 2008/11/25 11:17:20 $ + Version: $Revision: 1.6 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -88,7 +88,7 @@ namespace bbstd bbSetInputType(0); } - void ASCII::bbUserCopyConstructor() + void ASCII::bbUserCopyConstructor(bbtk::BlackBox::Pointer) { } diff --git a/packages/std/src/bbstdASCII.h b/packages/std/src/bbstdASCII.h index a76b034..cd28637 100644 --- a/packages/std/src/bbstdASCII.h +++ b/packages/std/src/bbstdASCII.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdASCII.h,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:26 $ - Version: $Revision: 1.7 $ + Date: $Date: 2008/11/25 11:17:20 $ + Version: $Revision: 1.8 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -46,7 +46,7 @@ namespace bbstd /// User callback called in the box contructor virtual void bbUserConstructor(); /// User callback called in the box copy constructor - virtual void bbUserCopyConstructor(); + virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); /// User callback called in the box destructor virtual void bbUserDestructor(); //================================================================== diff --git a/packages/vtk/src/bbvtkImagePlanes.cxx b/packages/vtk/src/bbvtkImagePlanes.cxx index 0f5e34b..191fcfa 100644 --- a/packages/vtk/src/bbvtkImagePlanes.cxx +++ b/packages/vtk/src/bbvtkImagePlanes.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkImagePlanes.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:30 $ - Version: $Revision: 1.9 $ + Date: $Date: 2008/11/25 11:17:23 $ + Version: $Revision: 1.10 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -77,7 +77,7 @@ namespace bbvtk bbSetInputWindowLevel (vect); } - void ImagePlanes::bbUserCopyConstructor() + void ImagePlanes::bbUserCopyConstructor(bbtk::BlackBox::Pointer) { planeWidgetX = planeWidgetY = planeWidgetZ = 0; } diff --git a/packages/vtk/src/bbvtkImagePlanes.h b/packages/vtk/src/bbvtkImagePlanes.h index c12a49c..3121529 100644 --- a/packages/vtk/src/bbvtkImagePlanes.h +++ b/packages/vtk/src/bbvtkImagePlanes.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkImagePlanes.h,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:30 $ - Version: $Revision: 1.6 $ + Date: $Date: 2008/11/25 11:17:23 $ + Version: $Revision: 1.7 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -85,7 +85,7 @@ namespace bbvtk protected: virtual void bbUserConstructor(); - virtual void bbUserCopyConstructor(); + virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); virtual void bbUserDestructor(); void Init(); private: diff --git a/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx b/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx index 6db4697..3aa3a37 100644 --- a/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx +++ b/packages/vtk/src/bbvtkIsoSurfaceExtractor.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkIsoSurfaceExtractor.cxx,v $ Language: C++ - Date: $Date: 2008/11/21 12:25:42 $ - Version: $Revision: 1.9 $ + Date: $Date: 2008/11/25 11:17:23 $ + Version: $Revision: 1.10 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -55,9 +55,8 @@ namespace bbvtk colour.push_back(1.0); colour.push_back(0.5); bbSetInputColour(colour); - bbSetInputTransform(NULL); } - void IsoSurfaceExtractor::bbUserCopyConstructor() + void IsoSurfaceExtractor::bbUserCopyConstructor(bbtk::BlackBox::Pointer from) { Init(); } @@ -76,6 +75,7 @@ namespace bbvtk bbSetInputIn(NULL); // bbSetInputInVtkObject(NULL); bbSetInputRenderer(NULL); + bbSetInputTransform(NULL); bbSetInputIsovalue(400); bbSetInputOpacity(1); @@ -94,8 +94,6 @@ namespace bbvtk void IsoSurfaceExtractor::DoProcess() { - // bbGetInputIn()->Print(std::cout); - // Visualisation - result volume marchingcubes->SetInput( bbGetInputIn() ); marchingcubes->SetValue(0, bbGetInputIsovalue() ); marchingcubes->Update(); @@ -106,19 +104,19 @@ namespace bbvtk vtkactor->GetProperty()->SetOpacity( bbGetInputOpacity() ); - - if ( bbGetInputTransform()!=NULL ) - { - vtkactor->SetUserTransform( bbGetInputTransform() ); - } + + if ( bbGetInputTransform()!=NULL ) + { + vtkactor->SetUserTransform( bbGetInputTransform() ); + } bbSetOutputOut( vtkactor ); - + // Interface Update if ((firsttime==true) && (bbGetInputRenderer()!=NULL )) { - firsttime=false; - bbGetInputRenderer()->AddActor( vtkactor ); + firsttime=false; + bbGetInputRenderer()->AddActor( vtkactor ); } } } // EO namespace bbtk diff --git a/packages/vtk/src/bbvtkIsoSurfaceExtractor.h b/packages/vtk/src/bbvtkIsoSurfaceExtractor.h index 8052927..554ca8c 100644 --- a/packages/vtk/src/bbvtkIsoSurfaceExtractor.h +++ b/packages/vtk/src/bbvtkIsoSurfaceExtractor.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkIsoSurfaceExtractor.h,v $ Language: C++ - Date: $Date: 2008/11/20 17:41:48 $ - Version: $Revision: 1.10 $ + Date: $Date: 2008/11/25 11:17:23 $ + Version: $Revision: 1.11 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -90,7 +90,7 @@ namespace bbvtk protected: virtual void bbUserConstructor(); - virtual void bbUserCopyConstructor(); + virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); virtual void bbUserDestructor(); void Init(); }; diff --git a/packages/vtk/src/bbvtkMIPCreator.cxx b/packages/vtk/src/bbvtkMIPCreator.cxx index c4a04b8..a398952 100644 --- a/packages/vtk/src/bbvtkMIPCreator.cxx +++ b/packages/vtk/src/bbvtkMIPCreator.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkMIPCreator.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:30 $ - Version: $Revision: 1.4 $ + Date: $Date: 2008/11/25 11:17:23 $ + Version: $Revision: 1.5 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -58,7 +58,7 @@ namespace bbvtk bbSetInputShift(0); bbSetInputScale(1.); } - void MIPCreator::bbUserCopyConstructor() + void MIPCreator::bbUserCopyConstructor(bbtk::BlackBox::Pointer) { Init(); } diff --git a/packages/vtk/src/bbvtkMIPCreator.h b/packages/vtk/src/bbvtkMIPCreator.h index acf229a..6481ef8 100644 --- a/packages/vtk/src/bbvtkMIPCreator.h +++ b/packages/vtk/src/bbvtkMIPCreator.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbvtkMIPCreator.h,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:30 $ - Version: $Revision: 1.5 $ + Date: $Date: 2008/11/25 11:17:23 $ + Version: $Revision: 1.6 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -80,7 +80,7 @@ namespace bbvtk protected: virtual void bbUserConstructor(); - virtual void bbUserCopyConstructor(); + virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); virtual void bbUserDestructor(); void Init(); private: diff --git a/packages/vtk/src/bbvtkVecImageGaussianSmooth.cxx b/packages/vtk/src/bbvtkVecImageGaussianSmooth.cxx index 3a634eb..01b9019 100644 --- a/packages/vtk/src/bbvtkVecImageGaussianSmooth.cxx +++ b/packages/vtk/src/bbvtkVecImageGaussianSmooth.cxx @@ -54,7 +54,7 @@ void VecImageGaussianSmooth::bbUserConstructor() } -void VecImageGaussianSmooth::bbUserCopyConstructor() +void VecImageGaussianSmooth::bbUserCopyConstructor(bbtk::BlackBox::Pointer) { } diff --git a/packages/vtk/src/bbvtkVecImageGaussianSmooth.h b/packages/vtk/src/bbvtkVecImageGaussianSmooth.h index 1acb573..d5fc226 100644 --- a/packages/vtk/src/bbvtkVecImageGaussianSmooth.h +++ b/packages/vtk/src/bbvtkVecImageGaussianSmooth.h @@ -19,7 +19,7 @@ class /*BBTK_EXPORT*/ VecImageGaussianSmooth /// User callback called in the box contructor virtual void bbUserConstructor(); /// User callback called in the box copy constructor -virtual void bbUserCopyConstructor(); +virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); /// User callback called in the box destructor virtual void bbUserDestructor(); //================================================================== diff --git a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx index 4ba55a1..f4575b5 100644 --- a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx +++ b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx @@ -126,7 +126,7 @@ void VecIsoSurfaceExtractor::bbUserConstructor() bbSetInputTransform(NULL); } -void VecIsoSurfaceExtractor::bbUserCopyConstructor() +void VecIsoSurfaceExtractor::bbUserCopyConstructor(bbtk::BlackBox::Pointer) { Init(); } diff --git a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.h b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.h index e0e4b84..060eb14 100644 --- a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.h +++ b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.h @@ -24,7 +24,7 @@ class /*BBTK_EXPORT*/ VecIsoSurfaceExtractor /// User callback called in the box contructor virtual void bbUserConstructor(); /// User callback called in the box copy constructor -virtual void bbUserCopyConstructor(); +virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); /// User callback called in the box destructor virtual void bbUserDestructor(); //================================================================== diff --git a/packages/wx/src/bbwxColourSelectorButton.cxx b/packages/wx/src/bbwxColourSelectorButton.cxx index 9328d6a..9a4cafd 100644 --- a/packages/wx/src/bbwxColourSelectorButton.cxx +++ b/packages/wx/src/bbwxColourSelectorButton.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxColourSelectorButton.cxx,v $ Language: C++ - Date: $Date: 2008/11/24 15:45:51 $ - Version: $Revision: 1.6 $ + Date: $Date: 2008/11/25 11:17:25 $ + Version: $Revision: 1.7 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -119,14 +119,22 @@ void wxColourPickerCtrlWidget::UpdateBox() void ColourSelectorButton::bbUserConstructor() { bbSetInputIn("1 1 1"); + bbSetOutputOut("1 1 1"); + bbSetOutputWidget(0); } void ColourSelectorButton::Process() { - bbtkDebugMessageInc("Process",9,"ColourSelectorButton::Process()"<UpdateBox(); - bbtkDebugDecTab("Process",9); + wxColourPickerCtrlWidget* w = ( wxColourPickerCtrlWidget* )bbGetOutputWidget(); + if (w) + { + w->UpdateBox(); + } + else + { + bbSetOutputOut(bbGetInputIn()); + } } @@ -137,7 +145,6 @@ void wxColourPickerCtrlWidget::UpdateBox() */ void ColourSelectorButton::CreateWidget(wxWindow* parent) { - bbtkDebugMessage("Process",9,"=> ColourSelectorButton::CreateWidget()"<Update(); + Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget(); + if (w) w->Update(); } @@ -225,7 +227,8 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect ) // when window is shown void Viewer3D::OnShowWidget() { - ((Viewer3DWidget*)bbGetOutputWidget())->Update(); + Viewer3DWidget* w = (Viewer3DWidget*)bbGetOutputWidget(); + if (w) w->Update(); } -- 2.45.0