From 987fba348941c0c59d783d0a803d97d3fb740e5e Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 3 Dec 2020 16:57:24 +0100 Subject: [PATCH] GetViewer Box --- bbtk/src/bbcreaContoursGetWxVtkBaseView.cxx | 81 +++++++++++++++++++ bbtk/src/bbcreaContoursGetWxVtkBaseView.h | 52 ++++++++++++ bbtk/src/bbcreaContoursSetColorLayerImage.cxx | 16 +--- .../wxContourMainFrame.cxx | 12 ++- .../wxContourMainFrame.h | 1 + 5 files changed, 147 insertions(+), 15 deletions(-) create mode 100644 bbtk/src/bbcreaContoursGetWxVtkBaseView.cxx create mode 100644 bbtk/src/bbcreaContoursGetWxVtkBaseView.h diff --git a/bbtk/src/bbcreaContoursGetWxVtkBaseView.cxx b/bbtk/src/bbcreaContoursGetWxVtkBaseView.cxx new file mode 100644 index 0000000..09ad218 --- /dev/null +++ b/bbtk/src/bbcreaContoursGetWxVtkBaseView.cxx @@ -0,0 +1,81 @@ +//===== +// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) +//===== +#include "bbcreaContoursGetWxVtkBaseView.h" +#include "bbcreaContoursPackage.h" + +#include "wxContourMainFrame.h" + +namespace bbcreaContours +{ + +BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaContours,GetWxVtkBaseView) +BBTK_BLACK_BOX_IMPLEMENTATION(GetWxVtkBaseView,bbtk::AtomicBlackBox); +//===== +// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) +//===== +void GetWxVtkBaseView::Process() +{ + +// THE MAIN PROCESSING METHOD BODY +// Here we simply set the input 'In' value to the output 'Out' +// And print out the output value +// INPUT/OUTPUT ACCESSORS ARE OF THE FORM : +// void bbSet{Input|Output}NAME(const TYPE&) +// const TYPE& bbGet{Input|Output}NAME() const +// Where : +// * NAME is the name of the input/output +// (the one provided in the attribute 'name' of the tag 'input') +// * TYPE is the C++ type of the input/output +// (the one provided in the attribute 'type' of the tag 'input') + +// bbSetOutputOut( bbGetInputIn() ); +// std::cout << "Output value = " <GetWxVtkBaseView() ); + } // if Instance + + +} +//===== +// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) +//===== +void GetWxVtkBaseView::bbUserSetDefaultValues() +{ + +// SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX +// Here we initialize the input 'In' to 0 +// bbSetInputIn(0); + +} +//===== +// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) +//===== +void GetWxVtkBaseView::bbUserInitializeProcessing() +{ + +// THE INITIALIZATION METHOD BODY : +// Here does nothing +// but this is where you should allocate the internal/output pointers +// if any + + +} +//===== +// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) +//===== +void GetWxVtkBaseView::bbUserFinalizeProcessing() +{ + +// THE FINALIZATION METHOD BODY : +// Here does nothing +// but this is where you should desallocate the internal/output pointers +// if any + +} +} +// EO namespace bbcreaContours + + diff --git a/bbtk/src/bbcreaContoursGetWxVtkBaseView.h b/bbtk/src/bbcreaContoursGetWxVtkBaseView.h new file mode 100644 index 0000000..09bf74a --- /dev/null +++ b/bbtk/src/bbcreaContoursGetWxVtkBaseView.h @@ -0,0 +1,52 @@ +//===== +// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) +//===== +#ifndef __bbcreaContoursGetWxVtkBaseView_h_INCLUDED__ +#define __bbcreaContoursGetWxVtkBaseView_h_INCLUDED__ + +#include "bbcreaContours_EXPORT.h" +#include "bbtkAtomicBlackBox.h" +#include "iostream" + +#include "wxVtkBaseView.h" +#include "wxContourMainFrame.h" + +namespace bbcreaContours +{ + +class bbcreaContours_EXPORT GetWxVtkBaseView + : + public bbtk::AtomicBlackBox +{ + BBTK_BLACK_BOX_INTERFACE(GetWxVtkBaseView,bbtk::AtomicBlackBox); +//===== +// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) +//===== + BBTK_DECLARE_INPUT(WxContourMainFrame,wxContourMainFrame*); + BBTK_DECLARE_OUTPUT(Out,wxVtkBaseView* ); + BBTK_PROCESS(Process); + void Process(); +//===== +// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) +//===== +}; + +BBTK_BEGIN_DESCRIBE_BLACK_BOX(GetWxVtkBaseView,bbtk::AtomicBlackBox); + BBTK_NAME("GetWxVtkBaseView"); + BBTK_AUTHOR("InfoDev"); + BBTK_DESCRIPTION("No Description."); + BBTK_CATEGORY("empty"); + + BBTK_INPUT(GetWxVtkBaseView,WxContourMainFrame,"wxContourMainFrame",wxContourMainFrame*,""); + + BBTK_OUTPUT(GetWxVtkBaseView,Out,"wxVtkBaseView",wxVtkBaseView*,""); + +BBTK_END_DESCRIBE_BLACK_BOX(GetWxVtkBaseView); +//===== +// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) +//===== +} +// EO namespace bbcreaContours + +#endif // __bbcreaContoursGetWxVtkBaseView_h_INCLUDED__ + diff --git a/bbtk/src/bbcreaContoursSetColorLayerImage.cxx b/bbtk/src/bbcreaContoursSetColorLayerImage.cxx index 781eb23..c9dc9f8 100644 --- a/bbtk/src/bbcreaContoursSetColorLayerImage.cxx +++ b/bbtk/src/bbcreaContoursSetColorLayerImage.cxx @@ -36,21 +36,9 @@ void SetColorLayerImage::Process() { if (bbGetInputIn()!=NULL) { - wxContourMainFrame::getInstance()->SetColorLayerImage( bbGetInputIn() ); + wxContourMainFrame *wxcontourmainframe=wxContourMainFrame::getInstance(); + wxcontourmainframe->SetColorLayerImage( bbGetInputIn() ); } // InputIn -/* - if (wxContourMainFrame::getInstance()->GetFileLocation().empty()==true) - { - wxContourMainFrame::getInstance()->SetFileLocation(bbGetInputFileLocation() ); - }else { - wxContourMainFrame::getInstance()->onSave(); - wxContourMainFrame::getInstance()->deleteAllContours(); - wxContourMainFrame::getInstance()->SetFileLocation(bbGetInputFileLocation() ); - } // if FileLocaton - - wxContourMainFrame::getInstance()->onLoad(); - wxContourMainFrame::getInstance()->RefreshInterface(); -*/ } // if Instance } diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx index c0b9dd2..37cc8d3 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx @@ -3184,8 +3184,9 @@ void wxContourMainFrame::SetColorLayerImage(vtkImageData* img) { if (img!=NULL) { + _viewColorLayerImagePanel->SetActive(true); _viewColorLayerImagePanel->SetImage( img ); - RefreshInterface(); +// RefreshInterface(); } // img } // _viewColorLayerImagePanel } @@ -3418,6 +3419,15 @@ void wxContourMainFrame::SetXY(int x, int y) _theViewPanel->SetXY(x,y); } +wxVtkBaseView* wxContourMainFrame::GetWxVtkBaseView() +{ + if (_theViewPanel!=NULL) + { + return _theViewPanel->getWxVtkBaseView();; + } else { + return NULL; + } +} diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h index 9a49da6..aa7a947 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h @@ -140,6 +140,7 @@ class wxContourMainFrame : public wxPanel { void createViewPanel(wxAuiNotebook * parent); void createInstantChooserPanel(wxWindow * parent); void createViewPanel(wxWindow * parent); + wxVtkBaseView* GetWxVtkBaseView(); void setInstantChooserPanel( wxInstantChooserPanel * theInstantChooserPanel ); void getMaskValue(vtkImageData ** mask,vtkImageData ** value,int typeContourGroup, int selection, int minZ, int maxZ); void SaveImageResult(std::string directory,std::string namefile, vtkImageData* mask,vtkImageData* value); -- 2.47.1