]> Creatis software - creaMaracasVisu.git/commitdiff
no message
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Fri, 12 Jun 2009 07:48:37 +0000 (07:48 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Fri, 12 Jun 2009 07:48:37 +0000 (07:48 +0000)
bbtk/src/bbcreaMaracasVisuSliceImage.cxx
bbtk/src/bbmaracasvisuImageActor.cxx
bbtk/src/bbmaracasvisuImageActor.h
lib/doxygen/CMakeLists.txt
lib/doxygen/DoxyMainPage.txt.in
lib/doxygen/bouml/manualContour/manualContour/129177.diagram
lib/doxygen/bouml/manualContour/manualContour/manualContour.prj

index 95991aa50276ce5b314047e016faf4b4c091522a..037eadf9a452dad307a09735275f7da6ccba2221 100644 (file)
@@ -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 );
 }
index 2c26bd7c30720429b716bbb2c4f372966eb479ad..f95af03aa17cadf31ee64cceec722a46dcd10d8e 100644 (file)
@@ -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()
index a6297ac1eaa30353625c671137a1de862324a7dd..908b5de17c00e72241431b383f9e608576999b52 100644 (file)
@@ -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
index cbcfdb26c54eff0c457c7d9857a2bc3930317522..e20ddb300d0ffae0a3d1cfbbceea06a3581c8fa1 100644 (file)
@@ -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
index 3d2fd1a90af57192bbc8b51acaefe3dd1e72d388..0e6aa9039173508132ba64930a27d628f7727312 100644 (file)
@@ -15,10 +15,10 @@ Viewers <br>
 <a href="../pPlotter_HTML/index.html"> pPlotter Class Diagram</a> <br>
 <br>
 Manual Contour Class Diagram <br>
-<a href="../manualContour_HTML/MVC/index.html"> -MVC (Model View Controler)</a> <br>
-<a href="../manualContour_HTML/Model/index.html"> -Model</a> <br>
-<a href="../manualContour_HTML/View/index.html"> -View</a> <br>
-<a href="../manualContour_HTML/Controloer/index.html"> -Controler</a> <br>
+<a href="../manualContour_MVC_HTML/index.html"> -MVC (Model View Controler)</a> <br>
+<a href="../manualContour_Model_HTML/index.html"> -Model</a> <br>
+<a href="../manualContour_View_HTML/index.html"> -View</a> <br>
+<a href="../manualContour_Controler_HTML/index.html"> -Controler</a> <br>
 
 <H2>Sequence Diagrams  ?????????? </H2>
 <br>
index 71924b3d60c56e09411c0091d861b2f55507a270..435a2819fa95d1064ae213dad12261e61428812d 100644 (file)
@@ -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
index d1a65d1f656e680cd2a38b069c232a5e632784ea..82795f4fe5011911c5da8297848f7b89be033c28 100644 (file)
@@ -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