Merge branch 'RTSMarker' into 'ScoutRTRelease'

RTSMarker bug

See merge request cpt_bioeng/drt!42
This commit is contained in:
2024-02-16 12:22:22 +01:00
2 changed files with 10 additions and 34 deletions

View File

@ -139,7 +139,6 @@ int vtkContourTopogramProjectionFilter::RequestData(
for(vtkIdType ii = 0; ii < points->GetNumberOfPoints() ; ii++){
/** input points are in LPS, should be corrected for import offset and mapped onto
* the projection geometry origin */
pp0[0] = points->GetPoint(ii)[0] + dProjectionLPSOffset [0] - dImportOffsetLPS[0];
@ -168,52 +167,29 @@ int vtkContourTopogramProjectionFilter::RequestData(
pp2[1] -= dProjectionLPSOffset [1];
pp2[2] -= dProjectionLPSOffset [2];
// // Workaround to account for PA-LAT HFS-FFS
// switch (this->m_ProjectionOrientation) {
// case itk::PA:
// pp2[0] += dPOffset;
// break;
// case itk::LAT:
// switch (this->m_PatientOrientation) {
// case itk::FFS:
// pp2[1] += dPOffset;
// break;
// case itk::HFS:
// pp2[1] -= dPOffset;
// break;
// default:
// break;
// }
// break;
// default:
// break;
// }
// std::cout << ii << " " << pp2[0] << " " << pp2[1] << " " << pp2[2] << std::endl;
PrjPoints->InsertPoint(ii,pp2);
}
output->SetPoints( PrjPoints );
// if (psInput)
// {
// output->GetPointData()->PassData(psInput->GetPointData());
// }
// else
// {
// output->GetPointData()->PassData(graphInput->GetVertexData());
// }
vtkIdType numPoints = points->GetNumberOfPoints();
VTK_CREATE(vtkCellArray, cells);
cells->AllocateEstimate(numPoints, 1);
if (cells->AllocateEstimate(numPoints, 1) == true){
} else {
std::cout << "vtkContourTopogramProjectionFilter Can't allocate cells " << std::endl;
PrjPoints->Delete();
return 1;
}
for (vtkIdType i = 0; i < numPoints; i++)
{
cells->InsertNextCell(1, &i);
}
output->SetVerts(cells);
PrjPoints->Delete();

View File

@ -19,7 +19,7 @@
#include "vtkMatrix4x4.h"
#include "vtkTransform.h"
#include "itkMacro.h"
//#include "itkMacro.h"
#include "DRTMetaInformation.h"
class VTKFILTERSCORE_EXPORT vtkContourTopogramProjectionFilter :