Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
otb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
273
Issues
273
List
Boards
Labels
Service Desk
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Main Repositories
otb
Commits
8815898e
Commit
8815898e
authored
Apr 14, 2010
by
Jordi Inglada
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
STYLE: Rename Adjency to Adjacency
parent
851df52e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
43 additions
and
43 deletions
+43
-43
Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
+14
-14
Examples/Radiometry/CMakeLists.txt
Examples/Radiometry/CMakeLists.txt
+1
-1
RELEASE_NOTES.txt
RELEASE_NOTES.txt
+1
-1
Testing/Code/Radiometry/CMakeLists.txt
Testing/Code/Radiometry/CMakeLists.txt
+14
-14
Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
.../Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
+11
-11
Testing/Code/Radiometry/otbRadiometryTests3.cxx
Testing/Code/Radiometry/otbRadiometryTests3.cxx
+2
-2
No files found.
Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
View file @
8815898e
...
...
@@ -63,7 +63,7 @@
#include "otbImageToLuminanceImageFilter.h"
#include "otbLuminanceToReflectanceImageFilter.h"
#include "otbReflectanceToSurfaceReflectanceImageFilter.h"
#include "otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.h"
#include "otbSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter.h"
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
...
...
@@ -499,7 +499,7 @@ int main(int argc, char *argv[])
//-------------------------------
// Software Guide : BeginLatex
// Next (and last step) is the neighborhood correction.
// For this, the SurfaceAdjencyEffect6SCorrectionSchemeFilter class is used.
// For this, the SurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter class is used.
// The previous surface reflectance inversion is performed under the assumption of a
// homogeneous ground environment. The following step allows to correct the adjacency
// effect on the radiometry of pixels. The method is based on the decomposition of
...
...
@@ -530,16 +530,16 @@ int main(int argc, char *argv[])
// \end{itemize}
// \end{itemize}
// The neighborhood consideration window size is given by the window radius.
// An instance of \doxygen{otb}{SurfaceAdjencyEffect6SCorrectionSchemeFilter} is created.
// An instance of \doxygen{otb}{SurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter} is created.
// Software Guide : EndLatex
// Software Guide : BeginCodeSnippet
typedef
otb
::
SurfaceAdjencyEffect6SCorrectionSchemeFilter
<
ImageType
,
typedef
otb
::
SurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
<
ImageType
,
ImageType
>
SurfaceAdjencyEffect6SCorrectionSchemeFilterType
;
SurfaceAdjencyEffect6SCorrectionSchemeFilterType
::
Pointer
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter
=
SurfaceAdjencyEffect6SCorrectionSchemeFilterType
::
New
();
SurfaceAdj
ac
encyEffect6SCorrectionSchemeFilterType
;
SurfaceAdj
ac
encyEffect6SCorrectionSchemeFilterType
::
Pointer
filterSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
=
SurfaceAdj
ac
encyEffect6SCorrectionSchemeFilterType
::
New
();
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
...
...
@@ -553,14 +553,14 @@ int main(int argc, char *argv[])
// \end{itemize}
//
// Software Guide : EndLatex
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter
->
filterSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
->
SetAtmosphericRadiativeTerms
(
filterAtmosphericCorrectionParametersTo6SRadiativeTerms
->
GetOutput
());
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter
->
SetZenithalViewingAngle
(
filterSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
->
SetZenithalViewingAngle
(
dataAtmosphericCorrectionParameters
->
GetViewingZenithalAngle
());
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter
->
SetWindowRadius
(
atoi
(
argv
filterSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
->
SetWindowRadius
(
atoi
(
argv
[
17
]));
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter
->
filterSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
->
SetPixelSpacingInKilometers
(
static_cast
<
double
>
(
atof
(
argv
[
18
])));
//-------------------------------
...
...
@@ -580,11 +580,11 @@ int main(int argc, char *argv[])
filterLuminanceToReflectance
->
SetInput
(
filterImageToLuminance
->
GetOutput
());
filterReflectanceToSurfaceReflectanceImageFilter
->
SetInput
(
filterLuminanceToReflectance
->
GetOutput
());
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter
->
SetInput
(
filterSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
->
SetInput
(
filterReflectanceToSurfaceReflectanceImageFilter
->
GetOutput
());
writer
->
SetInput
(
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter
->
GetOutput
());
filterSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
->
GetOutput
());
// Software Guide : EndCodeSnippet
// Software Guide : BeginLatex
...
...
Examples/Radiometry/CMakeLists.txt
View file @
8815898e
...
...
@@ -111,7 +111,7 @@ ADD_TEST(raTeAtmosphericCorrectionSequencementTest ${EXE_TESTS}
1
0.199854
# ReflectanceToSurfaceReflectance parameters
# SurfaceAdjencyEffect6SCorrectionSchemeFilter parameters
# SurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter parameters
2
# Radius;
0.020
# pixel spacing in kilometers
)
...
...
RELEASE_NOTES.txt
View file @
8815898e
...
...
@@ -344,7 +344,7 @@ OTB-v.2.0.0 - Changes since version 1.6.0 (2007/12/14)
equivalent to the pipeline process ImageToLuminanceImageFilter
and LuminanceToReflectanceImageFilter filters
- Reflectance estimation TOC: otb::ReflectanceToSurfaceReflectanceImageFilter
- 6S effect correction: otb::SurfaceAdjencyEffect6SCorrectionSchemeFilter
- 6S effect correction: otb::SurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
- DEM slope and shading estimations: otb::DEMCaracteriticsExtractor
*Common:
...
...
Testing/Code/Radiometry/CMakeLists.txt
View file @
8815898e
...
...
@@ -440,19 +440,19 @@ ADD_TEST(raTvRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter ${RADIOMET
${
INPUTDATA
}
/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_MIR.txt
# wavelenghts, channel 4
)
# ------- otb::SurfaceAdjencyEffect6SCorrectionSchemeFilter ------------------------------
ADD_TEST
(
raTuSurfaceAdjencyEffect6SCorrectionSchemeFilterNew
${
RADIOMETRY_TESTS3
}
otbSurfaceAdjencyEffect6SCorrectionSchemeFilterNew
# ------- otb::SurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter ------------------------------
ADD_TEST
(
raTuSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilterNew
${
RADIOMETRY_TESTS3
}
otbSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilterNew
)
ADD_TEST
(
raTvSurfaceAdjencyEffect6SCorrectionSchemeFilter
${
RADIOMETRY_TESTS3
}
--compare-image
${
EPSILON
}
${
BASELINE
}
/raTvSurfaceAdjencyEffect6SCorrectionSchemeFilter.tif
${
TEMP
}
/raTvSurfaceAdjencyEffect6SCorrectionSchemeFilter.tif
# --compare-ascii ${EPSILON_10e6} ${BASELINE_FILES}/raTvSurfaceAdjencyEffect6SCorrectionSchemeFilterOutput6SVallues.txt
# ${TEMP}/raTvSurfaceAdjencyEffect6SCorrectionSchemeFilterOutput6SVallues.txt
otbSurfaceAdjencyEffect6SCorrectionSchemeFilter
ADD_TEST
(
raTvSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
${
RADIOMETRY_TESTS3
}
--compare-image
${
EPSILON
}
${
BASELINE
}
/raTvSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter.tif
${
TEMP
}
/raTvSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter.tif
# --compare-ascii ${EPSILON_10e6} ${BASELINE_FILES}/raTvSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilterOutput6SVallues.txt
# ${TEMP}/raTvSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilterOutput6SVallues.txt
otbSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
${
BASELINE
}
/raTvRomania_Correction.tif
${
TEMP
}
/raTvSurfaceAdjencyEffect6SCorrectionSchemeFilter.tif
${
TEMP
}
/raTvSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter.tif
2
# Radius;
0.020
# pixel spacing in kilometers
${
INPUTDATA
}
/romania_parameter.txt
# atmo param;
...
...
@@ -461,7 +461,7 @@ ADD_TEST(raTvSurfaceAdjencyEffect6SCorrectionSchemeFilter ${RADIOMETRY_TESTS3}
${
INPUTDATA
}
/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_B1.txt
# wavelenghts, channel 1
${
INPUTDATA
}
/RADIO_WAVELENGHT_SPECTRAL_BAND_SPOT4_1_MIR.txt
# wavelenghts, channel 4
# FOR plateform verification only : to remove when OK
${
TEMP
}
/raTvSurfaceAdjencyEffect6SCorrectionSchemeFilterOutput6SVallues.txt
${
TEMP
}
/raTvSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilterOutput6SVallues.txt
)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
...
...
@@ -505,7 +505,7 @@ ADD_TEST(raTvAtmosphericCorrectionSequencementTest ${RADIOMETRY_TESTS4}
0.199854
${
INPUTDATA
}
/atmosphericCorrectionSequencement_wavelenght_spectral_bands_spot4_1.txt
# ReflectanceToSurfaceReflectance parameters
# SurfaceAdjencyEffect6SCorrectionSchemeFilter parameters
# SurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter parameters
2
# Radius;
0.020
# pixel spacing in kilometers
)
...
...
@@ -1217,8 +1217,8 @@ otbSIXSTraitsComputeAtmosphericParameters.cxx
otbAtmosphericRadiativeTermsNew.cxx
otbReflectanceToSurfaceReflectanceImageFilterNew.cxx
otbReflectanceToSurfaceReflectanceImageFilter.cxx
otbSurfaceAdjencyEffect6SCorrectionSchemeFilterNew.cxx
otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.cxx
otbSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilterNew.cxx
otbSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter.cxx
otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
)
SET
(
Radiometry_SRCS4
...
...
Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
View file @
8815898e
...
...
@@ -29,7 +29,7 @@
#include "otbAtmosphericCorrectionParameters.h"
#include "otbAtmosphericRadiativeTerms.h"
#include "otbReflectanceToSurfaceReflectanceImageFilter.h"
#include "otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.h"
#include "otbSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
...
...
@@ -210,24 +210,24 @@ int otbAtmosphericCorrectionSequencementTest(int argc, char *argv[])
filterReflectanceToSurfaceReflectanceImageFilter
->
SetInput
(
filterLuminanceToReflectance
->
GetOutput
());
//-------------------------------
typedef
otb
::
SurfaceAdjencyEffect6SCorrectionSchemeFilter
<
ImageType
,
ImageType
>
SurfaceAdjencyEffect6SCorrectionSchemeFilterType
;
SurfaceAdj
encyEffect6SCorrectionSchemeFilterType
::
Pointer
filterSurfaceAdj
encyEffect6SCorrectionSchemeFilter
=
SurfaceAdjencyEffect6SCorrectionSchemeFilterType
::
New
();
typedef
otb
::
SurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
<
ImageType
,
ImageType
>
SurfaceAdj
ac
encyEffect6SCorrectionSchemeFilterType
;
SurfaceAdj
acencyEffect6SCorrectionSchemeFilterType
::
Pointer
filterSurfaceAdjac
encyEffect6SCorrectionSchemeFilter
=
SurfaceAdj
ac
encyEffect6SCorrectionSchemeFilterType
::
New
();
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter
->
SetAtmosphericRadiativeTerms
(
filterSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
->
SetAtmosphericRadiativeTerms
(
filterAtmosphericCorrectionParametersTo6SRadiativeTerms
->
GetOutput
());
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter
->
SetWindowRadius
(
atoi
(
argv
[
17
]));
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter
->
SetPixelSpacingInKilometers
(
static_cast
<
double
>
(
atof
(
argv
[
18
])));
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter
->
SetZenithalViewingAngle
(
filterSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
->
SetWindowRadius
(
atoi
(
argv
[
17
]));
filterSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
->
SetPixelSpacingInKilometers
(
static_cast
<
double
>
(
atof
(
argv
[
18
])));
filterSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
->
SetZenithalViewingAngle
(
dataAtmosphericCorrectionParameters
->
GetViewingZenithalAngle
());
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter
->
SetInput
(
filterSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
->
SetInput
(
filterReflectanceToSurfaceReflectanceImageFilter
->
GetOutput
());
//-------------------------------
WriterType
::
Pointer
writer
=
WriterType
::
New
();
writer
->
SetFileName
(
argv
[
2
]);
writer
->
SetInput
(
filterSurfaceAdjencyEffect6SCorrectionSchemeFilter
->
GetOutput
());
writer
->
SetInput
(
filterSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
->
GetOutput
());
writer
->
Update
();
return
EXIT_SUCCESS
;
...
...
Testing/Code/Radiometry/otbRadiometryTests3.cxx
View file @
8815898e
...
...
@@ -35,7 +35,7 @@ void RegisterTests()
REGISTER_TEST
(
otbAtmosphericRadiativeTermsNew
);
REGISTER_TEST
(
otbReflectanceToSurfaceReflectanceImageFilterNew
);
REGISTER_TEST
(
otbReflectanceToSurfaceReflectanceImageFilter
);
REGISTER_TEST
(
otbSurfaceAdjencyEffect6SCorrectionSchemeFilterNew
);
REGISTER_TEST
(
otbSurfaceAdjencyEffect6SCorrectionSchemeFilter
);
REGISTER_TEST
(
otbSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilterNew
);
REGISTER_TEST
(
otbSurfaceAdj
ac
encyEffect6SCorrectionSchemeFilter
);
REGISTER_TEST
(
otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment