From: perez Date: Tue, 3 Nov 2009 10:31:56 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: CREATOOLS.2-0-3~132 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;ds=sidebyside;h=b59e57fde0bf4d116ab6e62c36a02db31f76f98e;p=creaMaracasVisu.git *** empty log message *** --- diff --git a/bbtk/bbs/appli/ExampleCutModule.bbs b/bbtk/bbs/appli/ExampleCutModule.bbs new file mode 100644 index 0000000..2a3ec6d --- /dev/null +++ b/bbtk/bbs/appli/ExampleCutModule.bbs @@ -0,0 +1,53 @@ +include vtk/boxes/bbLoadHola +load vtk +load wxvtk +load creaMaracasVisu +load std +load wx + + +new LoadHola image +#new FileSelector openFileDialog + # set openFileDialog.Wildcard "(*.mhd)|*.mhd" +#new MetaImageReader image1 +# connect openFileDialog.Out image1.In +#new ImageCastToUShort image +# connect image1.Out image.In + + +#new ViewerMPR view1 +new ViewerNV view1 + set view1.nTypeView "6" + connect image.Out view1.In + +new CutModule cut + connect view1.Interactor1 cut.Interactor + connect view1.Renderer1 cut.Renderer + connect image.Out cut.In + +new ViewerNV view2 + set view2.nTypeView "6" + connect cut.Out view2.In + +#connect view1.BoxChange cut.BoxExecute + + +new LayoutLine layoutline1 + new LayoutTab laytab + connect laytab.Widget layoutline1.Widget1 + connect view1.Widget laytab.Widget1 + connect view2.Widget laytab.Widget2 + +new LayoutLine layoutline2 + connect cut.Widget layoutline2.Widget1 + +new LayoutSplit layoutsplit + set layoutsplit.Orientation H + set layoutsplit.Proportion 80 + connect layoutline1.Widget layoutsplit.Widget1 + connect layoutline2.Widget layoutsplit.Widget2 + +exec layoutsplit + +set cut.BoxExecute 1 +exec cut diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.cxx index 5b5ae87..70d05bd 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasMultipleVolumeRendererManager.cxx @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: wxMaracasMultipleVolumeRendererManager.cxx,v $ Language: C++ - Date: $Date: 2009/10/30 20:06:07 $ - Version: $Revision: 1.4 $ + Date: $Date: 2009/11/03 10:32:38 $ + Version: $Revision: 1.5 $ Copyright: (c) 2002, 2003 License: @@ -41,7 +41,7 @@ int wxMaracasMultipleVolumeRendererManager::addVolume(vtkImageData* vol, std::st checkInvariant(); if(vol != NULL){ wxMaracasMultipleVolumeRendererManagerData* data = new wxMaracasMultipleVolumeRendererManagerData(vol, dataname); - prop3Dvect.push_back(data); + prop3Dvect.push_back(data); _renderer->AddActor(data->getProp3D()); data->setId(_idCount); _idCount++;