diff --git a/SoftwareGuide/Art/FastMarchingCollaborationDiagram1.fig b/SoftwareGuide/Art/FastMarchingCollaborationDiagram1.fig index 9a709fae1800beb7abf7e68cf492f2714bd119dd..ff05145f7d02ef327148bbb7038db9bc907cd3e4 100755 --- a/SoftwareGuide/Art/FastMarchingCollaborationDiagram1.fig +++ b/SoftwareGuide/Art/FastMarchingCollaborationDiagram1.fig @@ -45,7 +45,7 @@ Single 6 75 3150 1125 4050 1 1 0 1 0 7 50 0 -1 0.000 1 0.0000 600 3600 525 450 600 3600 1125 4050 4 1 0 50 0 0 12 0.0000 0 180 390 600 3525 Input\001 -4 1 0 50 0 0 12 0.0000 0 180 750 600 3750 itk::Image\001 +4 1 0 50 0 0 12 0.0000 0 180 750 600 3750 otb::Image\001 -6 6 11700 3150 12750 4050 1 1 0 1 0 7 50 0 -1 0.000 1 0.0000 12225 3600 525 450 12225 3600 12750 4050 diff --git a/SoftwareGuide/Art/FuzzyConnectednessCollaborationDiagram1.fig b/SoftwareGuide/Art/FuzzyConnectednessCollaborationDiagram1.fig index ed6d712f98ce58cfc39c2eec5b1ef92cc80494da..df9fe4a76dcbaac825b1dd5676c16851c1eb40f1 100755 --- a/SoftwareGuide/Art/FuzzyConnectednessCollaborationDiagram1.fig +++ b/SoftwareGuide/Art/FuzzyConnectednessCollaborationDiagram1.fig @@ -10,12 +10,12 @@ Single 6 1500 3225 2550 4125 1 1 0 1 0 7 50 0 -1 0.000 1 0.0000 2025 3675 525 450 2025 3675 2550 4125 4 1 0 50 0 0 12 0.0000 0 180 390 2025 3600 Input\001 -4 1 0 50 0 0 12 0.0000 0 180 750 2025 3825 itk::Image\001 +4 1 0 50 0 0 12 0.0000 0 180 750 2025 3825 otb::Image\001 -6 6 8100 3225 9150 4125 1 1 0 1 0 7 50 0 -1 0.000 1 0.0000 8625 3675 525 450 8625 3675 9150 4125 4 1 0 50 0 0 12 0.0000 0 180 525 8625 3600 Output\001 -4 1 0 50 0 0 12 0.0000 0 180 750 8625 3825 itk::Image\001 +4 1 0 50 0 0 12 0.0000 0 180 750 8625 3825 otb::Image\001 -6 6 5400 2175 7200 2775 1 1 0 1 0 7 50 0 -1 0.000 1 0.0000 6300 2475 900 300 6300 2475 7200 2775 diff --git a/SoftwareGuide/Art/FuzzyVoronoiCollaborationDiagram1.fig b/SoftwareGuide/Art/FuzzyVoronoiCollaborationDiagram1.fig index 15547398c476aafd475d93a9efc98b5e44f2c7c7..599b634872934a4f55e0181ad691a45f73707cd6 100755 --- a/SoftwareGuide/Art/FuzzyVoronoiCollaborationDiagram1.fig +++ b/SoftwareGuide/Art/FuzzyVoronoiCollaborationDiagram1.fig @@ -23,7 +23,7 @@ Single 6 150 2400 1200 3300 1 1 0 1 0 7 50 0 -1 0.000 1 0.0000 675 2850 525 450 675 2850 1200 3300 4 1 0 50 0 0 12 0.0000 0 180 390 675 2775 Input\001 -4 1 0 50 0 0 12 0.0000 0 180 750 675 3000 itk::Image\001 +4 1 0 50 0 0 12 0.0000 0 180 750 675 3000 otb::Image\001 -6 6 7575 2400 11475 3300 2 4 0 1 0 7 50 0 -1 0.000 0 0 7 0 0 5 @@ -33,7 +33,7 @@ Single 6 6075 2400 7125 3300 1 1 0 1 0 7 50 0 -1 0.000 1 0.0000 6600 2850 525 450 6600 2850 7125 3300 4 1 0 50 0 0 12 0.0000 0 180 495 6600 2775 Binary\001 -4 1 0 50 0 0 12 0.0000 0 180 750 6600 3000 itk::Image\001 +4 1 0 50 0 0 12 0.0000 0 180 750 6600 3000 otb::Image\001 -6 6 3750 3750 5550 4350 1 1 0 1 0 7 50 0 -1 0.000 1 0.0000 4650 4050 900 300 4650 4050 5550 4350 @@ -42,7 +42,7 @@ Single 6 11925 2400 12975 3300 1 1 0 1 0 7 50 0 -1 0.000 1 0.0000 12450 2850 525 450 12450 2850 12975 3300 4 1 0 50 0 0 12 0.0000 0 180 525 12450 2775 Output\001 -4 1 0 50 0 0 12 0.0000 0 180 750 12450 3000 itk::Image\001 +4 1 0 50 0 0 12 0.0000 0 180 750 12450 3000 otb::Image\001 -6 6 7725 1350 9525 1950 1 1 0 1 0 7 50 0 -1 0.000 1 0.0000 8625 1650 900 300 8625 1650 9525 1950 diff --git a/SoftwareGuide/Art/FuzzyVoronoiDeformableCollaborationDiagram1.fig b/SoftwareGuide/Art/FuzzyVoronoiDeformableCollaborationDiagram1.fig index 2c7ec51ac512e772920c45ee49a18a511af1d713..2458432d4fcf3e070e3e8ae62cfdb5fbb7e0382e 100755 --- a/SoftwareGuide/Art/FuzzyVoronoiDeformableCollaborationDiagram1.fig +++ b/SoftwareGuide/Art/FuzzyVoronoiDeformableCollaborationDiagram1.fig @@ -10,12 +10,12 @@ Single 6 150 2400 1200 3300 1 1 0 1 0 7 50 0 -1 0.000 1 0.0000 675 2850 525 450 675 2850 1200 3300 4 1 0 50 0 0 12 0.0000 0 180 390 675 2775 Input\001 -4 1 0 50 0 0 12 0.0000 0 180 750 675 3000 itk::Image\001 +4 1 0 50 0 0 12 0.0000 0 180 750 675 3000 otb::Image\001 -6 6 6075 2400 7125 3300 1 1 0 1 0 7 50 0 -1 0.000 1 0.0000 6600 2850 525 450 6600 2850 7125 3300 4 1 0 50 0 0 12 0.0000 0 180 495 6600 2775 Binary\001 -4 1 0 50 0 0 12 0.0000 0 180 750 6600 3000 itk::Image\001 +4 1 0 50 0 0 12 0.0000 0 180 750 6600 3000 otb::Image\001 -6 6 1725 2400 5625 3300 2 4 0 1 0 7 50 0 -1 0.000 0 0 7 0 0 5 @@ -30,7 +30,7 @@ Single 6 10200 2400 11250 3300 1 1 0 1 0 7 50 0 -1 0.000 1 0.0000 10725 2850 525 450 10725 2850 11250 3300 4 1 0 50 0 0 12 0.0000 0 180 525 10725 2775 Output\001 -4 1 0 50 0 0 12 0.0000 0 180 750 10725 3000 itk::Image\001 +4 1 0 50 0 0 12 0.0000 0 180 750 10725 3000 otb::Image\001 -6 2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2 0 0 1.00 60.00 120.00 diff --git a/SoftwareGuide/Art/VoronoiSegmentationCollaborationDiagram2.fig b/SoftwareGuide/Art/VoronoiSegmentationCollaborationDiagram2.fig index ddaed260592fcfb23b31010e72b6c5cd9562416c..31a717129e2f9e0cfa3ace20f7a50452a786c311 100755 --- a/SoftwareGuide/Art/VoronoiSegmentationCollaborationDiagram2.fig +++ b/SoftwareGuide/Art/VoronoiSegmentationCollaborationDiagram2.fig @@ -10,12 +10,12 @@ Single 6 1500 3225 2550 4125 1 1 0 1 0 7 50 0 -1 0.000 1 0.0000 2025 3675 525 450 2025 3675 2550 4125 4 1 0 50 0 0 12 0.0000 0 180 390 2025 3600 Input\001 -4 1 0 50 0 0 12 0.0000 0 180 750 2025 3825 itk::Image\001 +4 1 0 50 0 0 12 0.0000 0 180 750 2025 3825 otb::Image\001 -6 6 8100 3225 9150 4125 1 1 0 1 0 7 50 0 -1 0.000 1 0.0000 8625 3675 525 450 8625 3675 9150 4125 4 1 0 50 0 0 12 0.0000 0 180 525 8625 3600 Output\001 -4 1 0 50 0 0 12 0.0000 0 180 750 8625 3825 itk::Image\001 +4 1 0 50 0 0 12 0.0000 0 180 750 8625 3825 otb::Image\001 -6 6 5400 2175 7200 2775 1 1 0 1 0 7 50 0 -1 0.000 1 0.0000 6300 2475 900 300 6300 2475 7200 2775 diff --git a/SoftwareGuide/Examples/CMakeLists.txt b/SoftwareGuide/Examples/CMakeLists.txt index 8af106d77f9c869cb2c1d3459664627ec266fcd8..6b8aa742e5e2c34971871a6aaa267e4e36c00590 100644 --- a/SoftwareGuide/Examples/CMakeLists.txt +++ b/SoftwareGuide/Examples/CMakeLists.txt @@ -203,7 +203,7 @@ SET( OTB_EXAMPLES_SRCS ${OTB_SOURCE_DIR}/Examples/Segmentation/IsolatedConnectedImageFilter.cxx ${OTB_SOURCE_DIR}/Examples/Segmentation/WatershedSegmentation.cxx ${OTB_SOURCE_DIR}/Examples/Segmentation/FastMarchingImageFilter.cxx - #${OTB_SOURCE_DIR}/Examples/Patented/HybridSegmentationFuzzyVoronoi.cxx + ${OTB_SOURCE_DIR}/Examples/Patented/HybridSegmentationFuzzyVoronoi.cxx ${OTB_SOURCE_DIR}/Examples/Patented/FuzzyConnectednessImageFilter.cxx ${OTB_SOURCE_DIR}/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx ${OTB_SOURCE_DIR}/Examples/ChangeDetection/DiffChDet.cxx diff --git a/SoftwareGuide/Latex/HybridSegmentationMethods.tex b/SoftwareGuide/Latex/HybridSegmentationMethods.tex index c91f29f8aafb5f37abae7ee9d759421c5a8a065b..e570042e6a885d14b1dc031ae9647113ca230ad8 100755 --- a/SoftwareGuide/Latex/HybridSegmentationMethods.tex +++ b/SoftwareGuide/Latex/HybridSegmentationMethods.tex @@ -197,9 +197,9 @@ deformable model segmentation methods.} \subsubsection{Example of a Hybrid Segmentation Method} \label{sec:HybridMethod1:Example} -%\ifitkFullVersion -%\input{HybridSegmentationFuzzyVoronoi.tex} -%\fi +\ifitkFullVersion +\input{HybridSegmentationFuzzyVoronoi.tex} +\fi