From 34c43da71c51815f22a865305e4b0de6c35f45dc Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Mon, 9 Jan 2012 18:28:20 +0000 Subject: [PATCH] no message --- doc/bouml/bbtkk/2.session | 9 ++++----- packages/vtk/src/bbvtkPolyDataToActor.cxx | 5 +++++ packages/vtk/src/bbvtkPolyDataToActor.h | 4 ++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/doc/bouml/bbtkk/2.session b/doc/bouml/bbtkk/2.session index 7662096..c41106f 100644 --- a/doc/bouml/bbtkk/2.session +++ b/doc/bouml/bbtkk/2.session @@ -1,12 +1,11 @@ -window_sizes 1024 1258 364 654 1201 0 +window_sizes 1398 856 495 897 799 0 diagrams active classdiagram_ref 128002 // bbtk-Class-Diagram - 650 1181 100 4 0 0 + 650 1181 100 4 38 0 end show_stereotypes -selected classview_ref 129282 // src +selected classdiagram_ref 128002 // bbtk-Class-Diagram open - class_ref 149890 // MagicBoxSetFunctor - classview_ref 129282 // src + classview_ref 128002 // src end end diff --git a/packages/vtk/src/bbvtkPolyDataToActor.cxx b/packages/vtk/src/bbvtkPolyDataToActor.cxx index 629c418..22ebe03 100644 --- a/packages/vtk/src/bbvtkPolyDataToActor.cxx +++ b/packages/vtk/src/bbvtkPolyDataToActor.cxx @@ -60,6 +60,8 @@ namespace bbvtk bbSetInputRenderer(NULL); bbSetInputTransform(NULL); bbSetInputOpacity(1); + bbSetInputRepresentation(1); + bbSetInputLineWidth(1); polydatamapper = NULL; vtkactor = NULL; @@ -101,6 +103,9 @@ namespace bbvtk { polydatamapper->SetInput( bbGetInputIn() ); + vtkactor->GetProperty()->SetRepresentation( bbGetInputRepresentation() ); + vtkactor->GetProperty()->SetLineWidth( bbGetInputLineWitdth() ); + vtkactor->GetProperty()->SetColor( bbGetInputColour()[0], bbGetInputColour()[1], bbGetInputColour()[2] ); diff --git a/packages/vtk/src/bbvtkPolyDataToActor.h b/packages/vtk/src/bbvtkPolyDataToActor.h index 47789ff..c5f8051 100644 --- a/packages/vtk/src/bbvtkPolyDataToActor.h +++ b/packages/vtk/src/bbvtkPolyDataToActor.h @@ -79,6 +79,8 @@ namespace bbvtk BBTK_DECLARE_INPUT(Colour,std::vector); BBTK_DECLARE_INPUT(Renderer,vtkRenderer *); BBTK_DECLARE_INPUT(Transform, vtkLinearTransform *); + BBTK_DECLARE_INPUT(Representation, int); + BBTK_DECLARE_INPUT(LineWitdth, double); BBTK_DECLARE_OUTPUT(Out,vtkProp3D *); BBTK_PROCESS(DoProcess); @@ -99,6 +101,8 @@ namespace bbvtk BBTK_INPUT(PolyDataToActor,Colour,"r g b",vectorcolour,"colour"); BBTK_INPUT(PolyDataToActor,Renderer,"3D scene in which to insert the surface",vtkRenderer*,""); BBTK_INPUT(PolyDataToActor,Transform,"Linear Transform (4x4 homogeneous)",vtkLinearTransform*,""); + BBTK_INPUT(PolyDataToActor,Representation,"0 points, 1(default) surface, 2 wireframe",int,""); + BBTK_INPUT(PolyDataToActor,LineWitdth,"Width of the wireframe (1 default)",double,""); BBTK_OUTPUT(PolyDataToActor,Out,"Extracted iso-surface",vtkProp3D *,""); BBTK_END_DESCRIBE_BLACK_BOX(PolyDataToActor); -- 2.45.1