From: Eduardo Davila Date: Tue, 10 Jun 2008 19:19:41 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: r0.6.1~29 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b60f4996d8155665b79e20f85999f287bf1d73d3;p=bbtk.git *** empty log message *** --- diff --git a/kernel/cmake/BBTKBuildAllOption.cmake b/kernel/cmake/BBTKBuildAllOption.cmake index 599fd81..109924b 100644 --- a/kernel/cmake/BBTKBuildAllOption.cmake +++ b/kernel/cmake/BBTKBuildAllOption.cmake @@ -3,7 +3,7 @@ # for which the macro SWITCH_ON_IF_BUILD_ALL have been used are set to ON # The -- prepended to the options ensure that it will appear as the # first option when running ccmake/CMakeSetup -OPTION(--BUILD_ALL "Build all ?" OFF) +OPTION(--BUILD_ALL "Build all ?" ON) #OPTION(--SET_BUILD_ALL_OFF "Build all ?" OFF) #MARK_AS_ADVANCED(--SET_BUILD_ALL_OFF) diff --git a/kernel/cmake/BBTKConfigurePackage.cmake b/kernel/cmake/BBTKConfigurePackage.cmake index e7ab6b1..406b17f 100644 --- a/kernel/cmake/BBTKConfigurePackage.cmake +++ b/kernel/cmake/BBTKConfigurePackage.cmake @@ -1,3 +1,4 @@ + #--------------------------------------------------------------------------- # If not a core package must include necessary cmake scripts IF(NOT BBTK_CORE_PACKAGE) @@ -13,6 +14,11 @@ IF(NOT BBTK_CORE_PACKAGE) ENDIF(NOT BBTK_CORE_PACKAGE) #--------------------------------------------------------------------------- +#---------------------------------------------------------------------------- +# USER DEFINED ADDITIONAL INCLUDE DIRS +INCLUDE_DIRECTORIES(${${BBTK_PACKAGE_NAME}_INCLUDE_DIRS}) +#---------------------------------------------------------------------------- + #----------------------------------------------------------------------------- SET(${BBTK_PACKAGE_NAME}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/kernel/cmake/BBTKConfigurePackage_bbs.cmake b/kernel/cmake/BBTKConfigurePackage_bbs.cmake index 025a901..b7eeddf 100644 --- a/kernel/cmake/BBTKConfigurePackage_bbs.cmake +++ b/kernel/cmake/BBTKConfigurePackage_bbs.cmake @@ -1,5 +1,4 @@ - #---------------------------------------------------------------------------- IF(${BBTK_PACKAGE_NAME}_INCLUDE_ALL_BBS_BOXES) FILE(GLOB @@ -42,7 +41,7 @@ BBTK_CREATE_PACKAGE_INCLUDE_SCRIPT( IF(BBTK_CORE_PACKAGE) # If a core package set option from bbtk global one IF (BUILD_BBS_APPLI_BINARIES) - SET(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_BBS_APP ON) + SET(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_BBS_APP OFF) ELSE (BUILD_BBS_APPLI_BINARIES) SET(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_BBS_APP OFF) ENDIF (BUILD_BBS_APPLI_BINARIES) @@ -51,7 +50,7 @@ ELSE(BBTK_CORE_PACKAGE) # Create the option OPTION(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_BBS_APP "Build binaries for bbs applications of package ${BBTK_PACKAGE_NAME} ?" OFF) - SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_BBS_APP) +##EED SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}_BBS_APP) ENDIF(BBTK_CORE_PACKAGE) #--------------------------------------------------------------------------- diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake index c7ba3dc..79a44e0 100644 --- a/kernel/cmake/BBTKConfigurePackage_src.cmake +++ b/kernel/cmake/BBTKConfigurePackage_src.cmake @@ -8,11 +8,6 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ) #---------------------------------------------------------------------------- -#---------------------------------------------------------------------------- -# USER DEFINED ADDITIONAL INCLUDE DIRS -# NB : PATHS PROVIDED BY THE USER ARE RELATIVE TO THE PARENT DIR -INCLUDE_DIRECTORIES(../${${BBTK_PACKAGE_NAME}_INCLUDE_DIRS}) -#---------------------------------------------------------------------------- #---------------------------------------------------------------------------- diff --git a/kernel/cmake/BBTKDefineOptions.cmake b/kernel/cmake/BBTKDefineOptions.cmake index 3ef49fc..3181ca4 100644 --- a/kernel/cmake/BBTKDefineOptions.cmake +++ b/kernel/cmake/BBTKDefineOptions.cmake @@ -7,7 +7,7 @@ OPTION ( BBTK_COMPILE_ERROR_MESSAGES "Compile bbtk error messages ?" ON) #----------------------------------------------------------------------------- OPTION(BUILD_APPLICATIONS "Build Applications (bbi, bbfy, ...)" ON) OPTION(BUILD_BBS_APPLI_BINARIES "Build binaries for bbs applications of all packages" OFF) -SWITCH_ON_IF_BUILD_ALL(BUILD_BBS_APPLI_BINARIES) +##EED SWITCH_ON_IF_BUILD_ALL(BUILD_BBS_APPLI_BINARIES) #----------------------------------------------------------------------------- OPTION(BUILD_BBTK_DOC "Build documentation for bbtk." OFF) SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_DOC) diff --git a/kernel/cmake/BBTKFindLibraries.cmake b/kernel/cmake/BBTKFindLibraries.cmake index 619be1a..1763d83 100644 --- a/kernel/cmake/BBTKFindLibraries.cmake +++ b/kernel/cmake/BBTKFindLibraries.cmake @@ -104,6 +104,7 @@ IF(USE_ITK) ENDIF(USE_ITK) #----------------------------------------------------------------------------- + #----------------------------------------------------------------------------- #OPTION(USE_GDCM "Build GDCM-based black boxes" OFF) IF(USE_GDCM) @@ -127,6 +128,7 @@ IF(USE_GDCM) #gdcm gdcmjpeg8 gdcmjpeg12 gdcmjpeg16 ) + # IF(USE_VTK ) # SET(BBTK_GDCM_LIBRARIES # ${BBTK_GDCM_LIBRARIES} @@ -136,6 +138,7 @@ IF(USE_GDCM) ENDIF(GDCM_FOUND) ENDIF(USE_GDCM) + #----------------------------------------------------------------------------- #----------------------------------------------------------------------------- diff --git a/kernel/install/CMakeLists.txt b/kernel/install/CMakeLists.txt index 857f212..4e869e3 100644 --- a/kernel/install/CMakeLists.txt +++ b/kernel/install/CMakeLists.txt @@ -7,8 +7,11 @@ ENDIF(UNIX) # Aditional INSTALL for CPACK mecanism. IF(WIN32) - IF(USE_VTK) + STRING(REGEX REPLACE "\\\\" "/" WINDIR "$ENV{WINDIR}") + INSTALL( FILES ${WINDIR}/system32/msvcp71d.dll DESTINATION bin/ ) + INSTALL( FILES ${WINDIR}/system32/msvcr71d.dll DESTINATION bin/ ) + IF(USE_VTK) IF(${VTK_DIR}) # ????????? Why this line doesn't works ...????? FILE(GLOB_RECURSE LST_FILE_VTKDLL RELATIVE ${VTK_DIR} *.dll ) diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx index 5cffb50..0d15072 100644 --- a/kernel/src/bbtkBlackBox.cxx +++ b/kernel/src/bbtkBlackBox.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkBlackBox.cxx,v $ Language: C++ -Date: $Date: 2008/05/15 08:02:36 $ -Version: $Revision: 1.19 $ +Date: $Date: 2008/06/10 19:19:42 $ +Version: $Revision: 1.20 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -145,7 +145,8 @@ namespace bbtk "=> BlackBox::bbExecute() [" <Add( btnInclude ); + btnsSizer->Add( btnInclude ); btnsSizer->Add( btnReset ); btnsSizer->Add( btnConfig ); - btnsSizer->Add( btnGraphS ); - btnsSizer->Add( btnGraphD ); + btnsSizer->Add( btnGraphS ); + btnsSizer->Add( btnGraphD ); btnsSizer->Add( btnHelp ); + btnsSizer->Add( btnHelpBrowser ); sizer->Add(btnsSizer,0,wxTOP|wxGROW, 10 ); @@ -181,6 +183,13 @@ namespace bbtk bbtkDebugMessage("gui",2,"WxGUICommand::OnBtnHelp"<Show(); + } } // namespace bbtk diff --git a/kernel/src/bbtkWxGUICommand.h b/kernel/src/bbtkWxGUICommand.h index 318a63c..7c6b114 100644 --- a/kernel/src/bbtkWxGUICommand.h +++ b/kernel/src/bbtkWxGUICommand.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUICommand.h,v $ Language: C++ - Date: $Date: 2008/03/20 09:51:29 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/06/10 19:19:42 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -68,6 +68,7 @@ namespace bbtk void OnBtnGraphS(wxCommandEvent& event); void OnBtnGraphD(wxCommandEvent& event); void OnBtnHelp(wxCommandEvent& event); + void OnBtnHelpBrowser(wxCommandEvent& event); void SendCommand(const std::string& command); private : @@ -85,7 +86,8 @@ namespace bbtk ID_Btn_Config, ID_Btn_GraphS, ID_Btn_GraphD, - ID_Btn_Help + ID_Btn_Help, + ID_Btn_HelpBrowser }; DECLARE_EVENT_TABLE() diff --git a/kernel/src/bbtkWxGUIHtmlBrowser.cxx b/kernel/src/bbtkWxGUIHtmlBrowser.cxx index 6e47475..c44820f 100644 --- a/kernel/src/bbtkWxGUIHtmlBrowser.cxx +++ b/kernel/src/bbtkWxGUIHtmlBrowser.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUIHtmlBrowser.cxx,v $ Language: C++ - Date: $Date: 2008/04/22 14:30:25 $ - Version: $Revision: 1.5 $ + Date: $Date: 2008/06/10 19:19:42 $ + 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 @@ -73,6 +73,17 @@ namespace bbtk */ +//EED2 BEGIN_EVENT_TABLE(WxHtmlWindow, wxPanel) +//EED2 EVT_SIZE(WxHtmlWindow::OnSize) +//EED2 END_EVENT_TABLE() + +//EED2 void WxHtmlWindow::OnSize( wxSizeEvent& ) +//EED2 { +//EED2 printf("EED WxHtmlWindow::OnSize \n" ); +//EED2 Scroll(10,500); +//EED2 } + + //======================================================================== BEGIN_EVENT_TABLE(WxGUIHtmlBrowser, wxPanel) @@ -83,6 +94,8 @@ namespace bbtk // EVT_BUTTON(include_id, WxGUIHtmlBrowser::OnIncludeFileButton ) EVT_TEXT_ENTER(url_id, WxGUIHtmlBrowser::OnURLEnter ) EVT_HTML_LINK_CLICKED(html_id, WxGUIHtmlBrowser::OnLinkClicked) + EVT_SIZE(WxGUIHtmlBrowser::OnSize) + END_EVENT_TABLE() //======================================================================== @@ -309,6 +322,22 @@ namespace bbtk //======================================================================== + //======================================================================== + void WxGUIHtmlBrowser::OnSize(wxSizeEvent& e) + { + mwxHtmlWindow->EnableScrolling(true,true); + if ( mwxURL->GetValue()!=wxString(_T("")) ) + { +// ?????????? No funciona ....????? +//EED2 mwxHtmlWindow->LoadPage(mwxURL->GetValue()); +// printf("EED WxGUIHtmlBrowser::OnSize %s \n", mwxURL->GetValue().c_str() ); +//EED2 mwxHtmlWindow->Scroll( 10, 500); + } else { +// GoHome(); + } + e.Skip(true); + } + /* void WxGUIHtmlBrowser::OnCell(wxHtmlCellEvent& ) { diff --git a/kernel/src/bbtkWxGUIHtmlBrowser.h b/kernel/src/bbtkWxGUIHtmlBrowser.h index 52ac34a..4979a34 100644 --- a/kernel/src/bbtkWxGUIHtmlBrowser.h +++ b/kernel/src/bbtkWxGUIHtmlBrowser.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUIHtmlBrowser.h,v $ Language: C++ - Date: $Date: 2008/03/21 18:31:57 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/06/10 19:19:42 $ + 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 @@ -54,14 +54,19 @@ namespace bbtk _T("bbtk::WxGUIHtmlBrowser")), mBrowser(browser) { - - } + SetBorders(30); + }; // wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType type,const wxString& url, wxString *redirect); //EED virtual void OnLinkClicked(const wxHtmlLinkInfo& link); +//EED2 void OnSize( wxSizeEvent&); + + private: WxGUIHtmlBrowser* mBrowser; + // any class wishing to process wxWidgets events must use this macro +//EED2 DECLARE_EVENT_TABLE() }; @@ -98,6 +103,8 @@ namespace bbtk // void OnRunButton(wxCommandEvent& ); void OnLinkClicked(wxHtmlLinkEvent& ); void OnURLEnter( wxCommandEvent&); + void OnSize( wxSizeEvent&); + void UpdateURL(); // void OnCell(wxHtmlCellEvent& ); diff --git a/kernel/src/bbtkWxGUIPackageBrowser2.cxx b/kernel/src/bbtkWxGUIPackageBrowser2.cxx index ed28087..159a018 100644 --- a/kernel/src/bbtkWxGUIPackageBrowser2.cxx +++ b/kernel/src/bbtkWxGUIPackageBrowser2.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUIPackageBrowser2.cxx,v $ Language: C++ -Date: $Date: 2008/04/24 12:56:39 $ -Version: $Revision: 1.8 $ +Date: $Date: 2008/06/10 19:19:42 $ +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 @@ -1137,7 +1137,7 @@ namespace bbtk SetSizer(sizer); // Creates the parent window of all bbtk windows as a child of this - Wx::CreateTopWindow(this); +// Wx::CreateTopWindow(this); // Add the method OnWxSignal as a Wx::Signal observer //bbtkAddWxSignalObserver(WxGUIPackageBrowser2Window::OnWxSignal); diff --git a/kernel/src/bbtkWxGUIScriptingInterface.cxx b/kernel/src/bbtkWxGUIScriptingInterface.cxx index de7e616..db654b8 100644 --- a/kernel/src/bbtkWxGUIScriptingInterface.cxx +++ b/kernel/src/bbtkWxGUIScriptingInterface.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUIScriptingInterface.cxx,v $ Language: C++ - Date: $Date: 2008/05/15 08:02:36 $ - Version: $Revision: 1.10 $ + Date: $Date: 2008/06/10 19:19:42 $ + Version: $Revision: 1.11 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -57,7 +57,8 @@ namespace bbtk ID_Menu_Windows_Help, ID_Menu_Windows_Messages, ID_Menu_Windows_Command, - ID_Menu_Windows_Save + ID_Menu_Windows_Save, + ID_Menu_Windows_HelpBrowser // ID_Button_Run }; @@ -89,7 +90,7 @@ namespace bbtk menuTools->Append( ID_Menu_CreateBlackBox, _T("Create &blackbox") ); menuTools->Append( ID_Menu_ShowImageGraph, _T("&Show last image graph") ); menuTools->Append( ID_Menu_CreateIndex, _T("&Generate index") ); - + wxMenu *menuWindows = new wxMenu; menuWindows->AppendCheckItem(ID_Menu_Windows_Files, _T("Show 'files' panel") )->Check(); @@ -99,6 +100,8 @@ namespace bbtk _T("Show 'messages' panel") )->Check(); menuWindows->AppendCheckItem(ID_Menu_Windows_Command, _T("Show 'command' panel") )->Check(); + menuWindows->AppendSeparator(); + menuWindows->Append( ID_Menu_Windows_HelpBrowser, _T("Show help &Browser") ); menuWindows->AppendSeparator(); menuWindows->Append ( ID_Menu_Windows_Save, _T("Save interface configuration")); @@ -123,10 +126,11 @@ namespace bbtk // mWxGUITextEditor = new WxGUITextEditor(this,this); mWxGUITextEditor->SetFileNameFilter("*.bbs"); + + mWxGUIHtmlBrowser = new WxGUIHtmlBrowser(this,wxSize(200,0),this); - mWxGUIHtmlBrowser = new WxGUIHtmlBrowser(this,wxSize(200,0),this); - /* + /* wxBitmap bmp_run(cc_run_xpm); mwxButtonRun = new wxBitmapButton( this, ID_Button_Run,bmp_run);//_T("Run") ); */ @@ -161,6 +165,7 @@ namespace bbtk mwxNotebook->AddPage(mWxGUICommand,_T("Command"),true); + m_mgr.AddPane(mwxNotebook, wxAuiPaneInfo().Name(wxT("nb")) .CaptionVisible(false) @@ -344,6 +349,17 @@ namespace bbtk } //================================================================ + //================================================================ + void WxGUIScriptingInterface::OnMenuWindowsHelpBrowser(wxCommandEvent& WXUNUSED(event)) + { + wxBusyCursor wait; + WxGUIPackageBrowser2 *browser = new WxGUIPackageBrowser2(this); + browser->IncludeAll(); + mwxNotebook->AddPage(browser,_T("Help Browser"),true); + } + //================================================================ + + //================================================================ void WxGUIScriptingInterface::OnMenuCreatePackage(wxCommandEvent& WXUNUSED(event)) @@ -515,6 +531,7 @@ namespace bbtk EVT_MENU(ID_Menu_Windows_Help, WxGUIScriptingInterface::OnMenuWindowsHelp) EVT_MENU(ID_Menu_Windows_Messages, WxGUIScriptingInterface::OnMenuWindowsMessages) EVT_MENU(ID_Menu_Windows_Command, WxGUIScriptingInterface::OnMenuWindowsCommand) + EVT_MENU(ID_Menu_Windows_HelpBrowser, WxGUIScriptingInterface::OnMenuWindowsHelpBrowser) EVT_AUI_PANE_CLOSE(WxGUIScriptingInterface::OnPaneClose) // EVT_BUTTON(ID_Button_Run, WxGUIScriptingInterface::OnButtonRun ) END_EVENT_TABLE() diff --git a/kernel/src/bbtkWxGUIScriptingInterface.h b/kernel/src/bbtkWxGUIScriptingInterface.h index b3c19e2..ad6d6c9 100644 --- a/kernel/src/bbtkWxGUIScriptingInterface.h +++ b/kernel/src/bbtkWxGUIScriptingInterface.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxGUIScriptingInterface.h,v $ Language: C++ - Date: $Date: 2008/04/25 07:33:17 $ - Version: $Revision: 1.6 $ + Date: $Date: 2008/06/10 19:19:42 $ + Version: $Revision: 1.7 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -48,6 +48,7 @@ #include "bbtkWxGUICommand.h" #include "bbtkWxGUIOutputMessages.h" #include "bbtkWxGUIHtmlBrowser.h" +#include "bbtkWxGUIPackageBrowser2.h" namespace bbtk { @@ -96,6 +97,7 @@ namespace bbtk void OnMenuCreateIndex(wxCommandEvent& WXUNUSED(event)); void OnMenuWindowsFiles(wxCommandEvent& event); void OnMenuWindowsHelp(wxCommandEvent& event); + void OnMenuWindowsHelpBrowser(wxCommandEvent& event); void OnMenuWindowsMessages(wxCommandEvent& event); void OnMenuWindowsCommand(wxCommandEvent& event); void OnMenuWindowsSave( wxCommandEvent& WXUNUSED(event)); @@ -129,10 +131,11 @@ namespace bbtk // wxAuiNotebook* mwxNotebook; // wxPanel *mwxPageCommand, *mwxPageHelp; - WxGUICommand* mWxGUICommand; - WxGUIOutputMessages* mWxGUIOutputMessages; - WxGUIHtmlBrowser* mWxGUIHtmlBrowser; - WxGUITextEditor* mWxGUITextEditor; + WxGUICommand *mWxGUICommand; + WxGUIOutputMessages *mWxGUIOutputMessages; + WxGUIHtmlBrowser *mWxGUIHtmlBrowser; + WxGUITextEditor *mWxGUITextEditor; + WxGUIPackageBrowser2 *mWxGUIPackageBrowser2; wxMenuItem* mwxMenuItemReset; // wxButton* mwxButtonRun; diff --git a/packages/vtk/data/hola.mhd b/packages/vtk/data/hola.mhd index e1af6ff..f074cc9 100644 --- a/packages/vtk/data/hola.mhd +++ b/packages/vtk/data/hola.mhd @@ -2,8 +2,8 @@ ObjectType = Image NDims = 3 BinaryData = True BinaryDataByteOrderMSB = False -ElementSpacing = 0.796875 0.796875 0.7 -DimSize = 112 131 192 +ElementSpacing = 0.7 0.7 0.7 +DimSize = 127 147 187 Position = 0 0 0 ElementNumberOfChannels = 1 ElementType = MET_USHORT diff --git a/packages/vtk/data/hola.raw b/packages/vtk/data/hola.raw index fbb1136..9945f10 100644 Binary files a/packages/vtk/data/hola.raw and b/packages/vtk/data/hola.raw differ diff --git a/packages/wx/src/bbwxRadioButton.cxx b/packages/wx/src/bbwxRadioButton.cxx index 4a23029..0b6a040 100644 --- a/packages/wx/src/bbwxRadioButton.cxx +++ b/packages/wx/src/bbwxRadioButton.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxRadioButton.cxx,v $ Language: C++ - Date: $Date: 2008/04/18 12:59:53 $ - Version: $Revision: 1.4 $ + Date: $Date: 2008/06/10 19:19:49 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -192,6 +192,7 @@ namespace bbwx bbtk::std2wx(bbGetInputTitle()), lstIn ); + bbSetOutputOut( bbGetInputIn() ); bbSetOutputWidget( w ); } diff --git a/packages/wx/src/bbwxRadioButton.h b/packages/wx/src/bbwxRadioButton.h index c6c4b7a..d2cfcf0 100644 --- a/packages/wx/src/bbwxRadioButton.h +++ b/packages/wx/src/bbwxRadioButton.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxRadioButton.h,v $ Language: C++ - Date: $Date: 2008/04/18 12:59:53 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/06/10 19:19:50 $ + 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 @@ -100,7 +100,6 @@ namespace bbwx protected: virtual void bbUserConstructor(); - }; //================================================================= diff --git a/packages/wxvtk/bbs/appli/ExampleIsoSurfaceWithControls.bbs b/packages/wxvtk/bbs/appli/ExampleIsoSurfaceWithControls.bbs index 0182530..b5c8596 100644 --- a/packages/wxvtk/bbs/appli/ExampleIsoSurfaceWithControls.bbs +++ b/packages/wxvtk/bbs/appli/ExampleIsoSurfaceWithControls.bbs @@ -21,7 +21,7 @@ connect surface1.BoxChange refresh.In1 connect surface2.BoxChange refresh.In2 connect refresh.Out viewer.BoxExecute -new LayoutLine main +new LayoutSplit main new LayoutLine controls connect viewer.Widget main.Widget1 connect controls.Widget main.Widget2 @@ -38,6 +38,8 @@ set surface2.Isovalue 200 set surface2.Opacity 20 set surface2.Title "Iso-surface 2" +set main.WinWidth 1200 +set main.WinHide 1000 #message All 9 exec main diff --git a/packages/wxvtk/bbs/appli/ExampleView3DImage1.bbs b/packages/wxvtk/bbs/appli/ExampleView3DImage1.bbs index 1839a2c..e0dfc80 100644 --- a/packages/wxvtk/bbs/appli/ExampleView3DImage1.bbs +++ b/packages/wxvtk/bbs/appli/ExampleView3DImage1.bbs @@ -29,13 +29,14 @@ connect surface.Widget controls.Widget1 set surface.Isovalue 100 set surface.Opacity 100 -set surface.Colour "0.5 0 0" +set surface.Colour "1.0 0.31 0.31" set surface.Title "Iso-surface" load std set viewer.WinTitle "ExampleView3DImage1" set viewer.WinWidth 350 set viewer.WinHeight 400 +set viewer.Stereo TRUE exec viewer diff --git a/packages/wxvtk/doc/bbdoc/ExampleView3DImage1.jpg b/packages/wxvtk/doc/bbdoc/ExampleView3DImage1.jpg index 534dd32..bb21a2c 100644 Binary files a/packages/wxvtk/doc/bbdoc/ExampleView3DImage1.jpg and b/packages/wxvtk/doc/bbdoc/ExampleView3DImage1.jpg differ diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.cxx b/packages/wxvtk/src/bbwxvtkViewer3D.cxx index 63f833e..bb2d693 100644 --- a/packages/wxvtk/src/bbwxvtkViewer3D.cxx +++ b/packages/wxvtk/src/bbwxvtkViewer3D.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxvtkViewer3D.cxx,v $ Language: C++ - Date: $Date: 2008/05/14 10:26:32 $ - Version: $Revision: 1.6 $ + Date: $Date: 2008/06/10 19:19:55 $ + Version: $Revision: 1.7 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -36,7 +36,7 @@ namespace bbwxvtk BBTK_ADD_BLACK_BOX_TO_PACKAGE(wxvtk,Viewer3D); //------------------------------------------------------------------------- - Viewer3DWidget::Viewer3DWidget(Viewer3D* box, wxWindow *parent) + Viewer3DWidget::Viewer3DWidget(Viewer3D* box, wxWindow *parent, bool stereo) : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL), mBox(box) @@ -48,7 +48,16 @@ namespace bbwxvtk renderer = vtkRenderer::New(); renderwindow = vtkRenderWindow::New(); + renderwindow->AddRenderer(renderer); + + if (stereo==true){ + renderwindow->SetStereoCapableWindow(1); + //renderwindow->SetStereoTypeToCrystalEyes(); + renderwindow->SetStereoTypeToRedBlue(); + renderwindow->SetStereoRender(1); + } + wxvtkrenderwindowinteractor->SetRenderWindow(renderwindow); interactorstyle = vtkInteractorStyleTrackballCamera ::New(); @@ -126,6 +135,7 @@ namespace bbwxvtk bbSetInputObs3(NULL); bbSetInputObs4(NULL); bbSetInputObs5(NULL); + bbSetInputStereo(false); bbSetOutputRenderer( NULL ); bbSetOutputInteractor( NULL ); } @@ -146,7 +156,7 @@ namespace bbwxvtk { bbtkDebugMessageInc("Core",9,"Viewer3D::CreateWidget()"<Update(); diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.h b/packages/wxvtk/src/bbwxvtkViewer3D.h index 6eb48f0..edb8963 100644 --- a/packages/wxvtk/src/bbwxvtkViewer3D.h +++ b/packages/wxvtk/src/bbwxvtkViewer3D.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxvtkViewer3D.h,v $ Language: C++ - Date: $Date: 2008/05/09 10:39:47 $ - Version: $Revision: 1.6 $ + Date: $Date: 2008/06/10 19:19:55 $ + Version: $Revision: 1.7 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -54,7 +54,7 @@ namespace bbwxvtk class Viewer3DWidget : public wxPanel { public: - Viewer3DWidget(Viewer3D* box, wxWindow *parent); + Viewer3DWidget(Viewer3D* box, wxWindow *parent, bool stereo); ~Viewer3DWidget(); void Update(); @@ -85,6 +85,7 @@ namespace bbwxvtk BBTK_DECLARE_INPUT(Obs3, vtkInteractorObserver *); BBTK_DECLARE_INPUT(Obs4, vtkInteractorObserver *); BBTK_DECLARE_INPUT(Obs5, vtkInteractorObserver *); + BBTK_DECLARE_INPUT(Stereo, bool); BBTK_DECLARE_OUTPUT(Renderer,vtkRenderer*); BBTK_DECLARE_OUTPUT(Interactor,wxVTKRenderWindowInteractor*); BBTK_PROCESS(Process); @@ -113,6 +114,7 @@ namespace bbwxvtk BBTK_INPUT(Viewer3D,Obs3,"Input observer",vtkInteractorObserver *,""); BBTK_INPUT(Viewer3D,Obs4,"Input observer",vtkInteractorObserver *,""); BBTK_INPUT(Viewer3D,Obs5,"Input observer",vtkInteractorObserver *,""); + BBTK_INPUT(Viewer3D,Stereo,"Stereo with Red-Blue filter. False/True (default False)",bool,""); BBTK_OUTPUT(Viewer3D,Renderer,"Renderer to which actors can be added.",vtkRenderer*,""); BBTK_OUTPUT(Viewer3D,Interactor,"Interactor with which vtk widgets can interact",wxVTKRenderWindowInteractor*,""); BBTK_END_DESCRIBE_BLACK_BOX(Viewer3D);