From 62f21094493592cc2ccf1f105db791fb0ebbe2d0 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Thu, 26 Jun 2008 07:37:04 +0000 Subject: [PATCH] *** empty log message *** --- kernel/src/bbtkWxBlackBox.cxx | 9 +-- kernel/src/bbtkWxGUITextEditor.cxx | 16 +++-- .../vtk/bbs/appli/ExampleGaussianSmooth.bbs | 2 +- .../bbs/appli/ExampleGaussianSmooth_02.bbs | 63 ++++++++++++++++++ .../vtk/doc/bbdoc/ExampleGaussianSmooth.JPG | Bin 0 -> 26886 bytes .../doc/bbdoc/ExampleGaussianSmooth_02.JPG | Bin 0 -> 15238 bytes packages/wx/src/bbwxColourSelector.cxx | 10 ++- packages/wx/src/bbwxCommandButton.cxx | 12 ++-- packages/wx/src/bbwxFileSelector.cxx | 18 +++-- packages/wx/src/bbwxFileSelector.h | 8 ++- packages/wxvtk/src/bbwxvtkViewer2D.cxx | 36 +++++----- 11 files changed, 132 insertions(+), 42 deletions(-) create mode 100644 packages/vtk/bbs/appli/ExampleGaussianSmooth_02.bbs create mode 100644 packages/vtk/doc/bbdoc/ExampleGaussianSmooth.JPG create mode 100644 packages/vtk/doc/bbdoc/ExampleGaussianSmooth_02.JPG diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx index 781d025..8f52302 100644 --- a/kernel/src/bbtkWxBlackBox.cxx +++ b/kernel/src/bbtkWxBlackBox.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxBlackBox.cxx,v $ Language: C++ - Date: $Date: 2008/05/15 08:02:36 $ - Version: $Revision: 1.20 $ + Date: $Date: 2008/06/26 07:37:04 $ + Version: $Revision: 1.21 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -226,13 +226,14 @@ namespace bbtk bbtkDebugMessage("wx",5,"WxBlackBoxFrame::bbShow(" <bbGetFullName()<<")"<bbUserOnShow(); - // wxFrame::SetFocus(); } //========================================================================= diff --git a/kernel/src/bbtkWxGUITextEditor.cxx b/kernel/src/bbtkWxGUITextEditor.cxx index b1f95b4..c8baa37 100644 --- a/kernel/src/bbtkWxGUITextEditor.cxx +++ b/kernel/src/bbtkWxGUITextEditor.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUITextEditor.cxx,v $ Language: C++ - Date: $Date: 2008/05/14 12:32:26 $ - Version: $Revision: 1.12 $ + Date: $Date: 2008/06/26 07:37:05 $ + Version: $Revision: 1.13 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -189,8 +189,11 @@ namespace bbtk wxFileDialog* fd = new wxFileDialog(this,_T("Save file"),_T(""), _T(""),std2wx(filter), wxSAVE | wxOVERWRITE_PROMPT ); - fd->ShowModal(); + int result_fd = fd->ShowModal(); + // This line is need it by windows // EED + fd->SetReturnCode( result_fd ); + if (fd->GetReturnCode()==wxID_OK) { mName = wx2std(fd->GetPath()); @@ -432,8 +435,11 @@ namespace bbtk wxFileDialog* fd = new wxFileDialog(this,_T("Open file"),_T(""), _T(""),std2wx(mFileNameFilter), wxOPEN | wxFILE_MUST_EXIST ); - fd->ShowModal(); - + int result_fd = fd->ShowModal(); + + // This line is need it by windows //EED + fd->SetReturnCode( result_fd ); + if (fd->GetReturnCode()==wxID_OK) { std::string filename = wx2std(fd->GetPath()); diff --git a/packages/vtk/bbs/appli/ExampleGaussianSmooth.bbs b/packages/vtk/bbs/appli/ExampleGaussianSmooth.bbs index 8fb2da9..8328341 100644 --- a/packages/vtk/bbs/appli/ExampleGaussianSmooth.bbs +++ b/packages/vtk/bbs/appli/ExampleGaussianSmooth.bbs @@ -1,5 +1,5 @@ print "=== GaussianSmooth box example ===" -description "GaussianSmooth box example" +description "GaussianSmooth box example. Screenshot : " author "eduardo.davila at creatis.insa-lyon.fr" category "example" diff --git a/packages/vtk/bbs/appli/ExampleGaussianSmooth_02.bbs b/packages/vtk/bbs/appli/ExampleGaussianSmooth_02.bbs new file mode 100644 index 0000000..9d587b0 --- /dev/null +++ b/packages/vtk/bbs/appli/ExampleGaussianSmooth_02.bbs @@ -0,0 +1,63 @@ +print "=== GaussianSmooth_02 box example ===" +description "GaussianSmooth Save box. Screenshot : " +author "eduardo.davila at creatis.insa-lyon.fr" +category "example" + +include wx +include itk +include vtk +include wxvtk +include itkvtk + +new FileSelector fileselectoropen + set fileselectoropen.OpenSave "Open" + +new ImageReader imagereader + connect fileselectoropen.Out imagereader.Filename + +new Viewer2D viewerleft + connect imagereader.Out viewerleft.In + +new Slider slidersmooth + set slidersmooth.In 1 + set slidersmooth.Max 10 + set slidersmooth.Title "Gaussian smooth " + +new ImageGaussianSmooth smooth + connect imagereader.Out smooth.In + connect slidersmooth.Out smooth.StdDevX + connect slidersmooth.Out smooth.StdDevY + connect slidersmooth.Out smooth.StdDevZ + connect slidersmooth.BoxChange smooth.BoxExecute + +new Viewer2D viewerright + connect smooth.Out viewerright.In + connect slidersmooth.BoxChange viewerright.BoxExecute + +new LayoutLine layoutlineviwer + set layoutlineviwer.Orientation H + connect viewerleft.Widget layoutlineviwer.Widget1 + connect viewerright.Widget layoutlineviwer.Widget2 + +new FileSelector fileselectorsave + set fileselectorsave.OpenSave "Save" + +new ImageWriter imagewrite + connect smooth.Out imagewrite.In + connect fileselectorsave.Out imagewrite.Filename + +new CommandButton btnSave + set btnSave.Label "Save smooth" + connect btnSave.BoxChange fileselectorsave.BoxExecute + connect btnSave.BoxChange imagewrite.BoxExecute + +new LayoutLine layoutline + connect slidersmooth.Widget layoutline.Widget1 + connect btnSave.Widget layoutline.Widget2 + +new LayoutSplit main + connect layoutlineviwer.Widget main.Widget1 + connect layoutline.Widget main.Widget2 + + +exec main \ No newline at end of file diff --git a/packages/vtk/doc/bbdoc/ExampleGaussianSmooth.JPG b/packages/vtk/doc/bbdoc/ExampleGaussianSmooth.JPG new file mode 100644 index 0000000000000000000000000000000000000000..8ffc87a774f7b8b724840711a22179662e7a084d GIT binary patch literal 26886 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
    >zq)nZ`&5OW;TWR>$ZZ@xp|#N@p0!=GV*uf!gGV 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 literal 0 HcmV?d00001 diff --git a/packages/vtk/doc/bbdoc/ExampleGaussianSmooth_02.JPG b/packages/vtk/doc/bbdoc/ExampleGaussianSmooth_02.JPG new file mode 100644 index 0000000000000000000000000000000000000000..4f38aea90ae05f2f2bf6e7c522c0ddb644d057bf GIT binary patch literal 15238 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 + int result_colordialog = colordialog->ShowModal(); + + // This line is need it by windows // EED + colordialog->SetReturnCode( result_colordialog ); + if (colordialog->GetReturnCode()==wxID_OK) { char col[100]; diff --git a/packages/wx/src/bbwxCommandButton.cxx b/packages/wx/src/bbwxCommandButton.cxx index aeea215..5cff6c8 100644 --- a/packages/wx/src/bbwxCommandButton.cxx +++ b/packages/wx/src/bbwxCommandButton.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxCommandButton.cxx,v $ Language: C++ - Date: $Date: 2008/05/15 08:02:37 $ - Version: $Revision: 1.8 $ + Date: $Date: 2008/06/26 07:37:11 $ + Version: $Revision: 1.9 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -51,7 +51,7 @@ namespace bbwx &CommandButtonWidget::OnCommandButton ); wxFlexGridSizer *sizer = new wxFlexGridSizer(1); - sizer -> Add( mwxCommandButton,1,wxGROW ); + sizer -> Add( mwxCommandButton,1,wxGROW | wxALL,10 ); sizer -> AddGrowableCol(0); panel -> SetSizer(sizer); @@ -161,9 +161,9 @@ namespace bbwx bbSetInputIn(""); bbSetInputLabel(""); std::vector lstColour; - lstColour.push_back(-1); - lstColour.push_back(-1); - lstColour.push_back(-1); + lstColour.push_back(0.75); + lstColour.push_back(0.75); + lstColour.push_back(0.75); bbSetInputColour(lstColour); } diff --git a/packages/wx/src/bbwxFileSelector.cxx b/packages/wx/src/bbwxFileSelector.cxx index 4a049c5..0c6c66a 100644 --- a/packages/wx/src/bbwxFileSelector.cxx +++ b/packages/wx/src/bbwxFileSelector.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxFileSelector.cxx,v $ Language: C++ - Date: $Date: 2008/04/18 12:59:52 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/06/26 07:37:11 $ + Version: $Revision: 1.3 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -68,9 +68,13 @@ namespace bbwx bbtk::std2wx(wc), style, wxDefaultPosition); +//EED + + int result_FD = FD->ShowModal(); + + // This line is need it by windows //EED + FD->SetReturnCode( result_FD ); - FD->ShowModal(); - if (FD->GetReturnCode()==wxID_OK) { bbSetOutputOut( bbtk::wx2std (FD->GetPath()) ); @@ -84,6 +88,12 @@ namespace bbwx } + void FileSelector::bbUserConstructor() + { + bbSetInputOpenSave("Open"); + } + + }//namespace bbtk diff --git a/packages/wx/src/bbwxFileSelector.h b/packages/wx/src/bbwxFileSelector.h index 051754b..f483a24 100644 --- a/packages/wx/src/bbwxFileSelector.h +++ b/packages/wx/src/bbwxFileSelector.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxFileSelector.h,v $ Language: C++ - Date: $Date: 2008/04/18 12:59:52 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/06/26 07:37:11 $ + 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 @@ -59,6 +59,10 @@ namespace bbwx BBTK_DECLARE_OUTPUT(Out,std::string); BBTK_PROCESS(Process); void Process(); + + protected: + virtual void bbUserConstructor(); + }; //================================================================= diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx index bfd066f..6cf9588 100644 --- a/packages/wxvtk/src/bbwxvtkViewer2D.cxx +++ b/packages/wxvtk/src/bbwxvtkViewer2D.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxvtkViewer2D.cxx,v $ Language: C++ - Date: $Date: 2008/06/25 15:36:19 $ - Version: $Revision: 1.11 $ + Date: $Date: 2008/06/26 07:37:18 $ + Version: $Revision: 1.12 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -177,26 +177,26 @@ namespace bbwxvtk (backImageData!=NULL)&& (mBox->bbIsShown())) { - int z = mBox->bbGetInputSlice(); - // std::cout << "slice = "<GetWholeExtent(ext); + int z = mBox->bbGetInputSlice(); + // std::cout << "slice = "<GetWholeExtent(ext); - // std::cout << "ext = "<ext[5]) { z=ext[5]; } + if (zext[5]) { z=ext[5]; } -#if (VTK_MAJOR_VERSION >= 5) - imageViewer->SetSlice( z ); -#else - imageViewer->SetZSlice( z ); -#endif + #if (VTK_MAJOR_VERSION >= 5) + imageViewer->SetSlice( z ); + #else + imageViewer->SetZSlice( z ); + #endif - //imageViewer->UpdateDisplayExtent(); - wxvtkrenderwindowinteractor->Render(); - imageViewer->GetRenderer()->ResetCameraClippingRange(); + //imageViewer->UpdateDisplayExtent(); + // wxvtkrenderwindowinteractor->Render(); + imageViewer->GetRenderer()->ResetCameraClippingRange(); } @@ -262,6 +262,8 @@ namespace bbwxvtk // when window is shown void Viewer2D::bbUserOnShow() { + ((Viewer2DWidget*)bbGetOutputWidget())->Refresh(); + ((Viewer2DWidget*)bbGetOutputWidget())->Update(); ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView(); } -- 2.47.1