X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpExtensions%2FVisualization%2FImageSliceActors.cxx;h=024fbe09c9bc94051ac6652bc19092f7de7a2424;hb=e2fb8817731f6231d34941a208e46b36dad425b2;hp=b444328be321e2946c54807f4a59345da8f312fd;hpb=4c1d2229e65d601ac8138d804b4ae5e91c468e1a;p=cpPlugins.git

diff --git a/lib/cpExtensions/Visualization/ImageSliceActors.cxx b/lib/cpExtensions/Visualization/ImageSliceActors.cxx
index b444328..024fbe0 100644
--- a/lib/cpExtensions/Visualization/ImageSliceActors.cxx
+++ b/lib/cpExtensions/Visualization/ImageSliceActors.cxx
@@ -45,7 +45,6 @@ SetAxis( int axis )
   this->m_ImageActor->Modified( );
   this->m_BlenderActor->Modified( );
   this->Modified( );
-  this->ResetCamera( );
 }
 
 // -------------------------------------------------------------------------
@@ -85,7 +84,7 @@ AddBinaryConnection(
     return( -1 );
   this->m_Blender->AddInputConnection( aout );
   this->_ConfigureBinaryImage( r, g, b );
-  return( this->m_Blender->GetNumberOfInputPorts( ) - 1 );
+  return( this->m_Blender->GetNumberOfInputs( ) - 1 );
 }
 
 // -------------------------------------------------------------------------
@@ -99,7 +98,7 @@ AddBinaryImage(
     return( -1 );
   this->m_Blender->AddInputData( data );
   this->_ConfigureBinaryImage( r, g, b );
-  return( this->m_Blender->GetNumberOfInputPorts( ) - 1 );
+  return( this->m_Blender->GetNumberOfInputs( ) - 1 );
 }
 
 // -------------------------------------------------------------------------
@@ -130,9 +129,6 @@ Clear( )
   this->m_BlenderActor->GetProperty( )->SetLookupTable( this->m_BlenderLUT );
   this->m_BlenderActor->GetProperty( )->UseLookupTableScalarRangeOn( );
 
-  // Remove associated objects
-  this->m_AssociatedSlices.clear( );
-
   // White cursor
   vtkSmartPointer< vtkPoints > cursor_points =
     vtkSmartPointer< vtkPoints >::New( );
@@ -331,14 +327,13 @@ PushActorsInto( vtkRenderWindow* window, bool force_style )
     }
     else // if( axis == 2 )
     {
-      camera->SetPosition( double( 0 ), double(  0 ), double( 1 ) );
-      camera->SetViewUp  ( double( 0 ), double( -1 ), double( 0 ) );
+      camera->SetPosition( double( 0 ), double(  0 ), double( -1 ) );
+      camera->SetViewUp  ( double( 0 ), double( -1 ), double(  0 ) );
 
     } // fi
 
   } // fi
-  this->ResetCamera( );
-  rwi->Render( );
+  renderer->ResetCamera( );
 }
 
 // -------------------------------------------------------------------------
@@ -356,8 +351,6 @@ PopActorsFrom( vtkRenderWindow* window )
     renderer->RemoveViewProp( this->m_TextActor );
     renderer->RemoveViewProp( this->m_Axis1Actor );
     renderer->RemoveViewProp( this->m_Axis2Actor );
-    if( rwi != NULL )
-      rwi->Render( );
 
   } // fi
 }
@@ -366,7 +359,7 @@ PopActorsFrom( vtkRenderWindow* window )
 unsigned int cpExtensions::Visualization::ImageSliceActors::
 GetNumberOfImages( ) const
 {
-  return( this->m_Blender->GetNumberOfInputPorts( ) );
+  return( this->m_Blender->GetNumberOfInputs( ) );
 }
 
 // -------------------------------------------------------------------------
@@ -867,25 +860,6 @@ SetSliceNumber( const int& slice )
   // Update text
   this->UpdateText( );
 
-  // Update lines from associated slices
-  /* TODO
-     auto sIt = this->m_AssociatedSlices.begin( );
-     for( ; sIt != this->m_AssociatedSlices.end( ); ++sIt )
-     {
-     Self* slice = *sIt;
-     for( unsigned int id = 0; id < slice->m_AssociatedSlices.size( ); ++id )
-     {
-     std::cout << id << std::endl;
-     if( slice->m_AssociatedSlices[ id ] != this )
-     continue;
-
-     std::cout << "id : " << id << std::endl;
-
-     } // rof
-
-     } // rof
-  */
-
   // Update camera position
   if( this->m_Window == NULL )
     return;
@@ -928,10 +902,17 @@ UpdateText( )
     else if( axId == 1 ) axis = 'Y';
     else if( axId == 2 ) axis = 'Z';
 
+#if defined(WIN32)
+    sprintf_s(
+      this->m_TextBuffer, 1024, "Axis: %c (%d)",
+      axis, this->m_ImageMapper->GetSliceNumber( )
+      );
+#else // defined(WIN32)
     std::sprintf(
       this->m_TextBuffer, "Axis: %c (%d)",
       axis, this->m_ImageMapper->GetSliceNumber( )
       );
+#endif // defined(WIN32)
   }
   else
     this->m_TextBuffer[ 0 ] = '\0';
@@ -982,11 +963,18 @@ UpdateText( double pos[ 3 ] )
             ijk[ 0 ], ijk[ 1 ], ijk[ 2 ], n
             );
       str << ")";
+
+#if defined(WIN32)
+      sprintf_s(
+        this->m_TextBuffer, 1024, "Axis: %c (%d)\nPixel %s",
+        axis, slice, str.str( ).c_str( )
+        );
+#else // defined(WIN32)
       std::sprintf(
         this->m_TextBuffer, "Axis: %c (%d)\nPixel %s",
         axis, slice, str.str( ).c_str( )
         );
-
+#endif // defined(WIN32)
     } // fi
   }
   else
@@ -1008,10 +996,17 @@ UpdateText( const double& w, const double& l )
     else if( axId == 1 ) axis = 'Y';
     else if( axId == 2 ) axis = 'Z';
 
+#if defined(WIN32)
+    sprintf_s(
+      this->m_TextBuffer, 1024, "Axis: %c (%d)\nW/L (%.2f/%.2f)",
+      axis, this->m_ImageMapper->GetSliceNumber( ), w, l
+      );
+#else // defined(WIN32)
     std::sprintf(
       this->m_TextBuffer, "Axis: %c (%d)\nW/L (%.2f/%.2f)",
       axis, this->m_ImageMapper->GetSliceNumber( ), w, l
       );
+#endif // defined(WIN32)
   }
   else
     this->m_TextBuffer[ 0 ] = '\0';
@@ -1022,17 +1017,16 @@ UpdateText( const double& w, const double& l )
 
 // -------------------------------------------------------------------------
 void cpExtensions::Visualization::ImageSliceActors::
-Render( const double& t )
+Render( )
 {
-  if( this->m_Window != NULL )
-  {
-    vtkRenderer* renderer =
-      this->m_Window->GetRenderers( )->GetFirstRenderer( );
-    if( renderer != NULL )
-      renderer->SetAllocatedRenderTime( t );
-    this->m_Window->Render( );
-
-  } // fi
+  if( this->m_Window == NULL )
+    return;
+  vtkRenderer* renderer =
+    this->m_Window->GetRenderers( )->GetFirstRenderer( );
+  if( renderer == NULL )
+    return;
+  renderer->SetAllocatedRenderTime( 1e-3 );
+  this->m_Window->Render( );
 }
 
 // -------------------------------------------------------------------------
@@ -1043,8 +1037,9 @@ ResetCamera( )
     return;
   vtkRenderer* renderer =
     this->m_Window->GetRenderers( )->GetFirstRenderer( );
-  if( renderer != NULL )
-    renderer->ResetCamera( this->m_VisibleBounds );
+  if( renderer == NULL )
+    return;
+  renderer->ResetCamera( );
 }
 
 // -------------------------------------------------------------------------
@@ -1070,6 +1065,7 @@ _ConfigureStyle( )
 {
   // Connect this view with a controller
   this->m_Style = vtkSmartPointer< TStyle >::New( );
+  this->m_Style->SetAssociatedObject( this );
   this->m_Style->AddMouseMoveCommand( Self::_MouseMoveCommand, this );
   this->m_Style->AddMouseClickCommand( Self::_MouseClickCommand, this );
   this->m_Style->AddMouseWheelCommand( Self::_MouseWheelCommand, this );
@@ -1160,7 +1156,7 @@ _MouseMoveCommand(
     // Just show the pixel information
     actors->SetCursor( pos );
     actors->UpdateText( pos );
-    actors->Render( 1e-3 );
+    actors->Render( );
   }
   else if( btn == TStyle::ButtonID_Left )
   {
@@ -1168,12 +1164,12 @@ _MouseMoveCommand(
     {
       // Show axes in current renderer
       actors->SetAxesCursor( pos );
+      actors->Render( );
 
       // Interactively move slices
       auto i = actors->m_SlicesCommands.begin( );
       for( ; i != actors->m_SlicesCommands.end( ); ++i )
         i->first( pos, actors->GetAxis( ), i->second );
-      actors->Render( 1e-3 );
 
     } // fi
   }
@@ -1198,7 +1194,7 @@ _MouseMoveCommand(
       dx += actors->m_StartWindowLevel[ 0 ];
       dy += actors->m_StartWindowLevel[ 1 ];
       actors->SetWindowLevel( dx, dy );
-      actors->Render( 1e-3 );
+      actors->Render( );
 
       // Associate objects
       auto i = actors->m_WindowLevelCommands.begin( );
@@ -1247,15 +1243,11 @@ _MouseWheelCommand(
     if( slice > actors->GetSliceNumberMaxValue( ) )
       slice = actors->GetSliceNumberMaxValue( );
     actors->SetSliceNumber( slice );
+    actors->Render( );
 
     auto a = actors->m_AssociatedSlices.begin( );
     for( ; a != actors->m_AssociatedSlices.end( ); ++a )
-    {
       ( *a )->SetSliceNumber( slice );
-      ( *a )->Render( 1e-3 );
-
-    } // rof
-    actors->Render( 1e-3 );
 
     // Associate objects
     auto i = actors->m_RenderCommands.begin( );
@@ -1278,7 +1270,7 @@ _KeyCommand( void* data, const char& key )
   case 'r': case 'R':
   {
     actors->ResetCamera( );
-    actors->Render( 1e-3 );
+    actors->Render( );
 
     // Associate objects
     auto i = actors->m_RenderCommands.begin( );
@@ -1289,7 +1281,7 @@ _KeyCommand( void* data, const char& key )
   case 'w': case 'W':
   {
     actors->ResetWindowLevel( );
-    actors->Render( 1e-3 );
+    actors->Render( );
 
     // Associate objects
     auto i = actors->m_RenderCommands.begin( );
@@ -1312,7 +1304,7 @@ _EnterCommand( void* data )
 
   actors->ResetCursor( );
   actors->m_CursorActor->VisibilityOn( );
-  actors->Render( 1e-3 );
+  actors->Render( );
 }
 
 // -------------------------------------------------------------------------
@@ -1325,7 +1317,7 @@ _LeaveCommand( void* data )
 
   actors->ResetCursor( );
   actors->m_CursorActor->VisibilityOff( );
-  actors->Render( 1e-3 );
+  actors->Render( );
 }
 
 // eof - $RCSfile$