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

diff --git a/lib/cpExtensions/Visualization/ImageSliceActors.cxx b/lib/cpExtensions/Visualization/ImageSliceActors.cxx
index 0081175..024fbe0 100644
--- a/lib/cpExtensions/Visualization/ImageSliceActors.cxx
+++ b/lib/cpExtensions/Visualization/ImageSliceActors.cxx
@@ -84,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 );
 }
 
 // -------------------------------------------------------------------------
@@ -98,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 );
 }
 
 // -------------------------------------------------------------------------
@@ -327,8 +327,8 @@ 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
 
@@ -359,7 +359,7 @@ PopActorsFrom( vtkRenderWindow* window )
 unsigned int cpExtensions::Visualization::ImageSliceActors::
 GetNumberOfImages( ) const
 {
-  return( this->m_Blender->GetNumberOfInputPorts( ) );
+  return( this->m_Blender->GetNumberOfInputs( ) );
 }
 
 // -------------------------------------------------------------------------
@@ -860,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;
@@ -921,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';
@@ -975,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
@@ -1001,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';
@@ -1063,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 );