From 2127f466c1a06d8bc6eec5f6ba6ae16a1aa00412 Mon Sep 17 00:00:00 2001 From: dsarrut Date: Wed, 25 May 2011 08:04:43 +0200 Subject: [PATCH] Change Trunk -> Artery (more consistent) --- segmentation/clitkExtractLymphStation_2RL.txx | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/segmentation/clitkExtractLymphStation_2RL.txx b/segmentation/clitkExtractLymphStation_2RL.txx index 542540f..7e8c834 100644 --- a/segmentation/clitkExtractLymphStation_2RL.txx +++ b/segmentation/clitkExtractLymphStation_2RL.txx @@ -94,7 +94,7 @@ clitk::ExtractLymphStationsFilter:: ExtractStation_2RL_SetDefaultValues() { SetFuzzyThreshold("2RL", "CommonCarotidArtery", 0.7); - SetFuzzyThreshold("2RL", "BrachioCephalicTrunk", 0.7); + SetFuzzyThreshold("2RL", "BrachioCephalicArtery", 0.7); SetFuzzyThreshold("2RL", "BrachioCephalicVein", 0.3); SetFuzzyThreshold("2RL", "Aorta", 0.7); SetFuzzyThreshold("2RL", "SubclavianArteryRight", 0.5); @@ -208,17 +208,17 @@ ExtractStation_2RL_Ant_Limits() // ----------------------------------------------------- // Remove Ant to H line from the Ant most part of the // CommonCarotidArtery until we reach the first slice of - // BrachioCephalicTrunk + // BrachioCephalicArtery StartNewStep("[Station 2RL] Ant limits with CommonCarotidArtery, H line"); - // First, find the first slice of BrachioCephalicTrunk - MaskImagePointer BrachioCephalicTrunk = GetAFDB()->template GetImage("BrachioCephalicTrunk"); - MaskImagePointType p = BrachioCephalicTrunk->GetOrigin(); // initialise to avoid warning - clitk::FindExtremaPointInAGivenDirection(BrachioCephalicTrunk, GetBackgroundValue(), 2, false, p); - double TopOfBrachioCephalicTrunkZ=p[2] + BrachioCephalicTrunk->GetSpacing()[2]; // Add one slice + // First, find the first slice of BrachioCephalicArtery + MaskImagePointer BrachioCephalicArtery = GetAFDB()->template GetImage("BrachioCephalicArtery"); + MaskImagePointType p = BrachioCephalicArtery->GetOrigin(); // initialise to avoid warning + clitk::FindExtremaPointInAGivenDirection(BrachioCephalicArtery, GetBackgroundValue(), 2, false, p); + double TopOfBrachioCephalicArteryZ=p[2] + BrachioCephalicArtery->GetSpacing()[2]; // Add one slice // Remove CommonCarotidArtery below this point - CommonCarotidArtery = clitk::CropImageRemoveLowerThan(CommonCarotidArtery, 2, TopOfBrachioCephalicTrunkZ, true, GetBackgroundValue()); + CommonCarotidArtery = clitk::CropImageRemoveLowerThan(CommonCarotidArtery, 2, TopOfBrachioCephalicArteryZ, true, GetBackgroundValue()); // Find most Ant points std::vector ccaAntPositionA; @@ -242,26 +242,26 @@ ExtractStation_2RL_Ant_Limits() m_ListOfStations["2L"] = m_Working_Support; // ----------------------------------------------------- - // Ant limit with the BrachioCephalicTrunk - StartNewStep("[Station 2RL] Ant limits with BrachioCephalicTrunk line"); + // Ant limit with the BrachioCephalicArtery + StartNewStep("[Station 2RL] Ant limits with BrachioCephalicArtery line"); - // Remove Ant to BrachioCephalicTrunk + // Remove Ant to BrachioCephalicArtery m_Working_Support = - clitk::SliceBySliceRelativePosition(m_Working_Support, BrachioCephalicTrunk, 2, - GetFuzzyThreshold("2RL", "BrachioCephalicTrunk"), "NotAntTo", false, 2, true, false); + clitk::SliceBySliceRelativePosition(m_Working_Support, BrachioCephalicArtery, 2, + GetFuzzyThreshold("2RL", "BrachioCephalicArtery"), "NotAntTo", false, 2, true, false); // End StopCurrentStep(m_Working_Support); m_ListOfStations["2R"] = m_Working_Support; m_ListOfStations["2L"] = m_Working_Support; // ----------------------------------------------------- - // Ant limit with the BrachioCephalicTrunk H line - StartNewStep("[Station 2RL] Ant limits with BrachioCephalicTrunk, Horizontal line"); + // Ant limit with the BrachioCephalicArtery H line + StartNewStep("[Station 2RL] Ant limits with BrachioCephalicArtery, Horizontal line"); // Find most Ant points std::vector bctAntPositionA; std::vector bctAntPositionB; - clitk::SliceBySliceBuildLineSegmentAccordingToExtremaPosition(BrachioCephalicTrunk, + clitk::SliceBySliceBuildLineSegmentAccordingToExtremaPosition(BrachioCephalicArtery, GetBackgroundValue(), 2, 1, true, // Ant 0, // Horizontal line @@ -317,7 +317,7 @@ ExtractStation_2RL_Ant_Limits2() /* Here, we consider the vessels form a kind of anterior barrier. We link all vessels centroids and remove what is post to it. - select the list of structure - vessel1 = BrachioCephalicTrunk + vessel1 = BrachioCephalicArtery vessel2 = BrachioCephalicVein (warning several CCL, keep most at Right) vessel3 = CommonCarotidArtery vessel4 = SubclavianArtery @@ -332,7 +332,7 @@ ExtractStation_2RL_Ant_Limits2() */ // Read structures - MaskImagePointer BrachioCephalicTrunk = GetAFDB()->template GetImage("BrachioCephalicTrunk"); + MaskImagePointer BrachioCephalicArtery = GetAFDB()->template GetImage("BrachioCephalicArtery"); MaskImagePointer BrachioCephalicVein = GetAFDB()->template GetImage("BrachioCephalicVein"); MaskImagePointer CommonCarotidArtery = GetAFDB()->template GetImage("CommonCarotidArtery"); MaskImagePointer SubclavianArtery = GetAFDB()->template GetImage("SubclavianArtery"); @@ -341,8 +341,8 @@ ExtractStation_2RL_Ant_Limits2() MaskImagePointer Trachea = GetAFDB()->template GetImage("Trachea"); // Resize all structures like support - BrachioCephalicTrunk = - clitk::ResizeImageLike(BrachioCephalicTrunk, m_Working_Support, GetBackgroundValue()); + BrachioCephalicArtery = + clitk::ResizeImageLike(BrachioCephalicArtery, m_Working_Support, GetBackgroundValue()); CommonCarotidArtery = clitk::ResizeImageLike(CommonCarotidArtery, m_Working_Support, GetBackgroundValue()); SubclavianArtery = @@ -357,8 +357,8 @@ ExtractStation_2RL_Ant_Limits2() clitk::ResizeImageLike(Trachea, m_Working_Support, GetBackgroundValue()); // Extract slices - std::vector slices_BrachioCephalicTrunk; - clitk::ExtractSlices(BrachioCephalicTrunk, 2, slices_BrachioCephalicTrunk); + std::vector slices_BrachioCephalicArtery; + clitk::ExtractSlices(BrachioCephalicArtery, 2, slices_BrachioCephalicArtery); std::vector slices_BrachioCephalicVein; clitk::ExtractSlices(BrachioCephalicVein, 2, slices_BrachioCephalicVein); std::vector slices_CommonCarotidArtery; @@ -371,11 +371,11 @@ ExtractStation_2RL_Ant_Limits2() clitk::ExtractSlices(Aorta, 2, slices_Aorta); std::vector slices_Trachea; clitk::ExtractSlices(Trachea, 2, slices_Trachea); - uint n= slices_BrachioCephalicTrunk.size(); + uint n= slices_BrachioCephalicArtery.size(); // Get the boundaries of one slice std::vector bounds; - ComputeImageBoundariesCoordinates(slices_BrachioCephalicTrunk[0], bounds); + ComputeImageBoundariesCoordinates(slices_BrachioCephalicArtery[0], bounds); // For all slices, for all structures, find the centroid and build the contour // List of 3D points (for debug) @@ -388,7 +388,7 @@ ExtractStation_2RL_Ant_Limits2() GetBackgroundValue(), true, 1); slices_SubclavianArtery[i] = Labelize(slices_SubclavianArtery[i], GetBackgroundValue(), true, 1); - slices_BrachioCephalicTrunk[i] = Labelize(slices_BrachioCephalicTrunk[i], + slices_BrachioCephalicArtery[i] = Labelize(slices_BrachioCephalicArtery[i], GetBackgroundValue(), true, 1); slices_BrachioCephalicVein[i] = Labelize(slices_BrachioCephalicVein[i], GetBackgroundValue(), true, 1); @@ -407,7 +407,7 @@ ExtractStation_2RL_Ant_Limits2() std::vector centroids6; ComputeCentroids(slices_CommonCarotidArtery[i], GetBackgroundValue(), centroids1); ComputeCentroids(slices_SubclavianArtery[i], GetBackgroundValue(), centroids2); - ComputeCentroids(slices_BrachioCephalicTrunk[i], GetBackgroundValue(), centroids3); + ComputeCentroids(slices_BrachioCephalicArtery[i], GetBackgroundValue(), centroids3); ComputeCentroids(slices_Thyroid[i], GetBackgroundValue(), centroids4); ComputeCentroids(slices_Aorta[i], GetBackgroundValue(), centroids5); ComputeCentroids(slices_BrachioCephalicVein[i], GetBackgroundValue(), centroids6); @@ -420,7 +420,7 @@ ExtractStation_2RL_Ant_Limits2() } // BrachioCephalicVein -> when SubclavianArtery has 2 CCL - // (BrachioCephalicTrunk is divided) -> forget BrachioCephalicVein + // (BrachioCephalicArtery is divided) -> forget BrachioCephalicVein if ((centroids3.size() ==1) && (centroids2.size() > 2)) { centroids6.clear(); } -- 2.47.1