From: eduardo.davila@creatis.insa-lyon.fr <eduardo.davila@creatis.insa-lyon.fr>
Date: Fri, 12 Dec 2025 13:46:11 +0000 (+0100)
Subject: #3584 manual Contour opacity
X-Git-Url: http://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=refs%2Fheads%2Fvtk9itk5wx3-macos;p=creaMaracasVisu.git

#3584 manual Contour opacity
---

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
index e86eb25..0346c2f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
@@ -57,7 +57,8 @@ manualViewBaseContour::manualViewBaseContour()
 	_coulorSelection_r	= 0;
 	_coulorSelection_g	= 1;
 	_coulorSelection_b	= 0;
-	_widthline			= 1;
+	_widthline			= 1.0;
+    _opacity            = 1.0;
 }
 // ----------------------------------------------------------------------------
 manualViewBaseContour::~manualViewBaseContour()
@@ -249,7 +250,6 @@ void manualViewBaseContour::SetWidthLine(double width)
 	{
 		this->_lstViewPoints[id]->SetWidthLine(_widthline);
 	}
-
 }
 
 // ----------------------------------------------------------------------------
@@ -259,10 +259,20 @@ double manualViewBaseContour::GetWidthLine()
 }
 
 // ----------------------------------------------------------------------------
-void manualViewBaseContour::ConstructVTKObjects()
+void manualViewBaseContour::SetOpacity(double opacity)
 {
+    _opacity = opacity;
+}
 
+// ----------------------------------------------------------------------------
+double manualViewBaseContour::GetOpacity()
+{
+    return _opacity;
+}
 
+// ----------------------------------------------------------------------------
+void manualViewBaseContour::ConstructVTKObjects()
+{
 //JSTG 29-02-08 -----------------------------------------------
 	//int i , nps = _sizePointsContour;
 	int i;
@@ -308,7 +318,7 @@ void manualViewBaseContour::ConstructVTKObjects()
 	_contourVtkActor	=	vtkActor::New();
     
 //EED 2023-07-27
-    _contourVtkActor->GetProperty()->SetOpacity(1.0);
+    _contourVtkActor->GetProperty()->SetOpacity( _opacity );
 //    _contourVtkActor->GetProperty()->SetOpacity(0.9999);
 
     _bboxMapper			=	vtkPolyDataMapper::New();
@@ -843,6 +853,8 @@ void manualViewBaseContour::UpdateColorActor()
 {
 	if (_contourVtkActor!=NULL)
 	{
+        _contourVtkActor->GetProperty()->SetOpacity( _opacity );
+
 		_contourVtkActor->GetProperty()->SetLineWidth( _widthline );
   		_contourVtkActor->GetProperty()->SetDiffuseColor( _coulorNormal_r , _coulorNormal_g , _coulorNormal_b );
         /*
@@ -1029,7 +1041,8 @@ void manualViewBaseContour::GetMinMax( double &minX,double &minY, double &minZ,
 // ----------------------------------------------------------------------------
 void manualViewBaseContour::ClearContour()
 {
-	if (_contourVtkActor!=NULL){
+	if (_contourVtkActor!=NULL)
+    {
 		_wxvtkbaseview->GetRenderer()->RemoveActor( _contourVtkActor );
 	}
 	DeleteVtkObjects();
@@ -1061,10 +1074,11 @@ void manualViewBaseContour::SetVisible(bool ok)
 	}
 	vtkActor *actor;
 	int i,size=_lstViewPoints.size();
-	for (i=0;i<size;i++){
+	for ( i=0 ; i<size ; i++ )
+    {
 		actor = _lstViewPoints[i]->GetVtkActor();
 		actor->GetProperty()->SetOpacity( opacity );
-	}
+	} // for i
 	_contourVtkActor->GetProperty()->SetOpacity( opacity );
 	_textActor->GetProperty()->SetOpacity( opacity );
 	_textActor->SetInput("00");
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h
index 7491674..22cc1b7 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h
@@ -174,6 +174,8 @@ public:
 	virtual void					RefreshContour();
 			void					SetWidthLine(double width);
 			double					GetWidthLine();
+            void                    SetOpacity(double opacity);
+            double                  GetOpacity();
 
 	virtual void					ConstructVTKObjects();
 
@@ -219,6 +221,7 @@ protected:
 	double								_coulorSelection_g;
 	double								_coulorSelection_b;
 	double								_widthline;
+    double                              _opacity;
 
 	//
 	// Reference to VTKBaseView
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
index faae93b..ae71982 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
@@ -38,6 +38,7 @@ manualViewContour::manualViewContour()
 	_maxY					= -99999;
 	
 }
+
 // ----------------------------------------------------------------------------
 manualViewContour::~manualViewContour()
 {
@@ -175,10 +176,6 @@ void manualViewContour::RefreshContour() // virtual
 	{
 		_pts->Modified();
 	}
-    
-    
-    
-    
 }
 
 // ----------------------------------------------------------------------------
@@ -231,7 +228,6 @@ void manualViewContour::RefreshText()  // virtual
 				strcat(resultText,text);
 				strcat(resultText,"p^2 ");
 
-
 				strcpy(resultText2,"P= ");
 				gcvt ( this->_manContModel->GetPathSize( _spc ), 5, text );
 				strcat(resultText2,text);
@@ -307,7 +303,6 @@ bool manualViewContour::ifTouchContour(int x,int y,int z)
     pp[1]   = yy;
     pp[2]   = zz;    
     double DeltaDistancePointToLine =  GetWidthLine() +0.25;
-
 	if ( (xx>=_minX) &&  (yy>=_minY) && (xx<=_maxX) && (yy<=_maxY))  // inside the boundaring box
 	{
 		if ( ShowLineVersion()==true )
@@ -435,9 +430,7 @@ void manualViewContour::MoveContour(int x, int y, int z)
 	double XX = x;
 	double YY = y;
 	double ZZ = z;
-
 	TransfromCoordViewWorld(XX,YY,ZZ);
-
 	int i, manualPointsSZ = _manContModel->GetSizeLstPoints();
 	for ( i=0; i<manualPointsSZ; i++ )
 	{