X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkMagnitud.cxx;h=b6205e12e12491b6f3014f419bab7e9652c21f3f;hb=5ff413fe20e5820f4442f44e78e2ecf68e7e9691;hp=c0e21cedf3bc6f2d4775e38226cfcf4f7733c410;hpb=b5d2eb7c48011dfed815c80c3bb460ff9bee27f4;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkMagnitud.cxx b/packages/vtk/src/bbvtkMagnitud.cxx
index c0e21ce..b6205e1 100644
--- a/packages/vtk/src/bbvtkMagnitud.cxx
+++ b/packages/vtk/src/bbvtkMagnitud.cxx
@@ -41,6 +41,8 @@ BBTK_BLACK_BOX_IMPLEMENTATION(Magnitud,bbtk::AtomicBlackBox);
 void Magnitud::Process()
 {
 
+printf("EED Magnitud::Process Start\n");
+
 // THE MAIN PROCESSING METHOD BODY
 //   Here we simply set the input 'In' value to the output 'Out'
 //   And print out the output value
@@ -54,9 +56,10 @@ void Magnitud::Process()
 //      (the one provided in the attribute 'type' of the tag 'input')
 
 // ---------- 
- if (bbGetInputIn()!=NULL) {
-   vGreenToRedLut->SetHueRange(0.6667,0.0);
-   vGreenToRedLut->Build();
+	if (bbGetInputIn()!=NULL) 
+	{
+		vGreenToRedLut->SetHueRange(0.6667,0.0);
+   		vGreenToRedLut->Build();
   
   //Input Data
 //EED 2017-01-01 Migration VTK7
@@ -84,6 +87,10 @@ void Magnitud::Process()
    vMaskPoint->SetOnRatio(100);
    vMaskPoint->Update();
    vMaskPoint->RandomModeOn();
+
+   vGlyph->SetScaleModeToScaleByVector();
+   vGlyph->SetColorModeToColorByVector();
+   vGlyph->SetScaleFactor(0.20);
    
 //EED 2017-01-01 Migration VTK7
 #if (VTK_MAJOR_VERSION <= 5) 
@@ -92,12 +99,10 @@ void Magnitud::Process()
 #endif
 #if (VTK_MAJOR_VERSION >= 6) 
    vGlyph->SetInputData(vMaskPoint->GetOutput());
+	cone->Update();
    vGlyph->SetSourceData(cone->GetOutput());
 #endif
 
-   vGlyph->SetScaleModeToScaleByVector();
-   vGlyph->SetColorModeToColorByVector();
-   vGlyph->SetScaleFactor(0.20);
 
 //EED 2017-01-01 Migration VTK7
 #if (VTK_MAJOR_VERSION <= 5) 
@@ -110,10 +115,10 @@ void Magnitud::Process()
    step = (range1[1]-range1[0])/10;
       
    //Contour
-   dRangeColorForMultipleContourVelocity[0]=0;
-   dRangeColorForMultipleContourVelocity[1]=1;
-   dRangeColorForGlyphVelocity[0]=0;
-   dRangeColorForGlyphVelocity[1]=1;
+   dRangeColorForMultipleContourVelocity[0]	= 0;
+   dRangeColorForMultipleContourVelocity[1]	= 1;
+   dRangeColorForGlyphVelocity[0]			= 0;
+   dRangeColorForGlyphVelocity[1]			= 1;
 //EED 2017-01-01 Migration VTK7
 #if (VTK_MAJOR_VERSION <= 5) 
    vMultipleContourVelocity->SetInput((vtkDataSet *) vVecMagnitude->GetOutput()); 
@@ -159,7 +164,8 @@ void Magnitud::Process()
 #endif
 #if (VTK_MAJOR_VERSION >= 6) 
    vOutlineGrid->SetInputData( bbGetInputIn() );
-   vOutlineMapper->SetInputData(vOutlineGrid->GetOutput());
+  	vOutlineGrid->Update();
+   vOutlineMapper->SetInputData( vOutlineGrid->GetOutput() );
 #endif
 
    
@@ -194,10 +200,14 @@ void Magnitud::Process()
    vGlyph->SetScaleFactor(vGlyph->GetScaleFactor()+0.1);
    vGlyph->Update();
    if( (bbGetInputScale()/100)<0 ) 
+	{
       bbSetInputScale(0);
+	}
    if( (bbGetInputScale()/100)>1 ) 
+	{
       bbSetInputScale(1);
-   
+   }
+
    //vGlyph->SetScaleFactor(dScale);
    vGlyph->SetScaleFactor( bbGetInputScale()/100 );
    vGlyph->Update();
@@ -217,9 +227,14 @@ void Magnitud::Process()
    vMultipleContourMapper->SetScalarRange( range1 );
 
    if( bbGetInputOpactity()/100<0 ) 
-      bbSetInputOpactity(0);
+	{
+     	bbSetInputOpactity(0);
+	}
+
    if( bbGetInputOpactity()/100>1 ) 
-      bbSetInputOpactity(1);
+	{
+     	bbSetInputOpactity(1);
+	}
 
    //Set Contour Opacity
    vMultipleContourActor->GetProperty()->SetOpacity( bbGetInputOpactity()/100 );
@@ -230,7 +245,9 @@ void Magnitud::Process()
 
    //Set The Number of Contours
    if( bbGetInputContour()<1) 
-      bbSetInputContour(1);
+	{
+		bbSetInputContour(1);
+	}
 
    step=(range1[1]-range1[0])/bbGetInputContour();
    index=0;
@@ -317,7 +334,7 @@ void Magnitud::Process()
 #endif
 #if (VTK_MAJOR_VERSION >= 6) 
    streamer->SetInputData( bbGetInputIn() );
-   streamer->SetSourceData(source->GetOutput());
+   streamer->SetSourceData( source->GetOutput() );
 #endif
 
    streamer->SetIntegratorTypeToRungeKutta45();
@@ -380,15 +397,16 @@ void Magnitud::Process()
    vtransformpolydatafilter->SetInput( vDiskSourceEED->GetOutput() );
    vProbeslices->SetInput( ( vtkDataSet* )vtransformpolydatafilter->GetOutput());
    vProbeslices->SetSource( bbGetInputIn() ); 
-   vGlyphFlowPlane->SetInput(vProbeslices->GetOutput());
-   vGlyphFlowPlane->SetSource(vArrowSource->GetOutput());
+   vGlyphFlowPlane->SetInput( vProbeslices->GetOutput() );
+   vGlyphFlowPlane->SetSource( vArrowSource->GetOutput() );
 #endif
 #if (VTK_MAJOR_VERSION >= 6) 
    vtransformpolydatafilter->SetInputData( vDiskSourceEED->GetOutput() );
    vProbeslices->SetInputData( ( vtkDataSet* )vtransformpolydatafilter->GetOutput());
    vProbeslices->SetSourceData( bbGetInputIn() ); 
-   vGlyphFlowPlane->SetInputData(vProbeslices->GetOutput());
-   vGlyphFlowPlane->SetSourceData(vArrowSource->GetOutput());
+   vGlyphFlowPlane->SetInputData( vProbeslices->GetOutput() );
+	vArrowSource->Update();
+   vGlyphFlowPlane->SetSourceData( vArrowSource->GetOutput() );
 #endif
 
    vtransformpolydatafilter->Update();
@@ -408,6 +426,7 @@ void Magnitud::Process()
 #endif
 #if (VTK_MAJOR_VERSION >= 6) 
    vProbeslicesFlowWidget->SetInputData( ( vtkDataSet* )vPlanSource->GetOutput());
+	vVecMagnitude->Update();
    vProbeslicesFlowWidget->SetSourceData( vVecMagnitude->GetOutput() ); 
 #endif
 
@@ -423,9 +442,11 @@ void Magnitud::Process()
    vSliceMapper->SetInput( vAppendDataForFlowWidgetVisualisation->GetOutput());
 #endif
 #if (VTK_MAJOR_VERSION >= 6) 
-   vAppendDataForFlowWidgetVisualisation->AddInputData(vGlyphFlowPlane->GetOutput());
-   vAppendDataForFlowWidgetVisualisation->AddInputData(vProbeslicesFlowWidget->GetPolyDataOutput());
-   vSliceMapper->SetInputData( vAppendDataForFlowWidgetVisualisation->GetOutput());
+	vGlyphFlowPlane->Update(); 
+	vProbeslicesFlowWidget->Update(); 
+   vAppendDataForFlowWidgetVisualisation->AddInputData( vGlyphFlowPlane->GetOutput() );
+   vAppendDataForFlowWidgetVisualisation->AddInputData( vProbeslicesFlowWidget->GetPolyDataOutput() );
+   vSliceMapper->SetInputData( vAppendDataForFlowWidgetVisualisation->GetOutput() );
 #endif
 
    vSliceMapper->SetScalarRange( range );
@@ -434,9 +455,11 @@ void Magnitud::Process()
    vSliceActor->SetMapper( vSliceMapper );
 
    if(bbGetInputShowPlane() == 1)
+	{
       vPlaneWidget->On();
-   else if(bbGetInputShowPlane() == 0)
+	} else if(bbGetInputShowPlane() == 0) {
       vPlaneWidget->Off();
+	}
 
    vSliceActor->GetProperty()->SetOpacity( bbGetInputShowPlane() );
 
@@ -447,21 +470,25 @@ void Magnitud::Process()
    bbSetOutputOut2( vGlyphActor );
    bbSetOutputOut3( vOutlineActor );
    bbSetOutputOut4( vMultipleContourActor );
-   //bbSetOutputOut5( vScalarBarActor );
+
+//   bbSetOutputOut5( vScalarBarActor );
+
    if(bbGetInputShowStream() == 1)
+	{
       vStreamlineActor2->SetMapper( streamMapper2 );
-   else 
+	}   else {
       vStreamlineActor2->SetMapper( NULL );
-
+	}
    bbSetOutputOut5( vStreamlineActor2 );
    //bbSetOutputOut5( vStreamlineActor2 );
    //bbSetOutputOutExport( exporter );
    //temp->GetData( (vtkInformation*) vMultipleContourVelocity->GetOutput() );
    //temp->GetData( vMultipleContourMapper->GetOutput() );
    //bbSetOutputOutTest( temp );
+ } // if
 
+printf("EED Magnitud::Process End\n");
 
- } // if
 
 } // process
 
@@ -503,13 +530,13 @@ void Magnitud::bbUserInitializeProcessing()
 //    if any 
 
 // ---------- [
-   cone = vtkArrowSource::New();
-   exporter = vtkImageExport::New();
-   point = vtkPolyData::New();
-   rf = vtkTubeFilter::New();
-   source = vtkPointSource::New();
-   streamer = vtkStreamTracer::New();
-   streamMapper2 = vtkPolyDataMapper::New();
+   cone 					= vtkArrowSource::New();
+   exporter 				= vtkImageExport::New();
+   point 					= vtkPolyData::New();
+   rf 						= vtkTubeFilter::New();
+   source 					= vtkPointSource::New();
+   streamer 				= vtkStreamTracer::New();
+   streamMapper2			= vtkPolyDataMapper::New();
    
    transformEED             = vtkTransform::New();
    vAppendDataForFlowWidgetVisualisation = vtkAppendPolyData::New();
@@ -520,7 +547,7 @@ void Magnitud::bbUserInitializeProcessing()
    vGlyphFlowPlane          = vtkGlyph3D::New();
    vGlyphMapper             = vtkPolyDataMapper::New();
    vGreenToRedLut           = vtkLookupTable::New();
-   vIren                    = vtkRenderWindowInteractor::New();
+//   vIren                    = vtkRenderWindowInteractor::New();
    vMaskPoint               = vtkMaskPoints::New();
    vMultipleContourActor    = vtkActor::New();
    vMultipleContourMapper   = vtkPolyDataMapper::New();