From: Eduardo Davila Date: Thu, 26 Jun 2008 07:37:04 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: r0.6.1~11 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=62f21094493592cc2ccf1f105db791fb0ebbe2d0;p=bbtk.git *** empty log message *** --- 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 0000000..8ffc87a Binary files /dev/null and b/packages/vtk/doc/bbdoc/ExampleGaussianSmooth.JPG differ diff --git a/packages/vtk/doc/bbdoc/ExampleGaussianSmooth_02.JPG b/packages/vtk/doc/bbdoc/ExampleGaussianSmooth_02.JPG new file mode 100644 index 0000000..4f38aea Binary files /dev/null and b/packages/vtk/doc/bbdoc/ExampleGaussianSmooth_02.JPG differ diff --git a/packages/wx/src/bbwxColourSelector.cxx b/packages/wx/src/bbwxColourSelector.cxx index 9b03e2d..80cfe68 100644 --- a/packages/wx/src/bbwxColourSelector.cxx +++ b/packages/wx/src/bbwxColourSelector.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxColourSelector.cxx,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 @@ -43,7 +43,11 @@ namespace bbwx <ShowModal(); + 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(); }