From: Eduardo Davila Date: Fri, 12 Jun 2009 07:48:37 +0000 (+0000) Subject: no message X-Git-Tag: EED.02Oct2009~33 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=91a98a871f86ac13d5899661298b7badbfb442ad;p=creaMaracasVisu.git no message --- diff --git a/bbtk/src/bbcreaMaracasVisuSliceImage.cxx b/bbtk/src/bbcreaMaracasVisuSliceImage.cxx index 95991aa..037eadf 100644 --- a/bbtk/src/bbcreaMaracasVisuSliceImage.cxx +++ b/bbtk/src/bbcreaMaracasVisuSliceImage.cxx @@ -9,17 +9,19 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,SliceImage) BBTK_BLACK_BOX_IMPLEMENTATION(SliceImage,bbtk::AtomicBlackBox); void SliceImage::Process() { + printf("EED 0 SliceImage::Process \n"); vtkImageData *imagedata=NULL; if ( bbGetInputIn()!=NULL ){ - imageReslice->SetInput( imagedata ); - imageReslice->SetInformationInput(imagedata); + imageReslice->SetInput( bbGetInputIn() ); + imageReslice->SetInformationInput(bbGetInputIn() ); imageReslice->SetResliceAxesDirectionCosines(1,0,0, 0,1,0 ,0,0,1); imageReslice->SetResliceAxesOrigin(0,0, bbGetInputZ() ); imageReslice->SetOutputDimensionality(2); imageReslice->SetInterpolationModeToLinear(); - vtkImageData *imagedata = imageReslice->GetOutput(); + imagedata = imageReslice->GetOutput(); imagedata->Update(); imagedata->UpdateInformation(); + printf("EED 1 SliceImage::Process %p\n", imagedata); } bbSetOutputOut( imagedata ); } diff --git a/bbtk/src/bbmaracasvisuImageActor.cxx b/bbtk/src/bbmaracasvisuImageActor.cxx index 2c26bd7..f95af03 100644 --- a/bbtk/src/bbmaracasvisuImageActor.cxx +++ b/bbtk/src/bbmaracasvisuImageActor.cxx @@ -11,28 +11,35 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ImageActor,bbtk::AtomicBlackBox); void ImageActor::Process() { - //JCP 04/04/09 - vtkRenderer *render = bbGetInputRenderer(); - vtkImageData *img = bbGetInputIn(); - vtkLinearTransform* transform = bbGetInputTransform(); + //JCP 04/04/09 + vtkRenderer *render = bbGetInputRenderer(); + vtkImageData *img = bbGetInputIn(); + vtkLinearTransform* transform = bbGetInputTransform(); - if(img != NULL && transform != NULL){ - - imageactor = vtkImageActor::New(); - vtkImageShiftScale *imageshiftscale = vtkImageShiftScale::New(); - imageshiftscale->SetInput( img ); - imageshiftscale->SetOutputScalarTypeToUnsignedChar(); - imageactor->SetInput( imageshiftscale->GetOutput() ); - imageactor->SetUserTransform( transform ); - - if(render != NULL ){ - render->AddActor( imageactor ); + if(img != NULL){ + imageactor = vtkImageActor::New(); + vtkImageShiftScale *imageshiftscale = vtkImageShiftScale::New(); + imageshiftscale->SetInput( img ); + imageshiftscale->SetOutputScalarTypeToUnsignedChar(); + imageactor->SetInput( imageshiftscale->GetOutput() ); + if (transform!=NULL){ + imageactor->SetUserTransform( transform ); + } // transform + if(render != NULL ){ + render->AddActor( imageactor ); + } // render + bbSetOutputOut(imageactor); + } // img + + + // Interface Update + if ((firsttime==true) && (bbGetInputRenderer()!=NULL )) + { + firsttime=false; + bbGetInputRenderer()->AddActor( imageactor ); } - - + bbSetOutputOut(imageactor); - - } } void ImageActor::bbUserSetDefaultValues() diff --git a/bbtk/src/bbmaracasvisuImageActor.h b/bbtk/src/bbmaracasvisuImageActor.h index a6297ac..908b5de 100644 --- a/bbtk/src/bbmaracasvisuImageActor.h +++ b/bbtk/src/bbmaracasvisuImageActor.h @@ -38,7 +38,7 @@ BBTK_CATEGORY(""); BBTK_INPUT(ImageActor,In,"Image input",vtkImageData*,""); BBTK_INPUT(ImageActor,Transform,"Transform",vtkLinearTransform*,""); BBTK_INPUT(ImageActor,Renderer,"Renderer",vtkRenderer*,""); -BBTK_OUTPUT(ImageActor,Out,"Output actor",vtkProp3D*,""); +BBTK_OUTPUT(ImageActor,Out,"Output vtk actor",vtkProp3D*,""); BBTK_END_DESCRIBE_BLACK_BOX(ImageActor); } // EO namespace bbcreaMaracasVisu diff --git a/lib/doxygen/CMakeLists.txt b/lib/doxygen/CMakeLists.txt index cbcfdb2..e20ddb3 100644 --- a/lib/doxygen/CMakeLists.txt +++ b/lib/doxygen/CMakeLists.txt @@ -60,6 +60,10 @@ IF ( ${${PROJECT_NAME}_DOC} STREQUAL ON) CREA_CPDIR ( ${CMAKE_CURRENT_SOURCE_DIR}/bouml/pPlotter/pPlotter_HTML/ ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/pPlotter_HTML/ ) CREA_CPDIR ( ${CMAKE_CURRENT_SOURCE_DIR}/bouml/wxVtkViewer/wxVtkViewer_classDiagram1_HTML/ ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/wxVtkViewer_classDiagram1_HTML/ ) CREA_CPDIR ( ${CMAKE_CURRENT_SOURCE_DIR}/bouml/wxVtkViewer/wxVtkViewer_classDiagram2_HTML/ ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/wxVtkViewer_classDiagram2_HTML/ ) + CREA_CPDIR ( ${CMAKE_CURRENT_SOURCE_DIR}/bouml/manualContour/manualContour_MVC_HTML/ ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/manualContour_MVC_HTML/ ) + CREA_CPDIR ( ${CMAKE_CURRENT_SOURCE_DIR}/bouml/manualContour/manualContour_Model_HTML/ ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/manualContour_Model_HTML/ ) + CREA_CPDIR ( ${CMAKE_CURRENT_SOURCE_DIR}/bouml/manualContour/manualContour_View_HTML/ ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/manualContour_View_HTML/ ) + CREA_CPDIR ( ${CMAKE_CURRENT_SOURCE_DIR}/bouml/manualContour/manualContour_Controler_HTML/ ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/manualContour_Controler_HTML/ ) ADD_CUSTOM_TARGET(doxygen_${NAME} ALL DEPENDS ${DOXYGEN_OUTPUT}/${DOXYGEN_HTML_OUTPUT}/index.html diff --git a/lib/doxygen/DoxyMainPage.txt.in b/lib/doxygen/DoxyMainPage.txt.in index 3d2fd1a..0e6aa90 100644 --- a/lib/doxygen/DoxyMainPage.txt.in +++ b/lib/doxygen/DoxyMainPage.txt.in @@ -15,10 +15,10 @@ Viewers
pPlotter Class Diagram

Manual Contour Class Diagram
- -MVC (Model View Controler)
- -Model
- -View
- -Controler
+ -MVC (Model View Controler)
+ -Model
+ -View
+ -Controler

Sequence Diagrams ??????????


diff --git a/lib/doxygen/bouml/manualContour/manualContour/129177.diagram b/lib/doxygen/bouml/manualContour/manualContour/129177.diagram index 71924b3..435a281 100644 --- a/lib/doxygen/bouml/manualContour/manualContour/129177.diagram +++ b/lib/doxygen/bouml/manualContour/manualContour/129177.diagram @@ -2,15 +2,15 @@ format 66 classcanvas 128025 class_ref 129945 // manualContourModel draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default - xyz 105 229 2000 + xyz 92 229 2000 end classcanvas 128153 class_ref 131353 // manualViewBaseContour draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default - xyz 242 105 2008 + xyz 228 105 2008 end classcanvas 129177 class_ref 129689 // manualContourBaseControler draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default - xyz 369 228 2000 + xyz 351 228 2000 end note 130201 "MODEL" xyzwh 96 168 2000 65 36 diff --git a/lib/doxygen/bouml/manualContour/manualContour/manualContour.prj b/lib/doxygen/bouml/manualContour/manualContour/manualContour.prj index d1a65d1..82795f4 100644 --- a/lib/doxygen/bouml/manualContour/manualContour/manualContour.prj +++ b/lib/doxygen/bouml/manualContour/manualContour/manualContour.prj @@ -1,6 +1,6 @@ format 66 "manualContour" - revision 4 + revision 5 modified_by 2 "davila" @@ -31,13 +31,13 @@ format 66 show_infonote yes drawing_language uml show_stereotype_properties no class_color yellow duration_color transparent continuation_color gray note_color blue fragment_color transparent subject_color transparent usecase_color yellow package_color transparent component_color green artifact_color green deploymentnode_color gray state_color yellow stateaction_color transparent activity_color transparent activityregion_color transparent activitypartition_color transparent activityaction_color transparent parameterpin_color white - font_size 10 + font_size 12 diagram_format A4 mark_for_import ncouples 1 - key "html dir" value "/Users/davila/Creatis/creaMaracasVisu/lib/doxygen/bouml/manualContour/Controler_HTML/" + key "html dir" value "/Users/davila/Creatis/creaMaracasVisu/lib/doxygen/bouml/manualContour/manualContour_Controler_HTML/" classview 129177 "manualContour" //class diagram settings draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype 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_infonote default shadow default show_stereotype_properties default