Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add UNKNOWN option to PolarizationType and DualPolarizationType #58

Merged
merged 4 commits into from
Apr 5, 2016
Merged

Add UNKNOWN option to PolarizationType and DualPolarizationType #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
405c1cb
Add UNKNOWN option to PolariztionType and DualPolarizationType
JonathanMeans Apr 4, 2016
f8d5a9d
Remove UNKNOWN from PolarizationType
JonathanMeans Apr 4, 2016
6ff08cc
Removing CornerIndex
asylvest Apr 4, 2016
4593eb8
pull changes
JonathanMeans Apr 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions six/modules/c++/six.sidd/source/Utilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,8 @@ six::PolarizationType _convertDualPolarization(six::DualPolarizationType pol,
: six::PolarizationType::RHC;
case six::DualPolarizationType::LHC_LHC:
return six::PolarizationType::LHC;
case six::DualPolarizationType::UNKNOWN:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think line endings are goofed up on these two lines (don't just do a dos2unix under this pull request as lots of lines in this file unfortunately are wrong)

throw except::Exception(Ctxt("DualPolarizationType::UNKNOWN has no corresponding PolarizationType"));
default:
return six::PolarizationType::NOT_SET;
}
Expand Down
27 changes: 12 additions & 15 deletions six/modules/c++/six/build/enums.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
[FrameType]
NOT_SET=six::NOT_SET_VALUE
ECF=0
RIC_ECF=1
RIC_ECI=2
__default__=six::NOT_SET_VALUE

[SCPType]
NOT_SET=six::NOT_SET_VALUE
SCP_ROW_COL=0
Expand Down Expand Up @@ -82,6 +75,17 @@ RHC=4
LHC=5
__default__=six::NOT_SET_VALUE

[PolarizationSequenceType]
NOT_SET=six::NOT_SET_VALUE
OTHER=1
V=2
H=3
RHC=4
LHC=5
UNKNOWN=6
SEQUENCE=7
__default__=six::NOT_SET_VALUE

[DualPolarizationType]
NOT_SET=six::NOT_SET_VALUE
OTHER=1
Expand All @@ -93,6 +97,7 @@ RHC_RHC=6
RHC_LHC=7
LHC_RHC=8
LHC_LHC=9
UNKNOWN=10
__default__=six::NOT_SET_VALUE

[EarthModelType]
Expand Down Expand Up @@ -214,11 +219,3 @@ OMEGA_K=1
CSA=2
RG_DOP=3
__default__=six::NOT_SET_VALUE

[CornerIndex]
NOT_SET=six::NOT_SET_VALUE
FIRST_ROW_FIRST_COL=0
FIRST_ROW_LAST_COL=1
LAST_ROW_LAST_COL=2
LAST_ROW_FIRST_COL=3
__default__=six::NOT_SET_VALUE
Loading