From 35a5d83be3d84f9d1544b8d3ad0de044f1e65286 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Mon, 31 Oct 2011 16:23:54 +0000 Subject: [PATCH] no message --- bbtk/bbs/appli/exampleContourCrown.bbg | 264 ++++++++++++++++++ bbtk/bbs/appli/exampleContourCrown.bbs | 111 ++++++++ bbtk/bbs/appli/exampleContourCrown.bbs_bug | 105 ------- .../bbcreaMaracasVisuColorLayerImageView.cxx | 2 - bbtk/src/bbmaracasvisuContourCrown.cxx | 38 ++- bbtk/src/bbmaracasvisuContourCrown.h | 1 + .../VolumeRenderer/volumerendererdata.cxx | 24 +- .../Base/VolumeRenderer/volumerendererdata.h | 10 +- .../volumerenderermanagerdata.cxx | 78 ++++-- .../volumerenderermanagerdata.h | 12 +- .../bouml/wxVtkViewer/wxVtkViewer/128002 | 3 +- .../wxVtkViewer/wxVtkViewer/128002.diagram | 198 ++++++------- .../bouml/wxVtkViewer/wxVtkViewer/2.session | 4 +- .../wxWindows/Contour/ContourCrownWidget.cxx | 68 ++--- .../wxWindows/Contour/ContourCrownWidget.h | 6 +- .../widgets/wxMaracas_ViewerWidget.cxx | 6 +- .../wxWindows/widgets/wxVtkClipping3DView.cxx | 2 +- 17 files changed, 619 insertions(+), 313 deletions(-) create mode 100644 bbtk/bbs/appli/exampleContourCrown.bbg create mode 100644 bbtk/bbs/appli/exampleContourCrown.bbs delete mode 100644 bbtk/bbs/appli/exampleContourCrown.bbs_bug diff --git a/bbtk/bbs/appli/exampleContourCrown.bbg b/bbtk/bbs/appli/exampleContourCrown.bbg new file mode 100644 index 0000000..e5302ec --- /dev/null +++ b/bbtk/bbs/appli/exampleContourCrown.bbg @@ -0,0 +1,264 @@ +# ---------------------------------- +# - BBTKGEditor v 1.2 BBG BlackBox Diagram file +# - /Users/davila/Creatis/All5/creatools_source/creaMaracasVisu/bbtk/bbs/appli/exampleContourCrown.bbg +# ---------------------------------- + +APP_START +CATEGORY: +DESCRIPTION:Description ?? +AUTHOR:Author ?? +COMPLEXBOX:FALSE +BOXES:19 +BOX +wx:LayoutSplit:splitMain +ISEXEC:TRUE +149.084350:-605.986132:900.000000 +194.659350:-615.986132:900.000000 +PORT +Orientation:"VERTICAL" +PORT +Proportion:"10" +FIN_BOX +BOX +wx:LayoutLine:sizerA +ISEXEC:FALSE +238.863987:-348.527215:900.000000 +296.423987:-358.527215:900.000000 +FIN_BOX +BOX +wx:LayoutLine:sizerB +ISEXEC:FALSE +156.210523:-429.477587:900.000000 +213.770523:-439.477587:900.000000 +FIN_BOX +BOX +wx:CommandButton:runBtn +ISEXEC:FALSE +-20.833127:-229.892228:900.000000 +24.741873:-239.892228:900.000000 +PORT +Label:"RUN" +FIN_BOX +BOX +creaMaracasVisu:ContourCrown:contourCrown +ISEXEC:FALSE +189.882981:-292.295231:900.000000 +261.057981:-302.295231:900.000000 +FIN_BOX +BOX +creaMaracasVisu:ContourStatistics:contourStatistics +ISEXEC:FALSE +158.397016:-364.609197:900.000000 +229.572016:-374.609197:900.000000 +FIN_BOX +BOX +creaMaracasVisu:ViewerNV:viewerMaracas +ISEXEC:FALSE +115.841453:-241.872327:900.000000 +176.481453:-251.872327:900.000000 +PORT +nTypeView:"-1" +FIN_BOX +BOX +creaMaracasVisu:ViewerNV:viewerMaracasResultValues +ISEXEC:FALSE +76.829950:-320.915974:900.000000 +148.004950:-330.915974:900.000000 +PORT +nTypeView:"-1" +FIN_BOX +BOX +creaMaracasVisu:ViewerNV:viewerMaracasResultMask +ISEXEC:FALSE +29.022916:-358.385611:900.000000 +100.197916:-368.385611:900.000000 +PORT +nTypeView:"-1" +FIN_BOX +BOX +vtk:MetaImageReader:reader +ISEXEC:FALSE +178.265533:-211.334014:900.000000 +223.840533:-221.334014:900.000000 +FIN_BOX +BOX +std:PrependPackageDataPath:prependDatapath +ISEXEC:FALSE +146.080375:-190.048389:900.000000 +217.255375:-200.048389:900.000000 +PORT +In:"vtk/hola.mhd" +FIN_BOX +BOX +wx:LayoutLine:sizerResults +ISEXEC:FALSE +-82.504943:-530.487756:900.000000 +-24.944943:-540.487756:900.000000 +FIN_BOX +BOX +wx:LayoutSplit:splitup +ISEXEC:FALSE +177.791593:-580.801704:900.000000 +223.366593:-590.801704:900.000000 +PORT +Orientation:"HORIZONTAL" +FIN_BOX +BOX +wx:OutputText:averageText +ISEXEC:FALSE +-188.846726:-471.048576:900.000000 +-143.271726:-481.048576:900.000000 +PORT +Title:"Average" +FIN_BOX +BOX +wx:OutputText:maxText +ISEXEC:FALSE +-136.330406:-473.000554:900.000000 +-90.755406:-483.000554:900.000000 +PORT +Title:"Max" +FIN_BOX +BOX +wx:OutputText:minText +ISEXEC:FALSE +-72.198258:-474.534913:900.000000 +-26.623258:-484.534913:900.000000 +PORT +Title:"Min" +FIN_BOX +BOX +wx:OutputText:standarDeviationText +ISEXEC:FALSE +-21.427513:-474.074636:900.000000 +49.747487:-484.074636:900.000000 +PORT +Title:"Standar deviation" +FIN_BOX +BOX +wx:OutputText:nPointsText +ISEXEC:FALSE +59.440051:-473.396574:900.000000 +105.015051:-483.396574:900.000000 +PORT +Title:"n Points" +FIN_BOX +BOX +toolsbbtk:ImageVtkPropertiesWidget:Box19 +ISEXEC:FALSE +172.363116:-392.715713:900.000000 +243.538116:-402.715713:900.000000 +FIN_BOX +CONNECTIONS:37 +CONNECTION +contourCrown:LstValue:contourStatistics:LstValue +NumberOfControlPoints:0 +CONNECTION +prependDatapath:Out:reader:In +NumberOfControlPoints:0 +CONNECTION +viewerMaracas:wxVtkBaseView1:contourCrown:wxVtkBaseView +NumberOfControlPoints:0 +CONNECTION +reader:Out:viewerMaracas:In +NumberOfControlPoints:0 +CONNECTION +reader:Out:contourCrown:In +NumberOfControlPoints:0 +CONNECTION +contourCrown:ImageValueResult:viewerMaracasResultValues:In +NumberOfControlPoints:0 +CONNECTION +contourCrown:ImageMaskResult:viewerMaracasResultMask:In +NumberOfControlPoints:0 +CONNECTION +sizerA:Widget:splitup:Widget1 +NumberOfControlPoints:0 +CONNECTION +sizerResults:Widget:splitup:Widget2 +NumberOfControlPoints:0 +CONNECTION +contourStatistics:Average:averageText:In +NumberOfControlPoints:0 +CONNECTION +contourStatistics:Max:maxText:In +NumberOfControlPoints:0 +CONNECTION +contourStatistics:Min:minText:In +NumberOfControlPoints:0 +CONNECTION +contourStatistics:StandarDeviation:standarDeviationText:In +NumberOfControlPoints:0 +CONNECTION +contourStatistics:nPoints:nPointsText:In +NumberOfControlPoints:0 +CONNECTION +averageText:Widget:sizerResults:Widget1 +NumberOfControlPoints:0 +CONNECTION +maxText:Widget:sizerResults:Widget2 +NumberOfControlPoints:0 +CONNECTION +minText:Widget:sizerResults:Widget3 +NumberOfControlPoints:0 +CONNECTION +standarDeviationText:Widget:sizerResults:Widget4 +NumberOfControlPoints:0 +CONNECTION +nPointsText:Widget:sizerResults:Widget5 +NumberOfControlPoints:0 +CONNECTION +runBtn:BoxChange:contourCrown:BoxExecute +NumberOfControlPoints:0 +CONNECTION +runBtn:BoxChange:averageText:BoxExecute +NumberOfControlPoints:0 +CONNECTION +runBtn:BoxChange:minText:BoxExecute +NumberOfControlPoints:0 +CONNECTION +runBtn:BoxChange:maxText:BoxExecute +NumberOfControlPoints:0 +CONNECTION +runBtn:BoxChange:standarDeviationText:BoxExecute +NumberOfControlPoints:0 +CONNECTION +runBtn:BoxChange:nPointsText:BoxExecute +NumberOfControlPoints:0 +CONNECTION +runBtn:BoxChange:viewerMaracasResultValues:BoxExecute +NumberOfControlPoints:0 +CONNECTION +runBtn:BoxChange:viewerMaracasResultMask:BoxExecute +NumberOfControlPoints:0 +CONNECTION +runBtn:BoxChange:viewerMaracas:BoxExecute +NumberOfControlPoints:0 +CONNECTION +splitup:Widget:splitMain:Widget2 +NumberOfControlPoints:0 +CONNECTION +contourCrown:Widget:sizerA:Widget1 +NumberOfControlPoints:0 +CONNECTION +runBtn:Widget:sizerA:Widget2 +NumberOfControlPoints:0 +CONNECTION +viewerMaracasResultValues:Widget:sizerB:Widget1 +NumberOfControlPoints:0 +CONNECTION +viewerMaracasResultMask:Widget:sizerB:Widget2 +NumberOfControlPoints:0 +CONNECTION +viewerMaracas:Widget:splitMain:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box19:widget:sizerB:Widget3 +NumberOfControlPoints:0 +CONNECTION +contourCrown:ImageMaskResult:Box19:in +NumberOfControlPoints:0 +CONNECTION +runBtn:BoxChange:sizerB:BoxExecute +NumberOfControlPoints:0 +APP_END diff --git a/bbtk/bbs/appli/exampleContourCrown.bbs b/bbtk/bbs/appli/exampleContourCrown.bbs new file mode 100644 index 0000000..7df79f8 --- /dev/null +++ b/bbtk/bbs/appli/exampleContourCrown.bbs @@ -0,0 +1,111 @@ +# ---------------------------------- +# - BBTKGEditor v 1.2 BBS BlackBox Script +# - /Users/davila/Creatis/All5/creatools_source/creaMaracasVisu/bbtk/bbs/appli/exampleContourCrown.bbs +# ---------------------------------- + +# BBTK GEditor Script +# ---------------------- + +include std +include itkvtk +include wx +include creaMaracasVisu +include vtk +include std +include toolsbbtk + +author "Author ??" +description "Description ??" +category "" + +new LayoutSplit splitMain + set splitMain.Orientation "VERTICAL" + set splitMain.Proportion "10" + +new LayoutLine sizerA + +new LayoutLine sizerB + +new CommandButton runBtn + set runBtn.Label "RUN" + +new ContourCrown contourCrown + +new ContourStatistics contourStatistics + +new ViewerNV viewerMaracas + set viewerMaracas.nTypeView "-1" + +new ViewerNV viewerMaracasResultValues + set viewerMaracasResultValues.nTypeView "-1" + +new ViewerNV viewerMaracasResultMask + set viewerMaracasResultMask.nTypeView "-1" + +new MetaImageReader reader + +new PrependPackageDataPath prependDatapath + set prependDatapath.In "vtk/hola.mhd" + +new LayoutLine sizerResults + +new LayoutSplit splitup + set splitup.Orientation "HORIZONTAL" + +new OutputText averageText + set averageText.Title "Average" + +new OutputText maxText + set maxText.Title "Max" + +new OutputText minText + set minText.Title "Min" + +new OutputText standarDeviationText + set standarDeviationText.Title "Standar deviation" + +new OutputText nPointsText + set nPointsText.Title "n Points" + +new ImageVtkPropertiesWidget Box19 + + +connect contourCrown.LstValue contourStatistics.LstValue +connect prependDatapath.Out reader.In +connect viewerMaracas.wxVtkBaseView1 contourCrown.wxVtkBaseView +connect reader.Out viewerMaracas.In +connect reader.Out contourCrown.In +connect contourCrown.ImageValueResult viewerMaracasResultValues.In +connect contourCrown.ImageMaskResult viewerMaracasResultMask.In +connect sizerA.Widget splitup.Widget1 +connect sizerResults.Widget splitup.Widget2 +connect contourStatistics.Average averageText.In +connect contourStatistics.Max maxText.In +connect contourStatistics.Min minText.In +connect contourStatistics.StandarDeviation standarDeviationText.In +connect contourStatistics.nPoints nPointsText.In +connect averageText.Widget sizerResults.Widget1 +connect maxText.Widget sizerResults.Widget2 +connect minText.Widget sizerResults.Widget3 +connect standarDeviationText.Widget sizerResults.Widget4 +connect nPointsText.Widget sizerResults.Widget5 +connect runBtn.BoxChange contourCrown.BoxExecute +connect runBtn.BoxChange averageText.BoxExecute +connect runBtn.BoxChange minText.BoxExecute +connect runBtn.BoxChange maxText.BoxExecute +connect runBtn.BoxChange standarDeviationText.BoxExecute +connect runBtn.BoxChange nPointsText.BoxExecute +connect runBtn.BoxChange viewerMaracasResultValues.BoxExecute +connect runBtn.BoxChange viewerMaracasResultMask.BoxExecute +connect runBtn.BoxChange viewerMaracas.BoxExecute +connect splitup.Widget splitMain.Widget2 +connect contourCrown.Widget sizerA.Widget1 +connect runBtn.Widget sizerA.Widget2 +connect viewerMaracasResultValues.Widget sizerB.Widget1 +connect viewerMaracasResultMask.Widget sizerB.Widget2 +connect viewerMaracas.Widget splitMain.Widget1 +connect Box19.widget sizerB.Widget3 +connect contourCrown.ImageMaskResult Box19.in +connect runBtn.BoxChange sizerB.BoxExecute + +exec splitMain diff --git a/bbtk/bbs/appli/exampleContourCrown.bbs_bug b/bbtk/bbs/appli/exampleContourCrown.bbs_bug deleted file mode 100644 index e7e0696..0000000 --- a/bbtk/bbs/appli/exampleContourCrown.bbs_bug +++ /dev/null @@ -1,105 +0,0 @@ -load std -load wx -load vtk -load maracasvisu - -new LayoutSplit splitMain - set splitMain.Orientation VERTICAL - set splitMain.Proportion 10 -new LayoutSplit splitViewer - set splitViewer.Orientation HORIZONTAL -new LayoutLine sizerA -new LayoutLine sizerB -new CommandButton runBtn - set runBtn.Label RUN - - -new ContourCrown contourCrown -new ContourStatistics contourStatistics - - -connect contourCrown.LstValue contourStatistics.LstValue - - -new ViewerNV viewerMaracas - set viewerMaracas.nTypeView "-1" -new ViewerNV viewerMaracasResultValues - set viewerMaracasResultValues.nTypeView "-1" -new ViewerNV viewerMaracasResultMask - set viewerMaracasResultMask.nTypeView "-1" - -new MetaImageReader reader - -include std/boxes/bbPrependPackageDataPath.bbs -new PrependPackageDataPath prependDatapath - set prependDatapath.In "vtk/hola.mhd" - connect prependDatapath.Out reader.In - -#new FileDialog fileDialog -#connect fileDialog.Out reader.Filename - -connect viewerMaracas.wxVtkBaseView1 contourCrown.wxVtkBaseView -connect reader.Out viewerMaracas.In -connect reader.Out contourCrown.In -connect contourCrown.ImageValueResult viewerMaracasResultValues.In -connect contourCrown.ImageMaskResult viewerMaracasResultMask.In - -new LayoutLine sizerResults -new LayoutSplit splitup - set splitup.Orientation HORIZONTAL - connect sizerA.Widget splitup.Widget1 - connect sizerResults.Widget splitup.Widget2 - -new OutputText averageText - set averageText.Title "Average" - connect contourStatistics.Average averageText.In - -new OutputText maxText - set maxText.Title "Max" - connect contourStatistics.Max maxText.In - -new OutputText minText - set minText.Title "Min" - connect contourStatistics.Min minText.In - -new OutputText standarDeviationText - set standarDeviationText.Title "Standar deviation" - connect contourStatistics.StandarDeviation standarDeviationText.In - -new OutputText nPointsText - set nPointsText.Title "n Points" - connect contourStatistics.nPoints nPointsText.In - -connect averageText.Widget sizerResults.Widget1 -connect maxText.Widget sizerResults.Widget2 -connect minText.Widget sizerResults.Widget3 -connect standarDeviationText.Widget sizerResults.Widget4 -connect nPointsText.Widget sizerResults.Widget5 - -connect runBtn.BoxChange contourCrown.BoxExecute -connect runBtn.BoxChange averageText.BoxExecute -connect runBtn.BoxChange minText.BoxExecute -connect runBtn.BoxChange maxText.BoxExecute -connect runBtn.BoxChange standarDeviationText.BoxExecute -connect runBtn.BoxChange nPointsText.BoxExecute - -connect runBtn.BoxChange viewerMaracasResultValues.BoxExecute -connect runBtn.BoxChange viewerMaracasResultMask.BoxExecute -connect runBtn.BoxChange viewerMaracas.BoxExecute - -connect splitup.Widget splitMain.Widget2 - -connect splitViewer.Widget splitMain.Widget1 -connect viewerMaracas.Widget splitViewer.Widget1 -connect sizerB.Widget splitViewer.Widget2 - -connect contourCrown.Widget sizerA.Widget1 -connect runBtn.Widget sizerA.Widget2 -connect viewerMaracasResultValues.Widget sizerB.Widget1 -connect viewerMaracasResultMask.Widget sizerB.Widget2 - - -#graph CURRENT 0 -#graph -message Process 1 -exec splitMain diff --git a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx index 3c25755..83d5aae 100644 --- a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx +++ b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx @@ -63,5 +63,3 @@ void ColorLayerImageView::bbUserFinalizeProcessing() } } // EO namespace bbcreaMaracasVisu - - diff --git a/bbtk/src/bbmaracasvisuContourCrown.cxx b/bbtk/src/bbmaracasvisuContourCrown.cxx index 1c9e0ea..1dac025 100644 --- a/bbtk/src/bbmaracasvisuContourCrown.cxx +++ b/bbtk/src/bbmaracasvisuContourCrown.cxx @@ -13,6 +13,26 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ContourCrown,bbtk::WxBlackBox); void ContourCrown::Process() { + if (firsttime==true) + { + firsttime=false; + if (bbGetInputwxVtkBaseView()==NULL) + { + wxMessageDialog(NULL, bbtk::std2wx("(ContourCrown) Input 'wxVtkBaseView' is not set"), bbtk::std2wx(bbGetFullName()) ).ShowModal(); + } + if (bbGetInputIn()==NULL) + { + wxMessageDialog(NULL, bbtk::std2wx("(ContourCrown) Input 'In' is not set"), bbtk::std2wx(bbGetFullName()) ).ShowModal(); + } + + mwxwidget->Init( bbGetInputwxVtkBaseView(), bbGetInputIn() ); + mwxwidget->ConfigureVTK(); + + bbSetOutputImageValueResult( mwxwidget->GetVtkImageValueResult() ); + bbSetOutputImageMaskResult( mwxwidget->GetVtkImageMaskResult() ); + } + + if (mwxwidget!=NULL){ //JSTG 04-04-08 mwxwidget->SetControlPoints( bbGetInputControlPointsInX(), bbGetInputControlPointsInY(), bbGetInputControlPointsInZ() ); @@ -48,27 +68,15 @@ void ContourCrown::CreateWidget(wxWindow* parent) { bbtkDebugMessageInc("Core",9,"ContourCrown::CreateWidget()"<ConfigureVTK(); - - bbSetOutputImageValueResult( mwxwidget->GetVtkImageValueResult() ); - bbSetOutputImageMaskResult( mwxwidget->GetVtkImageMaskResult() ); - bbSetOutputWidget(mwxwidget); + mwxwidget = new wxMaracasCoutourTool( parent ); + bbSetOutputWidget( mwxwidget ); bbtkDebugDecTab("Core",9); } //----------------------------------------------------------- void ContourCrown::bbUserSetDefaultValues() { + firsttime=true; mwxwidget = NULL; bbSetInputIn(NULL); bbSetInputwxVtkBaseView(NULL); diff --git a/bbtk/src/bbmaracasvisuContourCrown.h b/bbtk/src/bbmaracasvisuContourCrown.h index 74e3725..13044fe 100644 --- a/bbtk/src/bbmaracasvisuContourCrown.h +++ b/bbtk/src/bbmaracasvisuContourCrown.h @@ -40,6 +40,7 @@ class /*BBTK_EXPORT*/ ContourCrown void CreateWidget(wxWindow*); private: + bool firsttime; wxMaracasCoutourTool *mwxwidget; std::vector LstValue; std::vector LstValuePosX; diff --git a/lib/GUI/Base/VolumeRenderer/volumerendererdata.cxx b/lib/GUI/Base/VolumeRenderer/volumerendererdata.cxx index d0ab60f..0527b07 100644 --- a/lib/GUI/Base/VolumeRenderer/volumerendererdata.cxx +++ b/lib/GUI/Base/VolumeRenderer/volumerendererdata.cxx @@ -1,32 +1,37 @@ #include "volumerendererdata.h" #include "vtkObjectFactory.h" -vtkCxxRevisionMacro(VolumeRendererData, "$Revision: 1.8 $"); +vtkCxxRevisionMacro(VolumeRendererData, "$Revision: 1.9 $"); vtkStandardNewMacro(VolumeRendererData); VolumeRendererData::VolumeRendererData() { - VolRendManager = 0; - ImageData = 0; - Renderer = 0; - Interactor = 0; - LookUpTable = 0; + VolRendManager = NULL; + ImageData = NULL; + Renderer = NULL; + Interactor = NULL; + LookUpTable = NULL; //ImageDataSeparateComponents = false; } void VolumeRendererData::ShowVolume(bool checked){ - + printf("EED VolumeRendererData::ShowVolume 1 \n"); try{ + printf("EED VolumeRendererData::ShowVolume 2 \n"); if(checked){ + printf("EED VolumeRendererData::ShowVolume 3 \n"); invariant(); + printf("EED VolumeRendererData::ShowVolume 4 \n"); cout<<"JPRG::VolumeRendererData::ShowVolume"<addVolume(ImageData, Interactor); } if(LookUpTable) + { VolRendManager->SetLookupTable(LookUpTable); + } vector< vtkProp3D* > props = VolRendManager->getProps3D(); for(unsigned i = 0; i < props.size(); i++){ Renderer->AddActor(props[i]); @@ -65,11 +70,12 @@ void VolumeRendererData::OpacityChanged(vector greyvalues, vectorsetVolumeOpacity(greyvalues,values); } + printf("EED VolumeRendererData::OpacityChanged 4\n"); } diff --git a/lib/GUI/Base/VolumeRenderer/volumerendererdata.h b/lib/GUI/Base/VolumeRenderer/volumerendererdata.h index 36f605b..4fe9486 100644 --- a/lib/GUI/Base/VolumeRenderer/volumerendererdata.h +++ b/lib/GUI/Base/VolumeRenderer/volumerendererdata.h @@ -45,11 +45,11 @@ public: protected: VolumeRendererData(); - VolumeRendererManager* VolRendManager; - vtkImageData* ImageData; - vtkRenderer* Renderer; - vtkLookupTable* LookUpTable; - vtkRenderWindowInteractor* Interactor; + VolumeRendererManager *VolRendManager; + vtkImageData *ImageData; + vtkRenderer *Renderer; + vtkLookupTable *LookUpTable; + vtkRenderWindowInteractor *Interactor; // bool ImageDataSeparateComponents; diff --git a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx index 3e6ad74..5805818 100644 --- a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx +++ b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx @@ -17,27 +17,27 @@ #endif #endif + using namespace std; -VolumeRendererManagerData::VolumeRendererManagerData(vtkImageData* vol, bool usegpu){ +VolumeRendererManagerData::VolumeRendererManagerData(vtkImageData* vol, bool usegpu) +{ Initialize(vol, "", usegpu); } -VolumeRendererManagerData::VolumeRendererManagerData(vtkImageData* vol, std::string dataname){ - +VolumeRendererManagerData::VolumeRendererManagerData(vtkImageData* vol, std::string dataname) +{ Initialize(vol, dataname); - - } -VolumeRendererManagerData::VolumeRendererManagerData(vtkImageData* vol, vtkRenderer* render, std::string dataname){ - +VolumeRendererManagerData::VolumeRendererManagerData(vtkImageData* vol, vtkRenderer* render, std::string dataname) +{ Initialize(vol, dataname); render->AddActor(this->getProp3D()); - } -void VolumeRendererManagerData::Initialize(vtkImageData* vol, std::string dataname, bool usegpu){ +void VolumeRendererManagerData::Initialize(vtkImageData* vol, std::string dataname, bool usegpu) +{ _id = 0; _vol = vol; _dataname = dataname; @@ -89,9 +89,13 @@ void VolumeRendererManagerData::Initialize(vtkImageData* vol, std::string datana */ VolumeMapper = 0; + + #if VTK_MAJOR_VERSION >= 5 #if VTK_MINOR_VERSION >= 6 vtkGPUVolumeRayCastMapper * volumeMappergpu = vtkGPUVolumeRayCastMapper::New(); +// vtkSmartVolumeMapper * volumeMappergpu = vtkSmartVolumeMapper::New(); + volumeMappergpu->AutoAdjustSampleDistancesOn(); VolumeMapper = volumeMappergpu; #endif @@ -136,10 +140,10 @@ VolumeRendererManagerData::~VolumeRendererManagerData() if(BoxWidget){ DisableBoundingBox(); } - } -void VolumeRendererManagerData::SetIndependentComponents(bool independent){ +void VolumeRendererManagerData::SetIndependentComponents(bool independent) +{ if(!independent){ _volumeProperty->IndependentComponentsOff(); }else{ @@ -185,16 +189,13 @@ void VolumeRendererManagerData::EnableBoundingBox(vtkRenderWindowInteractor* int //EED9Juin2011 } } -void VolumeRendererManagerData::DisableBoundingBox(){ - +void VolumeRendererManagerData::DisableBoundingBox() +{ if(BoxWidget){ BoxWidget->EnabledOff(); //BoxWidget->Delete(); //BoxWidget = 0; - cout<<"JPRG::VolumeRendererManagerData::DisableBoundingBox"<& greylevelcol /** ** Volume Opacity **/ -void VolumeRendererManagerData::setVolumeOpacity(std::vector greylevel,std::vector value){ +void VolumeRendererManagerData::setVolumeOpacity(std::vector greylevel,std::vector value) +{ _tfun->RemoveAllPoints(); for(unsigned int i = 0; i < greylevel.size();i++){ @@ -228,10 +230,12 @@ void VolumeRendererManagerData::setVolumeOpacity(std::vector greylevel,s _newvol->Update(); } + /** ** Volume Opacity **/ -void VolumeRendererManagerData::setVolumeOpacity(std::vector greylevel,double value){ +void VolumeRendererManagerData::setVolumeOpacity(std::vector greylevel,double value) +{ std::vector valuevector; for(unsigned i = 0; i < greylevel.size(); i++){ valuevector.push_back(value); @@ -257,44 +261,56 @@ void VolumeRendererManagerData::checkInvariant()throw (char *){ /** ** Check if the variables are setted correctly **/ -void VolumeRendererManagerData::Update(){ +void VolumeRendererManagerData::Update() +{ _newvol->Update(); } + /** ** get the prop3D **/ -vtkProp3D* VolumeRendererManagerData::getProp3D(){ +vtkProp3D* VolumeRendererManagerData::getProp3D() +{ return this->_newvol; } + /** ** return the id from the daat **/ -int VolumeRendererManagerData::getId(){ +int VolumeRendererManagerData::getId() +{ return _id; } + /** ** set data id **/ -void VolumeRendererManagerData::setId(int propid){ +void VolumeRendererManagerData::setId(int propid) +{ _id = propid; } /** ** Get the filanme **/ -std::string VolumeRendererManagerData::getDataname(){ +std::string VolumeRendererManagerData::getDataname() +{ return _dataname; } /** ** Set the filanme **/ -void VolumeRendererManagerData::setDataname(std::string dataname){ +void VolumeRendererManagerData::setDataname(std::string dataname) +{ _dataname = dataname; } -void VolumeRendererManagerData::changeCompositeMIPFunction(int function){ + +void VolumeRendererManagerData::changeCompositeMIPFunction(int function) +{ //checkInvariant(); if(VolumeMapper){ + #if VTK_MAJOR_VERSION >= 5 #if VTK_MINOR_VERSION >= 6 if(dynamic_cast(VolumeMapper)){ @@ -316,6 +332,7 @@ void VolumeRendererManagerData::changeCompositeMIPFunction(int function){ } #endif #else + vtkGPUVolumeRayCastMapper* volumemapper = dynamic_cast(VolumeMapper); if(function == 0){ volumemapper->SetBlendModeToComposite(); @@ -329,7 +346,8 @@ void VolumeRendererManagerData::changeCompositeMIPFunction(int function){ } -void VolumeRendererManagerData::SetLookupTable(vtkLookupTable* lookuptable){ +void VolumeRendererManagerData::SetLookupTable(vtkLookupTable* lookuptable) +{ if(lookuptable){ _ctfun->RemoveAllPoints(); vtkColorTransferFunction* colort = (vtkColorTransferFunction*)lookuptable; @@ -344,7 +362,8 @@ void VolumeRendererManagerData::SetLookupTable(vtkLookupTable* lookuptable){ } -void VolumeRendererManagerData::changeInterpolationType(int type){ +void VolumeRendererManagerData::changeInterpolationType(int type) +{ //checkInvariant(); if(type == 0){ _volumeProperty->SetInterpolationTypeToLinear(); @@ -353,8 +372,7 @@ void VolumeRendererManagerData::changeInterpolationType(int type){ } } -void VolumeRendererManagerData::SetColorTransferFunction(int i, vtkColorTransferFunction* colorf){ - +void VolumeRendererManagerData::SetColorTransferFunction(int i, vtkColorTransferFunction* colorf) +{ _volumeProperty->SetColor(i, colorf); - } diff --git a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.h b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.h index fd530b6..f6e6fde 100644 --- a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.h +++ b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.h @@ -173,18 +173,18 @@ private: int _id; vtkVolumeRayCastCompositeFunction *_compositeFunction; - vtkPlanes *_volumePlanes; + vtkPlanes *_volumePlanes; vtkVolumeProperty *_volumeProperty; vtkVolume *_newvol; - vtkPiecewiseFunction* _tfun; - vtkColorTransferFunction* _ctfun; - vtkVolumeRayCastMIPFunction* _MIPFunction; + vtkPiecewiseFunction *_tfun; + vtkColorTransferFunction *_ctfun; + vtkVolumeRayCastMIPFunction *_MIPFunction; /** ** boxwidget to control the volume **/ - vtkBoxWidget* BoxWidget; - vtkVolumeMapper *VolumeMapper; + vtkBoxWidget *BoxWidget; + vtkVolumeMapper *VolumeMapper; void Initialize(vtkImageData* vol, std::string dataname, bool usegpu = false); diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002 b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002 index 7165745..ddad83e 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002 +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002 @@ -1,6 +1,6 @@ format 75 "wxVtkViwer" // wxVtkViwer - revision 13 + revision 14 modified_by 2 "davila" // class settings //class diagram settings @@ -419,7 +419,6 @@ ${inlines} classrelation_ref 189058 // b parent class_ref 168066 // VolumeRendererData end - end class 129666 "vtkBoxWidget" diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram index 7676df3..6de950f 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/128002.diagram @@ -2,82 +2,82 @@ format 75 classcanvas 128002 class_ref 128002 // vtkInfoTextImage draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 263.6 625.8 2000 + xyz 263.6 625.2 2000 end classcanvas 128130 class_ref 128130 // wxVtk2DBaseView draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 275.7 687.3 2000 + xyz 275.3 687.5 2000 end classcanvas 128386 class_ref 128258 // wxVtkBaseView draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 549.9 293.4 2000 + xyz 549.7 294 2000 end classcanvas 128642 class_ref 128386 // vtkImageViewer2_XYZ draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 154.5 807.3 2000 + xyz 154.5 807.5 2000 end classcanvas 128898 class_ref 128514 // vtkBaseData draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 199.6 679.2 2000 + xyz 199.4 679.2 2000 end classcanvas 129026 class_ref 128642 // vtkInfoTextImageInteractor draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 27.9 208.2 2000 + xyz 27.7 208.8 2000 end classcanvas 129410 class_ref 128770 // wxWindow draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color lightorange - xyz 479.4 293.8 2005 + xyz 480 293.4 2005 end classcanvas 129666 class_ref 128898 // wxVtkRenderWindowInteractor draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 689.6 206.3 2000 + xyz 689.6 206.1 2000 end classcanvas 129922 class_ref 129026 // vtkInteractorStyleImage draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color magenta - xyz 387.8 28.2 2000 + xyz 387.8 28.8 2000 end classcanvas 131202 class_ref 129282 // wxVtkClipping3DView draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 362.1 842.9 2000 + xyz 362.3 842.1 2000 end classcanvas 131842 class_ref 129410 // wxPanel draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color lightorange - xyz 348.5 768.9 2000 + xyz 348.5 768.5 2000 end classcanvas 132226 class_ref 129538 // vtkClipping3DDataViewer draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 417.5 766.9 2000 + xyz 417.5 766.7 2000 end classcanvas 132482 class_ref 129666 // vtkBoxWidget draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color magenta - xyz 368.3 903.9 2000 + xyz 368.5 903.5 2000 end classcanvas 133122 class_ref 129794 // wxVtkClipping3DViewCntrlPanel draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 649.3 1027.9 3005 + xyz 649.9 1027.1 3005 end classcanvas 133250 class_ref 129922 // wxVtkMPR2DView draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 266.1 951.3 2000 + xyz 266.7 951.1 2000 end classcanvas 133506 class_ref 130050 // vtkPoints draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color magenta - xyz 545.6 1005.4 2000 + xyz 545.4 1005.8 2000 end classcanvas 133762 class_ref 130178 // vtkActor draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color magenta - xyz 464.2 1144.9 2000 + xyz 464.6 1144.9 2000 end classcanvas 133890 class_ref 130306 // vtkPolyDataMapper draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color magenta - xyz 155 1131.4 2000 + xyz 155 1131.2 2000 end classcanvas 134274 class_ref 130434 // vtkPolyData draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default @@ -86,145 +86,145 @@ classcanvas 134274 class_ref 130434 // vtkPolyData end classcanvas 135554 class_ref 130562 // vtkInteractorStyleMPRView draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 25.5 159.1 2000 + xyz 25.7 159.1 2000 end classcanvas 136194 class_ref 130690 // vtkImageViewer2 draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color magenta - xyz 60.9 751 2005 + xyz 60.7 751.8 2005 end classcanvas 136450 class_ref 130818 // marImageData draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 112.2 623.4 2000 + xyz 112.8 624 2000 end classcanvas 137090 class_ref 130946 // vtkTextActor draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color magenta - xyz 227.4 554.3 2007 + xyz 227.8 554.3 2007 end note 137346 "_vtkText_WindowLevel _vtkText_ColorLevel _vtkText_position _vtkText_Intensity" - xyzwh 38.1 535.2 2013 177 78 + xyzwh 39.7 529.8 2013 111 61 classcanvas 137602 class_ref 131074 // InteractorStyleMaracas draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 193.3 43 2006 + xyz 193.9 43.6 2006 end classcanvas 137986 class_ref 132098 // wxVtkMPR3DView draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 665.2 794.4 2000 + xyz 665.4 794.4 2000 end classcanvas 138242 class_ref 133634 // wxVtk3DDataViewer draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 644.3 676.1 2000 + xyz 644.1 676.9 2000 end classcanvas 138626 class_ref 133762 // wxVtkMPR3DViewCntrlPanel draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 714.2 731.4 2000 + xyz 714.6 731.2 2000 end classcanvas 139778 class_ref 130434 // vtkPolyData draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color magenta - xyz 769.7 772.9 2000 + xyz 769.1 772.1 2000 end classcanvas 140034 class_ref 130178 // vtkActor draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color magenta - xyz 778.2 800.9 2000 + xyz 778.2 800.3 2000 end classcanvas 140290 class_ref 133890 // vtkPlaneWidget draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color magenta - xyz 756.1 828.4 3010 + xyz 756.7 828 3010 end classcanvas 140546 class_ref 134018 // vtkPointWidget draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color magenta - xyz 755.6 859.4 2000 + xyz 755.8 859.4 2000 end classcanvas 140930 class_ref 130306 // vtkPolyDataMapper draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color magenta - xyz 740.5 887.9 2000 + xyz 740.5 887.1 2000 end classcanvas 141314 class_ref 131458 // vtkMPRBaseData draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 189.9 733.8 2010 + xyz 189.5 733.4 2010 end classcanvas 142082 class_ref 132226 // wxVtk3DBaseView draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 570 391.4 2005 + xyz 570.6 391.2 2005 end classcanvas 142978 class_ref 140546 // vtkInteractorStyleBaseView draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 374.1 110.9 2000 + xyz 374.3 110.3 2000 end classcanvas 143234 class_ref 140674 // vtkInteractorStyleBaseView2D draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 282.1 232.3 2006 + xyz 282.5 232.5 2006 end classcanvas 143490 class_ref 140802 // vtkInteractorStyleBaseView3D draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 450.4 233.8 2000 + xyz 451 233.4 2000 end note 144002 "All Controlers herite from this class Ex. manualControles" - xyzwh 30.1 449.4 2000 145 63 + xyzwh 31.5 449.2 2000 132 38 classcanvas 147330 class_ref 154114 // vtkInteractorStyleSphere draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 36.6 116.4 2012 + xyz 36 116.2 2012 end classcanvas 147586 class_ref 154242 // vtkInteractorStylePlane2D draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 32.2 73.8 2018 + xyz 32.8 73.4 2018 end classcanvas 148994 class_ref 154370 // vtkInteractorStyle3DView draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 33.2 260.2 2007 + xyz 33.8 260.6 2007 end classcanvas 149378 class_ref 154498 // vtkInteractorScrollZ draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 59.6 306.4 2011 + xyz 59.6 306.2 2011 end classcanvas 149762 class_ref 154626 // manualInteractorWindowLevel draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 27.6 351.4 2000 + xyz 27.4 351.2 2000 end classcanvas 150274 class_ref 154754 // manualContourBaseControler draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 23.6 395.2 2016 + xyz 23 395.6 2016 end classcanvas 151938 class_ref 161282 // wxVtkRenderWindowInteractorPlus draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 673.4 290.4 2000 + xyz 673.2 290.8 2000 end classcanvas 152322 class_ref 129794 // wxVtkClipping3DViewCntrlPanel draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 518 839 3016 + xyz 518.2 839 3016 end classcanvas 152706 class_ref 167810 // wxVtkClipping3DViewVolCntrlPanel draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 485 925 2007 + xyz 485 925.4 2007 end classcanvas 153858 class_ref 167938 // boxSurfaceObserver draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 454 686 2000 + xyz 462.4 685.8 2000 end classcanvas 154114 class_ref 131458 // vtkMPRBaseData draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 520 642 2011 + xyz 526 645.2 2011 end classcanvas 154370 class_ref 168066 // VolumeRendererData draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 362 686 2011 + xyz 362.4 686.8 2011 end classcanvas 154626 class_ref 168194 // VolumeRendererManager draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 370 616 2017 + xyz 371.4 644.8 2017 end classcanvas 155138 class_ref 168322 // VolumeRendererManagerData draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default - xyz 385 547 2016 + xyz 388 602.2 2016 end classcanvas 155650 class_ref 129410 // wxPanel draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default @@ -234,7 +234,7 @@ end classcanvas 155906 class_ref 129410 // wxPanel draw_all_relations default hide_attributes default hide_operations default hide_getset_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_context default show_members_multiplicity default show_members_initialization default show_attribute_modifiers default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_relation_modifiers default show_relation_visibility default show_infonote default shadow default show_stereotype_properties default color orange - xyz 564 881 2012 + xyz 564.4 881.8 2012 end note 157314 "vtkVolumeRayCastCompositeFunction vtkPlanes @@ -245,7 +245,7 @@ vtkColorTransferFunction vtkVolumeRayCastMIPFunction vtkBoxWidget vtkVolumeMapper " - color magenta xyzwh 675 352 2021 157 103 + color magenta xyzwh 675.2 352.2 2021 157 103 note 158082 "vtkMarchingCubes * vtkStripper * vtkPolyDataMapper * @@ -262,11 +262,11 @@ vtkVolume vtkActor * vtkVolumeRayCastCompositeFunction vtkVolumeRayCastMIPFunction " - color magenta xyzwh 661 485 2006 167 163 + color magenta xyzwh 660.6 486.4 2006 168 169 relationcanvas 128514 relation_ref 128130 // - from ref 128130 z 2001 to point 358 603 - line 158594 z 2001 to point 358 360 - line 158722 z 2001 to point 552 360 + from ref 128130 z 2001 to point 359 603 + line 158594 z 2001 to point 359 360.8 + line 158722 z 2001 to point 552.6 360.8 line 158850 z 2001 to ref 128386 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -277,9 +277,9 @@ relationcanvas 128770 relation_ref 128258 // no_multiplicity_a no_multiplicity_b end relationcanvas 129154 relation_ref 128386 // - from ref 128130 z 2001 to point 254 860 - line 148610 z 2001 to point 16 860 - line 148738 z 2001 to point 16 252 + from ref 128130 z 2001 to point 254.4 860.8 + line 148610 z 2001 to point 16.2 860.8 + line 148738 z 2001 to point 16.2 252.6 line 148866 z 2001 to ref 129026 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -300,8 +300,8 @@ relationcanvas 129794 relation_ref 128770 // no_multiplicity_a no_multiplicity_b end relationcanvas 130818 relation_ref 128898 // - from ref 128386 z 2001 to point 644 228 - line 145666 z 2001 to point 635 66 + from ref 128386 z 2001 to point 644.4 228 + line 145666 z 2001 to point 635.8 66.2 line 143746 z 2001 to ref 129922 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -320,13 +320,13 @@ end relationcanvas 132610 relation_ref 129666 // _boxWidgetS1 decenter_begin 769 decenter_end 538 - from ref 131202 z 2001 label "_boxWidgetS1" italic xyz 429.5 892 2001 to point 446 897 + from ref 131202 z 2001 label "_boxWidgetS1" italic xyz 429 892 2001 to point 446.2 897.6 line 132866 z 2001 to ref 132482 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 132738 relation_ref 129794 // _boxWidgetVolume - from ref 131202 z 2001 label "_boxWidgetVolume" italic xyz 343.5 880.5 2001 to ref 132482 + from ref 131202 z 2001 label "_boxWidgetVolume" italic xyz 343 880 2001 to ref 132482 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -336,52 +336,52 @@ relationcanvas 133378 relation_ref 129922 // no_multiplicity_a no_multiplicity_b end relationcanvas 133634 relation_ref 130050 // _ptsB - from ref 133250 z 2001 label "_ptsB" italic xyz 425 1002.5 2001 to ref 133506 + from ref 133250 z 2001 label "_ptsB" italic xyz 425 1002 2001 to ref 133506 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 134018 relation_ref 130178 // _lineAActor - from ref 133250 z 2001 label "_lineAActor" italic xyz 356.5 1104.5 2001 to point 386 1122 + from ref 133250 z 2001 label "_lineAActor" italic xyz 356 1104 2001 to point 386.2 1122.6 line 135810 z 2001 to ref 133762 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 134146 relation_ref 130306 // _lineBMapper - from ref 133250 z 2001 label "_lineBMapper" italic xyz 186 1067.5 2001 to ref 133890 + from ref 133250 z 2001 label "_lineBMapper" italic xyz 186 1067 2001 to ref 133890 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 134402 relation_ref 130434 // _pdB - from ref 133250 z 2001 label "_pdB" italic xyz 218.5 1004.5 2001 to point 253 1025 + from ref 133250 z 2001 label "_pdB" italic xyz 218 1004 2001 to point 253 1025.8 line 135426 z 2001 to ref 134274 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 134530 relation_ref 130562 // _ptsA - from ref 133250 z 2001 label "_ptsA" italic xyz 438 957 2001 to point 482 972 + from ref 133250 z 2001 label "_ptsA" italic xyz 438 957 2001 to point 482.6 972.6 line 134658 z 2001 to ref 133506 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 134786 relation_ref 130690 // _lineBActor - from ref 133250 z 2001 label "_lineBActor" italic xyz 397.5 1058.5 2001 to ref 133762 + from ref 133250 z 2001 label "_lineBActor" italic xyz 397 1058 2001 to ref 133762 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 135042 relation_ref 130818 // _lineAMapper - from ref 133250 z 2001 label "_lineAMapper" italic xyz 240 1110.5 2001 to point 329 1089 + from ref 133250 z 2001 label "_lineAMapper" italic xyz 240 1110 2001 to point 329.4 1089.4 line 135170 z 2001 to ref 133890 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 135298 relation_ref 130946 // _pdA - from ref 133250 z 2001 label "_pdA" italic xyz 202 973.5 2001 to ref 134274 + from ref 133250 z 2001 label "_pdA" italic xyz 202 973 2001 to ref 134274 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 135682 relation_ref 131074 // - from ref 133250 z 2001 to point 6 951 - line 148354 z 2001 to point 6 207 + from ref 133250 z 2001 to point 6.2 951.2 + line 148354 z 2001 to point 6.2 207.6 line 148482 z 2001 to ref 135554 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -402,13 +402,13 @@ relationcanvas 137218 relation_ref 131458 // no_multiplicity_a no_multiplicity_b end relationcanvas 137730 relation_ref 131586 // - from ref 135554 z 2007 to point 236 188 + from ref 135554 z 2007 to point 236.2 188 line 147842 z 2007 to ref 137602 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 137858 relation_ref 131714 // - from ref 129026 z 2007 to point 236 244 + from ref 129026 z 2007 to point 236.2 244.4 line 148226 z 2007 to ref 137602 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -439,14 +439,14 @@ relationcanvas 140418 relation_ref 137090 // no_multiplicity_a no_multiplicity_b end relationcanvas 140674 relation_ref 137218 // - from ref 137986 z 2001 to point 725 872 + from ref 137986 z 2001 to point 725.8 872.6 line 155522 z 2001 to ref 140546 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 141058 relation_ref 137346 // decenter_begin 428 - from ref 137986 z 2001 to point 695 901 + from ref 137986 z 2001 to point 695.8 901.2 line 141186 z 2001 to ref 140930 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -468,14 +468,14 @@ relationcanvas 142338 relation_ref 140418 // end relationcanvas 142466 relation_ref 140546 // decenter_end 697 - from ref 137986 z 2006 to point 623 731 + from ref 137986 z 2006 to point 623 731.2 line 142850 z 2006 to ref 142082 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 142594 relation_ref 140674 // decenter_end 387 - from ref 131202 z 2006 to point 598 761 + from ref 131202 z 2006 to point 598 761.2 line 142722 z 2006 to ref 142082 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -486,13 +486,13 @@ relationcanvas 143106 relation_ref 147202 // no_multiplicity_a no_multiplicity_b end relationcanvas 143362 relation_ref 147330 // - from ref 143234 z 2007 to point 445 190 + from ref 143234 z 2007 to point 445.8 190.8 line 145154 z 2007 to ref 142978 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 143618 relation_ref 147458 // - from ref 143490 z 2001 to point 445 191 + from ref 143490 z 2001 to point 445.8 191.2 line 145282 z 2001 to ref 142978 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -503,56 +503,56 @@ relationcanvas 146178 relation_ref 154242 // no_multiplicity_a no_multiplicity_b end relationcanvas 147202 relation_ref 161026 // - from ref 142978 z 2007 to point 325 40 + from ref 142978 z 2007 to point 325.8 40.8 line 151170 z 2007 to ref 137602 no_role_a no_role_b multiplicity_a_pos 287 53 3000 no_multiplicity_b end relationcanvas 147458 relation_ref 161154 // - from ref 147330 z 2013 to point 236 151 + from ref 147330 z 2013 to point 236.2 151.2 line 147970 z 2013 to ref 137602 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 147714 relation_ref 161282 // - from ref 147586 z 2019 to point 236 103 + from ref 147586 z 2019 to point 236.2 103 line 148098 z 2019 to ref 137602 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 149122 relation_ref 161410 // - from ref 148994 z 2008 to point 236 297 + from ref 148994 z 2008 to point 236.2 297.6 line 149250 z 2008 to ref 137602 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 149506 relation_ref 161538 // - from ref 149378 z 2012 to point 236 323 - line 149634 z 2012 to point 236 293 + from ref 149378 z 2012 to point 236.2 324 + line 149634 z 2012 to point 236.2 293 line 150146 z 2012 to ref 137602 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 149890 relation_ref 161666 // - from ref 149762 z 2007 to point 236 366 + from ref 149762 z 2007 to point 236.2 366.2 line 150018 z 2007 to ref 137602 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 150402 relation_ref 161794 // - from ref 150274 z 2017 to point 236 403 + from ref 150274 z 2017 to point 236.2 403 line 150530 z 2017 to ref 137602 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 151426 relation_ref 168322 // - from ref 137602 z 2007 to point 287 91 + from ref 137602 z 2007 to point 287.6 91.2 line 151554 z 2007 to ref 142978 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 151682 relation_ref 174850 // - from ref 129026 z 2001 to point 297 302 + from ref 129026 z 2001 to point 297.6 302.6 line 151810 z 2001 to ref 128002 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -568,19 +568,19 @@ relationcanvas 152194 relation_ref 181506 // no_multiplicity_a no_multiplicity_b end relationcanvas 152578 relation_ref 188034 // - from ref 131202 z 3017 to point 500 836 + from ref 131202 z 3017 to point 500.8 836.2 line 153090 z 3017 to ref 152322 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 152834 relation_ref 188162 // - from ref 131202 z 2008 to point 493 877 + from ref 131202 z 2008 to point 493 877.6 line 153602 z 2008 to ref 152706 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 152962 relation_ref 188290 // - from ref 152322 z 3017 to point 504 857 + from ref 152322 z 3017 to point 504.4 857.6 line 156930 z 3017 to ref 131202 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -596,12 +596,12 @@ relationcanvas 153986 relation_ref 188674 // decenter_end 494 from ref 132226 z 2001 to ref 153858 no_role_a no_role_b - multiplicity_a_pos 480 722 3000 no_multiplicity_b + multiplicity_a_pos 490 722 3000 no_multiplicity_b end relationcanvas 154242 relation_ref 188802 // decenter_begin 663 decenter_end 464 - from ref 132226 z 2012 to point 543 721 + from ref 132226 z 2012 to point 557 719.2 line 159106 z 2012 to ref 154114 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -644,6 +644,6 @@ line 150786 -_-_ line 157570 -_-_ from ref 155138 z 2022 to ref 157314 line 158210 -_-_ - from ref 132226 z 2007 to point 573 725 + from ref 132226 z 2007 to point 573 725.8 line 158978 z 2007 to ref 158082 end diff --git a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session index f1aa4bf..2f49d5a 100644 --- a/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session +++ b/lib/doxygen/bouml/wxVtkViewer/wxVtkViewer/2.session @@ -1,7 +1,7 @@ -window_sizes 1265 825 303 956 728 42 +window_sizes 1396 856 303 1087 759 42 diagrams active classdiagram_ref 128002 // wxVtkViewer class Diagram 1 - 952 708 100 4 296 0 + 952 1238 140 4 471 241 end show_stereotypes selected class_ref 129410 // wxPanel diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx index 4ed87a8..d28a6b2 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx @@ -8,42 +8,12 @@ #include "vtkLookupTable.h" //---------------------------------------------------------------------- - wxMaracasCoutourTool::wxMaracasCoutourTool(wxWindow *parent, wxVtkBaseView *wxvtkbaseview, vtkImageData* imagedata) + wxMaracasCoutourTool::wxMaracasCoutourTool(wxWindow *parent) : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL) { -//EED this->mbbtkContourCrown = contourcrown; - this->imagedata = imagedata; - this->wxvtkbaseview = wxvtkbaseview; wxPanel *panel = this; wxSizer *sizer = NULL; - InitVtkImagesResult(); - - vtkLookupTable *table = vtkLookupTable::New(); -// table->SetAlphaRange(128,255); - table->SetRange(0, 255); // image intensity range -// table->SetValueRange(0.0, 1.0); // from black to white - table->SetValueRange(0.0, 255.0); // from black to white - - table->SetTableValue (0, 1.0 , 1.0 , 1.0 , 0.1 ); - table->SetTableValue (255, 1.0 , 1.0 , 0.0 , 0.1); - -// table->SetTableValue (0, 0.0 , 0.0 , 1.0 , 0.35 ); -// table->SetTableValue (255, 1.0 , 0.0 , 0.0 , 0.10); - - table->SetSaturationRange(0.0, 0.0); // no color saturation - table->SetRampToLinear(); - table->Build(); - - vtkImageMapToColors *mapperImage = vtkImageMapToColors::New(); - mapperImage->SetLookupTable(table); - mapperImage->SetInput( imagedataMaskResult ); - vtkImageActor *actorImage = vtkImageActor::New(); - actorImage->SetInput( mapperImage->GetOutput() ); - actorImage->SetOpacity(1); - - wxvtkbaseview->GetRenderer()->AddActor(actorImage); - // Widget interface wxButton *btnContourA = new wxButton( panel, -1, _T("Crown Extern")); wxButton *btnContourB = new wxButton( panel, -1, _T("Crown Intern")); @@ -104,8 +74,42 @@ } - // ------------------------------------------------------------------------ + // ------------------------------------------------------------------------ +void wxMaracasCoutourTool::Init(wxVtkBaseView *wxvtkbaseview, vtkImageData* imagedata) +{ + this->imagedata = imagedata; + this->wxvtkbaseview = wxvtkbaseview; + + InitVtkImagesResult(); + + vtkLookupTable *table = vtkLookupTable::New(); + // table->SetAlphaRange(128,255); + table->SetRange(0, 255); // image intensity range + // table->SetValueRange(0.0, 1.0); // from black to white + table->SetValueRange(0.0, 255.0); // from black to white + + table->SetTableValue (0, 1.0 , 1.0 , 1.0 , 0.1 ); + table->SetTableValue (255, 1.0 , 1.0 , 0.0 , 0.1); + + // table->SetTableValue (0, 0.0 , 0.0 , 1.0 , 0.35 ); + // table->SetTableValue (255, 1.0 , 0.0 , 0.0 , 0.10); + + table->SetSaturationRange(0.0, 0.0); // no color saturation + table->SetRampToLinear(); + table->Build(); + + vtkImageMapToColors *mapperImage = vtkImageMapToColors::New(); + mapperImage->SetLookupTable(table); + mapperImage->SetInput( imagedataMaskResult ); + vtkImageActor *actorImage = vtkImageActor::New(); + actorImage->SetInput( mapperImage->GetOutput() ); + actorImage->SetOpacity(1); + + wxvtkbaseview->GetRenderer()->AddActor(actorImage); +} + + // ------------------------------------------------------------------------ void wxMaracasCoutourTool::ConfigureVTK() { double spc[3]; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.h index 635d916..e09ae22 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.h @@ -19,12 +19,14 @@ class creaMaracasVisu_EXPORT wxMaracasCoutourTool : public wxPanel { public: - wxMaracasCoutourTool( wxWindow *parent, wxVtkBaseView *wxvtkbaseview, vtkImageData* imagedata); + wxMaracasCoutourTool( wxWindow *parent); ~wxMaracasCoutourTool(); void OnContourA(wxCommandEvent &event); void OnContourB(wxCommandEvent &event); void OnContourAB(wxCommandEvent &event); - void ConfigureVTK(); + + void Init(wxVtkBaseView *wxvtkbaseview, vtkImageData* imagedata); + void ConfigureVTK(); void GetValuesInsideCrown( std::vector *pLstValue, std::vector *pLstValuePosX, diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx index 588a0de..2cf4527 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: wxMaracas_ViewerWidget.cxx,v $ Language: C++ - Date: $Date: 2010/10/29 07:51:06 $ - Version: $Revision: 1.33 $ + Date: $Date: 2011/10/31 16:23:59 $ + Version: $Revision: 1.34 $ Copyright: (c) 2002, 2003 License: @@ -106,7 +106,7 @@ mwxvtkclipping3Dview = new wxVtkClipping3DView(mwxvtk3Dbaseview_Clipping3D); vtkClipping3DDataViewer *vtkclipping3Ddataviewer = new vtkClipping3DDataViewer(); - vtkclipping3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata); + vtkclipping3Ddataviewer->SetVtkMPRBaseData(mvtkmprbasedata); vtkclipping3Ddataviewer->Configure(); mwxvtkclipping3Dview->SetVtkClipping3DDataViewer(vtkclipping3Ddataviewer); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx index 6cb4429..3d1d5a9 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DView.cxx @@ -218,7 +218,7 @@ void wxVtkClipping3DView::Configure(){ // between the planes is actually rendered. _wxvtk3Dbaseview->GetRenderer()->ResetCameraClippingRange(); - //cout<<"JPRG::wxVtkClipping3DView::SetVtkClipping3DDataViewer::GetRenderer()::"<GetWxvtk3Dbaseview()->GetRenderer()<GetWxvtk3Dbaseview()->GetRenderer()<GetWxvtk3Dbaseview()->GetWxVTKRenderWindowInteractor()<SetRenderer(this->GetWxvtk3Dbaseview()->GetRenderer()); -- 2.45.1