#3470 merge vtk8itk5wx3-mingw64

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.cxx
index 59f3b902d368dd5b73d009b4449320c4f7bf57f6..9ca404f9a399f94c44a2837ffa56e9e8c8585aab 100644 (file)
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.cxx
@@ -263,9 +263,14 @@ void ReadMHDPlane::Read64lseek(std::string fileNameIn, std::string plane)
                long long       pos;
                long long lsize                 = dimX*dimY*width *dataSize;
 #if defined(_WIN32)
-                  _sopen_s( &fd, filename.c_str(), _O_RDONLY, _SH_DENYNO, 0 );
+            _sopen_s( &fd, filename.c_str(), _O_RDONLY, _SH_DENYNO, 0 );
 #else
-               fd = open ( filename.c_str() ,  O_RDONLY|O_LARGEFILE );
+        //EED2021-09-03
+        #if defined(MACOSX)
+            fd = open ( filename.c_str() ,  O_RDONLY );
+        #else
+            fd = open ( filename.c_str() ,  O_RDONLY|O_LARGEFILE );
+        #endif
 #endif // defined(_WIN32)
                if (fd < 0)
                {
@@ -297,7 +302,12 @@ void ReadMHDPlane::Read64lseek(std::string fileNameIn, std::string plane)
 #if defined(_WIN32)
                        if (_lseeki64( fd, pos, SEEK_SET ) < 0)
 #else
-                       if (lseek64(fd, pos, SEEK_SET) < 0) 
+            //EED2021-09-03
+            #if defined(MACOSX)
+                if (lseek(fd, pos, SEEK_SET) < 0)
+            #else
+                if (lseek64(fd, pos, SEEK_SET) < 0)
+            #endif
 #endif // defined(_WIN32)
                        {
                                printf("EED ReadMHDPlane::Read64lseek \n");
@@ -386,7 +396,12 @@ void ReadMHDPlane::copy_YZ_plane(int fd,vtkImageData *newImage,int slice,int iWi
 #if defined(_WIN32)
                        if (_lseeki64( fd, pos , SEEK_SET ) < 0)
 #else
-                       if (lseek64(fd, pos , SEEK_SET) < 0) 
+            //EED2021-09-03
+            #if defined(MACOSX)
+                if (lseek(fd, pos , SEEK_SET) < 0)
+            #else
+                if (lseek64(fd, pos , SEEK_SET) < 0)
+            #endif
 #endif // defined(_WIN32)
                        {
                                printf("EED ReadMHDPlane::Read64lseek \n");
@@ -418,7 +433,12 @@ void ReadMHDPlane::copy_ZX_plane(int fd,vtkImageData *newImage,int slice,int iWi
 #if defined(_WIN32)
                if (_lseeki64( fd, pos + j*sizeBytesPlane , SEEK_SET ) < 0)
 #else
-               if (lseek64(fd, pos + j*sizeBytesPlane , SEEK_SET) < 0) 
+            //EED2021-09-03
+            #if defined(MACOSX)
+                if (lseek(fd, pos + j*sizeBytesPlane , SEEK_SET) < 0)
+            #else
+                if (lseek64(fd, pos + j*sizeBytesPlane , SEEK_SET) < 0)
+            #endif
 #endif // defined(_WIN32)
                {
                        printf("EED ReadMHDPlane::Read64lseek \n");

diff --git a/lib/creaVtk/vtkTensorsVisu.cpp b/lib/creaVtk/vtkTensorsVisu.cpp
index c07942231a06686cf4cbe7c78a7dba1fb3bdece2..182f1d734cefcb6145d9b87b5849cceab0e3c117 100644 (file)
--- a/lib/creaVtk/vtkTensorsVisu.cpp
+++ b/lib/creaVtk/vtkTensorsVisu.cpp
@@ -205,7 +205,9 @@ void vtkTensorsVisu::Process()
        //_pdm->SetColorModeToDefault();
        // _pdm->SetColorModeToDirectScalars();  // NOT compile
        _pdm->SetScalarModeToUsePointFieldData();
-       _pdm->ImmediateModeRenderingOn();
+
+//EED2021-09-03 Deprecated. Removed in vtk 8.1
+//     _pdm->ImmediateModeRenderingOn();
 
        _LutEED->SetVectorModeToComponent();
        //_LutEED->SetVectorModeToRGBColors();

diff --git a/lib/creaVtk/vtkVectorsVisu.cpp b/lib/creaVtk/vtkVectorsVisu.cpp
index 248420aa929128151ccc75ed66031266fe8fecdb..51392f7300698a6dac591902cc216c62060a409c 100644 (file)
--- a/lib/creaVtk/vtkVectorsVisu.cpp
+++ b/lib/creaVtk/vtkVectorsVisu.cpp
@@ -264,6 +264,33 @@ void vtkVectorsVisu::Process()
                        printf("EED Warnning! vtkVectorsVisu::Process   GetDataObject()  is EMPTY\n");
                }// if GetDataObject()!=NULL
 
+       _pdm->ScalarVisibilityOn();
+       _pdm->SetColorModeToMapScalars();
+       //_pdm->SetColorModeToDefault();
+       // _pdm->SetColorModeToDirectScalars();  // NOT compile
+       _pdm->SetScalarModeToUsePointFieldData();
+
+//EED2021-09-03 Deprecated. Removed in vtk 8.1
+//     _pdm->ImmediateModeRenderingOn();
+
+       _LutEED->SetVectorModeToComponent();
+       //_LutEED->SetVectorModeToRGBColors();
+       //_LutEED->SetVectorModeToMagnitud();
+
+//         _pdm->SetScalarModeToUsePointFieldData();
+         _pdm->SetLookupTable( _LutEED );
+         _pdm->SelectColorArray( "GlyphVector" );
+
+//       vSliceMapperVec->SetLookupTable( vGreenToRedLut );
+//       vSliceMapperVec->SetColorModeToMapScalars();
+
+#if VTK_MAJOR_VERSION <= 5
+               // ..
+#else
+         _pdm->Update();
+#endif
+         _actor->SetMapper( _pdm );
+         _actor->GetProperty()->SetOpacity( GetOpacity() );
     } else {
                _vtkglyph->SetInputData( NULL );  
                _vtkglyph->Update();