From eae1cd9361b2439bc1416453f9ee315112d5bcab Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 11 Dec 2019 16:45:46 +0100 Subject: [PATCH] #3322 creaContours Feature New Normal - Show reference contour Befor After actual slice --- .../widgets/manualContour/manualBaseModel.cpp | 2 +- .../manualContour/manualViewBaseContour.cpp | 4 +- .../wxWindows/widgets/vtkInfoTextImage.cxx | 130 +++--------------- 3 files changed, 20 insertions(+), 116 deletions(-) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.cpp index 3cfe1b1..7a640dd 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualBaseModel.cpp @@ -31,7 +31,7 @@ manualBaseModel::manualBaseModel() //EED2017 _sizePointsContour = 100; //JSTG 25-02-08 The change in the inisialization of these variable is critical. _label = ""; - _label2 = "UU"; + _label2 = "--"; } // ---------------------------------------------------------------------------- diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp index 88f1d4c..6e334f4 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp @@ -976,8 +976,8 @@ void manualViewBaseContour::SetShowText(bool ok) _show_text = ok; if (_show_text==false && _textActor!=NULL) { - _textActor->SetInput("00"); - _textActor2->SetInput("00"); + _textActor->SetInput(""); + _textActor2->SetInput(""); } } // ---------------------------------------------------------------------------- diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImage.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImage.cxx index 33d6f4c..02e73d2 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImage.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInfoTextImage.cxx @@ -57,7 +57,7 @@ void vtkInfoTextImage::Configure() _vtkText_position = Create_Text_Label( 10 , 30 ); _vtkText_pixelIntensity = Create_Text_Label( 10 , 15 ); _vtkText_plane = Create_Text_Label( 10 , 0 ); - } + } // if vtkText_WindowLevel } @@ -83,17 +83,14 @@ vtkTextActor *vtkInfoTextImage::Create_Text_Label(int px, int py ) vtkTextActor *textActor = vtkTextActor::New(); textActor->SetDisplayPosition(px, py); textActor->SetInput("0"); - // Set coordinates to match the old vtkScaledTextActor default value textActor->GetPosition2Coordinate()->SetCoordinateSystemToNormalizedViewport(); textActor->GetPosition2Coordinate()->SetValue( 0.2 , 0.2 ); - vtkTextProperty *tprop = textActor->GetTextProperty(); tprop->SetFontSize(14); tprop->SetFontFamilyToArial(); tprop->SetColor(1, 1, 0); _wxvtk2Dbaseview->GetRenderer()->AddActor2D(textActor); - return textActor; } @@ -104,13 +101,8 @@ void vtkInfoTextImage::PutWindowLevel() double value = _wxvtk2Dbaseview->_imageViewer2XYZ->GetVtkImageViewer2()->GetWindowLevel()->GetWindow() ; char zTzxt[20]; char resultText[50]; - strcpy(resultText,"w:"); - - - //ltoa ( (long)value , zTzxt , 10 ); sprintf(zTzxt,"%3.4f",value); - strcat(resultText,zTzxt); _vtkText_WindowLevel -> SetInput(resultText); } @@ -120,15 +112,11 @@ void vtkInfoTextImage::PutWindowLevel() void vtkInfoTextImage::PutColorLevel() { double value = _wxvtk2Dbaseview->_imageViewer2XYZ->GetVtkImageViewer2()->GetWindowLevel()->GetLevel(); - char zTzxt[20]; char resultText[50]; - strcpy(resultText,"c:"); - // itoa (value,zTzxt,10); sprintf(zTzxt,"%3.2f",value); - strcat(resultText,zTzxt); _vtkText_ColorLevel -> SetInput(resultText); } @@ -139,15 +127,9 @@ void vtkInfoTextImage::PutPlane() int plane = _wxvtk2Dbaseview->GetDirection(); char zTzxt[20]; char resultText[50]; - if (plane==0) { strcpy(resultText,"plane:YZ"); } if (plane==1) { strcpy(resultText,"plane:XZ"); } if (plane==2) { strcpy(resultText,"plane:XY"); } - -// itoa (value,zTzxt,10); -// sprintf(zTzxt,"%d",value); - -// strcat(resultText,zTzxt); _vtkText_plane -> SetInput(resultText); } @@ -155,59 +137,30 @@ void vtkInfoTextImage::PutPlane() void vtkInfoTextImage::PutPosition(int xx,int yy, int zz) { - -//EEDx7 -// double spa[3]; -// _imagedata->GetSpacing(spa); -// xx=xx*(1/spa[0]); -// yy=yy*(1/spa[1]); - - char zTzxt[50]; char resultText[50]; strcpy(resultText,"p: "); -// itoa ((int)xx,zTzxt,10); sprintf(zTzxt,"%d",xx); - strcat(resultText,zTzxt); strcat(resultText," , "); - -// itoa ((int)yy,zTzxt,10); sprintf(zTzxt,"%d",yy); - strcat(resultText,zTzxt); strcat(resultText," , "); - -// itoa ((int)zz,zTzxt,10); sprintf(zTzxt,"%d",zz); - strcat(resultText,zTzxt); - - - int nX = _marimagedata->GetXOriginal(xx); int nY = _marimagedata->GetYOriginal(yy); int nZ = _marimagedata->GetZOriginal(zz); - strcat(resultText," ("); -// ltoa ((int)nX,zTzxt,10); sprintf(zTzxt,"%d",nX); - strcat(resultText,zTzxt); strcat(resultText,","); - -// ltoa ((int)nY,zTzxt,10); sprintf(zTzxt,"%d",nY); - strcat(resultText,zTzxt); strcat(resultText,","); - -// ltoa ((int)nZ,zTzxt,10); sprintf(zTzxt,"%d",nZ); - strcat(resultText,zTzxt); strcat(resultText,")"); - _vtkText_position -> SetInput(resultText); } @@ -215,27 +168,16 @@ void vtkInfoTextImage::PutPosition(int xx,int yy, int zz) void vtkInfoTextImage::PutPixelIntensity(int xx, int yy, int zz) { - -//EEDx2 bool ok=true; - int dim[3]; double spa[3]; vtkImageData *imagedata = _marimagedata->GetImageData(); imagedata->GetDimensions(dim); imagedata->GetSpacing(spa); - -// EEDx7 -// xx=xx*(1/spa[0]); -// yy=yy*(1/spa[1]); -// zz=xx*spa[2]; - if ( (xx<0) || (xx>=dim[0]) || (yy<0) || (yy>=dim[1]) || (zz<0) || (zz>=dim[2]) ) { ok=false; } - - char zTzxt[20]; char resultText[50]; strcpy(resultText,"GL: "); @@ -244,108 +186,70 @@ void vtkInfoTextImage::PutPixelIntensity(int xx, int yy, int zz) if (imagedata->GetScalarType()==VTK_BIT) { char *pOrg=(char*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz); - // itoa (*pOrg,zTzxt,10); if(*pOrg==0) { sprintf(zTzxt,"%d",0); - } - else - { + } else { sprintf(zTzxt,"%d",1); - } - } - - else if (imagedata->GetScalarType()==VTK_CHAR) - { + } // if pOrg + } else if (imagedata->GetScalarType()==VTK_CHAR) { char *pOrg=(char*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz); // itoa (*pOrg,zTzxt,10); int tmp=*pOrg; sprintf(zTzxt,"%d",tmp); - } - - else if (imagedata->GetScalarType()==VTK_SIGNED_CHAR) - { + } else if (imagedata->GetScalarType()==VTK_SIGNED_CHAR) { signed char *pOrg=(signed char*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz); // itoa (*pOrg,zTzxt,10); int tmp=*pOrg; sprintf(zTzxt,"%d",tmp); - } - - else if (imagedata->GetScalarType()==VTK_UNSIGNED_CHAR) - { + } else if (imagedata->GetScalarType()==VTK_UNSIGNED_CHAR) { unsigned char *pOrg=(unsigned char*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz); // itoa (*pOrg,zTzxt,10); int tmp=*pOrg; sprintf(zTzxt,"%d",tmp); - } - - else if (imagedata->GetScalarType()==VTK_SHORT) - { + } else if (imagedata->GetScalarType()==VTK_SHORT) { short *pOrg=(short*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz); // itoa (*pOrg,zTzxt,10); int tmp=*pOrg; sprintf(zTzxt,"%d",tmp); - } - - else if (imagedata->GetScalarType()==VTK_UNSIGNED_SHORT) - { + } else if (imagedata->GetScalarType()==VTK_UNSIGNED_SHORT) { unsigned short *pOrg=(unsigned short*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz); // itoa (*pOrg,zTzxt,10); int tmp=*pOrg; sprintf(zTzxt,"%d",tmp); - } - - else if (imagedata->GetScalarType()==VTK_INT) - { + } else if (imagedata->GetScalarType()==VTK_INT) { int *pOrg=(int*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz); // itoa (*pOrg,zTzxt,10); sprintf(zTzxt,"%d",*pOrg); - } - - else if (imagedata->GetScalarType()==VTK_UNSIGNED_INT) - { + } else if (imagedata->GetScalarType()==VTK_UNSIGNED_INT) { unsigned int *pOrg=(unsigned int*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz); // itoa (*pOrg,zTzxt,10); int tmp=*pOrg; sprintf(zTzxt,"%d",tmp); - } - - else if (imagedata->GetScalarType()==VTK_LONG) - { + } else if (imagedata->GetScalarType()==VTK_LONG) { long *pOrg=(long*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz); // itoa (*pOrg,zTzxt,10); double tmp=*pOrg; sprintf(zTzxt,"%3.4f",tmp); - } - - else if (imagedata->GetScalarType()==VTK_UNSIGNED_LONG) - { + } else if (imagedata->GetScalarType()==VTK_UNSIGNED_LONG) { unsigned long *pOrg=(unsigned long*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz); // itoa (*pOrg,zTzxt,10); double tmp=*pOrg; sprintf(zTzxt,"%3.4f",tmp); - } - - else if (imagedata->GetScalarType()==VTK_FLOAT) - { + } else if (imagedata->GetScalarType()==VTK_FLOAT) { float *pOrg=(float*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz); // itoa (*pOrg,zTzxt,10); double tmp=(double)*pOrg; sprintf(zTzxt,"%3.4f",tmp); - } - - else if (imagedata->GetScalarType()==VTK_DOUBLE) - { + } else if (imagedata->GetScalarType()==VTK_DOUBLE) { double *pOrg=(double*)imagedata->GetScalarPointer ((int)xx,(int)yy,(int)zz); // itoa (*pOrg,zTzxt,10); double tmp=*pOrg; sprintf(zTzxt,"%3.4f",tmp); - } - } - else - { + } // if imagedata Type + } else { strcpy(zTzxt,"---"); - } + } // if ok strcat(resultText,zTzxt); _vtkText_pixelIntensity -> SetInput(resultText); } -- 2.45.1