changes in viewers, now is possible to initialize them with out an image but the...

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / vtkBaseData.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkBaseData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkBaseData.cxx
index 5fe3f8b3b017a7fbf0847ddf95bd767285267964..bcec9763fb175e9caed38e2bf38f6aef4e302209 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkBaseData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkBaseData.cxx
@@ -6,7 +6,7 @@ vtkBaseData::vtkBaseData()
 
        _z            = 0;
        _t            = 0;
-       _marImageData = NULL;
+       _marImageData = 0;
 }
 
 //-------------------------------------------------------------------
@@ -24,7 +24,12 @@ void vtkBaseData::SetMarImageData(marImageData *marimagedata)
 //-------------------------------------------------------------------
 vtkImageData* vtkBaseData::GetImageData()
 {
-       return _marImageData->GetImageDataT(_t);
+       if(_marImageData){
+               return _marImageData->GetImageDataT(_t);
+       }else{
+               return 0;
+       }
+       
 }
 //-------------------------------------------------------------------
 marImageData* vtkBaseData::GetMarImageData()
@@ -47,6 +52,9 @@ void vtkBaseData::SetZ(double z){
 //     maxZ=dim[2];
 
        int ext[6];
+       double *origin;
+       
+       
        vtkImageData* img = _marImageData->GetImageData();
        if(img!=NULL){
                /*img->GetWholeExtent(ext);
@@ -63,13 +71,14 @@ void vtkBaseData::SetZ(double z){
 
                _z=z;*/
                img->GetExtent(ext);
+               origin = img->GetOrigin();
                if (z > ext[5])
                {
-                       z = ext[5];
+                       z = ext[5] + origin[2];
                }
                if (z < ext[4])
                {
-                       z = ext[4];
+                       z = ext[4] + origin[2];
                }
 
                _z=z;