From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Tue, 27 Sep 2016 13:16:09 +0000 (+0200)
Subject: #3020 creaMaracasVisu Bug New Normal  -  ViewerNV opacity, isovalue slice (size)
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f658da98570615a244656fc122d935b6fc9a3c65;hp=-c;p=creaMaracasVisu.git

#3020 creaMaracasVisu Bug New Normal  -  ViewerNV opacity, isovalue slice (size)
---

f658da98570615a244656fc122d935b6fc9a3c65
diff --combined lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
index 258bf30,8578922..8b0bcaa
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_ViewerWidget.cxx
@@@ -66,7 -66,7 +66,7 @@@
  		//RaC 03-2010 Adding a tab
  		wxPanel				*controlPanelClippingVol3D	= NULL;
  
 -		wxBoxSizer *sizer			= 0;
 +		wxBoxSizer *sizer								= 0;
  
  		mType = type;
  
@@@ -361,15 -361,15 +361,15 @@@ void wxMaracas_ViewerWidget::Refresh(bo
  	//-------------------------------------------------------------------------
  	void wxMaracas_ViewerWidget::RefreshView()
  	{
- 		if (mvtk2Dbaseview				!=NULL ){ mvtk2Dbaseview->Refresh();				}
- 		if (mvtkmpr2Dview_X				!=NULL ){ mvtkmpr2Dview_X->Refresh();				}
- 		if (mvtkmpr2Dview_Y				!=NULL ){ mvtkmpr2Dview_Y->Refresh();				}
- 		if (mvtkmpr2Dview_Z				!=NULL ){ mvtkmpr2Dview_Z->Refresh();				}
- 		if (mvtkplane2Dview				!=NULL ){ mvtkplane2Dview->Refresh();				}
- 		if (mwxsphereview				!=NULL ){ mwxsphereview	->RefreshView();			}
- 		if (mwxvtkmpr3Dview				!=NULL ){ mwxvtkmpr3Dview->RefreshView();			}
- 		if (mwxvtkclipping3Dview		!=NULL ){ mwxvtkclipping3Dview->Refresh();			}
- 		if (mwxvtk3Dbaseview_Clipping3D !=NULL ){ mwxvtk3Dbaseview_Clipping3D->Refresh();	}
+ 		if (mwxvtk3Dbaseview_Clipping3D !=NULL ){ mwxvtk3Dbaseview_Clipping3D->Refresh();	 }
+ 		if (mwxvtkclipping3Dview		!=NULL ){ mwxvtkclipping3Dview->Refresh();			 }
+ 		if (mwxvtkmpr3Dview				!=NULL ){ mwxvtkmpr3Dview->RefreshView();			 }
+ 		if (mvtk2Dbaseview				!=NULL ){ mvtk2Dbaseview->Refresh();				 }
+ 		if (mvtkmpr2Dview_X				!=NULL ){ mvtkmpr2Dview_X->Refresh();				 }
+ 		if (mvtkmpr2Dview_Y				!=NULL ){ mvtkmpr2Dview_Y->Refresh();				 }
+ 		if (mvtkmpr2Dview_Z				!=NULL ){ mvtkmpr2Dview_Z->Refresh();				 }
+ 		if (mvtkplane2Dview				!=NULL ){ mvtkplane2Dview->Refresh();				 }
+ 		if (mwxsphereview				!=NULL ){ mwxsphereview	->RefreshView();			 }
  	}
  
  	//-------------------------------------------------------------------------
diff --combined lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
index 35cf7c7,96fad29..803bea1
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx
@@@ -248,8 -248,7 +248,8 @@@ void wxVtkMPR2DView::Refresh(
  	double xx1,yy1,zz1,xx2,yy2,zz2;
  	
  	vtkImageData* img = GetVtkmprbasedata()->GetImageData();
 -	if(img!=NULL){
 +	if(img!=NULL)
 + 	{
  		origin = img->GetOrigin();
  		img->GetExtent(x1,x2,y1,y2,z1,z2);
  		spc = img->GetSpacing();
@@@ -289,8 -288,8 +289,9 @@@
  		y =  yy*spc[1];
  		z =  zz*spc[2];
  
- 		if ((xx!=_backX) || (yy!=_backY) || (zz!=_backZ)) {
++		if ((xx!=_backX) || (yy!=_backY) || (zz!=_backZ)) 
++		{
  
 -		if ((xx!=_backX) || (yy!=_backY) || (zz!=_backZ)  ) {
  			if (_direction==0) {	// YZ
  				if(_imageViewer2XYZ)
  				{
@@@ -344,22 -343,20 +345,21 @@@
  				_ptsB->SetPoint(1, x   , yy2, z1 );
  				
  				
 -			}
 +			} // if back
  			_backX=xx;
  			_backY=yy;
  			_backZ=zz;
 -		}
 +		} // if image
 +
- 
  //EED 2016/02/19
  	vtkImageActor *imageactor = _imageViewer2XYZ->GetVtkImageViewer2()->GetImageActor();
  	imageactor->SetInterpolate( GetVtkBaseData()->GetInterpolate() );
- 
  //EED 01nov2012
  		UpdateColorWindowLevel();
  		wxVtkBaseView::Refresh();
  	}
  }
+ 
  //-------------------------------------------------------------------
  int wxVtkMPR2DView::GetActualSlice()   // virtual
  {