Skip to content

Commit 51c9547

Browse files
philippeVerneyphilippeVerney
authored
DeviationSurveyRepresentation::getAngleUom in DLL (#350)
SWIG port of DeviationSurveyRepresentation::getAngleUom and getMdUom()
1 parent 8898f81 commit 51c9547

5 files changed

Lines changed: 79 additions & 56 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ set (FESAPI_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
1313
# version mechanism
1414
set (Fesapi_VERSION_MAJOR 2)
1515
set (Fesapi_VERSION_MINOR 10)
16-
set (Fesapi_VERSION_PATCH 0)
16+
set (Fesapi_VERSION_PATCH 1)
1717
set (Fesapi_VERSION_TWEAK 0)
1818

1919
set (Fesapi_VERSION ${Fesapi_VERSION_MAJOR}.${Fesapi_VERSION_MINOR}.${Fesapi_VERSION_PATCH}.${Fesapi_VERSION_TWEAK})

‎cmake/setup.py.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ setup (name = 'fesapi',
1212
author = 'F2I-CONSULTING',
1313
maintainer = 'F2I-CONSULTING',
1414
url = 'https://github.com/F2I-Consulting/fesapi',
15-
description = 'An API for the Energistics standards',
15+
description = 'An API for the Energistics data standards',
1616
long_description = '''**FESAPI** is an API for Energistics data standards (mainly RESQML™)
1717

1818
### Examples

‎example/example.cpp‎

Lines changed: 62 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -37,60 +37,74 @@ under the License.
3737

3838
#include "common/EpcDocument.h"
3939
#include "common/EnumStringMapper.h"
40-
#include "resqml2_0_1/LocalDepth3dCrs.h"
41-
#include "resqml2_0_1/LocalTime3dCrs.h"
40+
41+
#include "eml2/AbstractHdfProxy.h"
42+
#include "eml2/PropertyKind.h"
43+
#include "eml2/TimeSeries.h"
44+
45+
#include "eml2_3/LocalEngineeringCompoundCrs.h"
46+
#include "eml2_3/PropertyKind.h"
47+
48+
#include "resqml2/DoubleTableLookup.h"
49+
#include "resqml2/GridConnectionSetRepresentation.h"
50+
#include "resqml2/IjkGridExplicitRepresentation.h"
51+
#include "resqml2/IjkGridParametricRepresentation.h"
52+
#include "resqml2/SealedVolumeFrameworkRepresentation.h"
53+
#include "resqml2/StratigraphicColumn.h"
54+
#include "resqml2/StratigraphicColumnRankInterpretation.h"
55+
#include "resqml2/StratigraphicOccurrenceInterpretation.h"
56+
#include "resqml2/StringTableLookup.h"
57+
58+
#include "resqml2_0_1/Activity.h"
59+
#include "resqml2_0_1/ActivityTemplate.h"
60+
#include "resqml2_0_1/CategoricalProperty.h"
61+
#include "resqml2_0_1/CommentProperty.h"
62+
#include "resqml2_0_1/ContinuousProperty.h"
63+
#include "resqml2_0_1/DeviationSurveyRepresentation.h"
64+
#include "resqml2_0_1/DiscreteProperty.h"
65+
#include "resqml2_0_1/EarthModelInterpretation.h"
66+
#include "resqml2_0_1/FaultInterpretation.h"
67+
#include "resqml2_0_1/FluidBoundaryFeature.h"
4268
#include "resqml2_0_1/FrontierFeature.h"
43-
#include "resqml2_0_1/Horizon.h"
44-
#include "resqml2_0_1/GeobodyFeature.h"
45-
#include "resqml2_0_1/TectonicBoundaryFeature.h"
4669
#include "resqml2_0_1/GenericFeatureInterpretation.h"
47-
#include "resqml2_0_1/FluidBoundaryFeature.h"
48-
#include "resqml2_0_1/HorizonInterpretation.h"
49-
#include "resqml2_0_1/GeobodyInterpretation.h"
5070
#include "resqml2_0_1/GeobodyBoundaryInterpretation.h"
51-
#include "resqml2_0_1/FaultInterpretation.h"
52-
#include "resqml2_0_1/TriangulatedSetRepresentation.h"
53-
#include "resqml2_0_1/PolylineSetRepresentation.h"
54-
#include "resqml2_0_1/PointSetRepresentation.h"
55-
#include "resqml2_0_1/PlaneSetRepresentation.h"
56-
#include "resqml2_0_1/OrganizationFeature.h"
57-
#include "resqml2_0_1/EarthModelInterpretation.h"
58-
#include "resqml2_0_1/StructuralOrganizationInterpretation.h"
59-
#include "resqml2_0_1/StratigraphicUnitInterpretation.h"
71+
#include "resqml2_0_1/GeobodyFeature.h"
72+
#include "resqml2_0_1/GeobodyInterpretation.h"
6073
#include "resqml2_0_1/Grid2dRepresentation.h"
61-
#include "resqml2_0_1/SeismicLatticeFeature.h"
62-
#include "resqml2_0_1/SeismicLineSetFeature.h"
63-
#include "resqml2_0_1/SeismicLineFeature.h"
64-
#include "resqml2_0_1/WellboreFeature.h"
65-
#include "resqml2_0_1/WellboreInterpretation.h"
66-
#include "resqml2_0_1/WellboreTrajectoryRepresentation.h"
74+
#include "resqml2_0_1/Horizon.h"
75+
#include "resqml2_0_1/HorizonInterpretation.h"
76+
#include "resqml2_0_1/LocalDepth3dCrs.h"
77+
#include "resqml2_0_1/LocalTime3dCrs.h"
6778
#include "resqml2_0_1/MdDatum.h"
79+
#include "resqml2_0_1/OrganizationFeature.h"
80+
#include "resqml2_0_1/PlaneSetRepresentation.h"
81+
#include "resqml2_0_1/PointSetRepresentation.h"
82+
#include "resqml2_0_1/PointsProperty.h"
6883
#include "resqml2_0_1/PolylineRepresentation.h"
84+
#include "resqml2_0_1/PolylineSetRepresentation.h"
6985
#include "resqml2_0_1/PropertyKind.h"
70-
#include "resqml2_0_1/WellboreMarker.h"
71-
#include "resqml2_0_1/WellboreMarkerFrameRepresentation.h"
86+
#include "resqml2_0_1/PropertyKindMapper.h"
7287
#include "resqml2_0_1/PropertySet.h"
73-
#include "resqml2_0_1/CommentProperty.h"
74-
#include "resqml2_0_1/ContinuousProperty.h"
75-
#include "resqml2_0_1/DiscreteProperty.h"
76-
#include "resqml2_0_1/PointsProperty.h"
77-
#include "resqml2_0_1/CategoricalProperty.h"
78-
#include "resqml2/DoubleTableLookup.h"
79-
#include "resqml2/StringTableLookup.h"
80-
#include "resqml2/GridConnectionSetRepresentation.h"
81-
#include "resqml2/IjkGridExplicitRepresentation.h"
82-
#include "resqml2/IjkGridParametricRepresentation.h"
83-
#include "resqml2_0_1/UnstructuredGridRepresentation.h"
88+
#include "resqml2_0_1/RockFluidOrganizationInterpretation.h"
89+
#include "resqml2_0_1/RockFluidUnitFeature.h"
90+
#include "resqml2_0_1/RockFluidUnitInterpretation.h"
8491
#include "resqml2_0_1/SealedSurfaceFrameworkRepresentation.h"
92+
#include "resqml2_0_1/SeismicLatticeFeature.h"
93+
#include "resqml2_0_1/SeismicLineFeature.h"
94+
#include "resqml2_0_1/SeismicLineSetFeature.h"
95+
#include "resqml2_0_1/StratigraphicUnitInterpretation.h"
96+
#include "resqml2_0_1/StructuralOrganizationInterpretation.h"
8597
#include "resqml2_0_1/SubRepresentation.h"
98+
#include "resqml2_0_1/TectonicBoundaryFeature.h"
8699
#include "resqml2_0_1/TimeSeries.h"
87-
#include "resqml2_0_1/RockFluidOrganizationInterpretation.h"
88-
#include "resqml2_0_1/RockFluidUnitInterpretation.h"
89-
#include "resqml2_0_1/RockFluidUnitFeature.h"
90-
#include "resqml2_0_1/PropertyKindMapper.h"
100+
#include "resqml2_0_1/TriangulatedSetRepresentation.h"
101+
#include "resqml2_0_1/UnstructuredGridRepresentation.h"
102+
#include "resqml2_0_1/WellboreFeature.h"
103+
#include "resqml2_0_1/WellboreInterpretation.h"
104+
#include "resqml2_0_1/WellboreTrajectoryRepresentation.h"
105+
#include "resqml2_0_1/WellboreMarker.h"
106+
#include "resqml2_0_1/WellboreMarkerFrameRepresentation.h"
91107

92-
#include "resqml2_0_1/Activity.h"
93-
#include "resqml2_0_1/ActivityTemplate.h"
94108
#if WITH_RESQML2_2
95109
#include "eml2_3/GraphicalInformationSet.h"
96110
#include "resqml2_2/DiscreteColorMap.h"
@@ -100,17 +114,6 @@ under the License.
100114
#include "resqml2_2/SeismicWellboreFrameRepresentation.h"
101115
#include "resqml2_2/ShotPointLineFeature.h"
102116
#endif
103-
#include "resqml2/SealedVolumeFrameworkRepresentation.h"
104-
#include "resqml2/StratigraphicColumn.h"
105-
#include "resqml2/StratigraphicColumnRankInterpretation.h"
106-
#include "resqml2/StratigraphicOccurrenceInterpretation.h"
107-
108-
#include "eml2/AbstractHdfProxy.h"
109-
#include "eml2/PropertyKind.h"
110-
#include "eml2/TimeSeries.h"
111-
112-
#include "eml2_3/LocalEngineeringCompoundCrs.h"
113-
#include "eml2_3/PropertyKind.h"
114117

115118
#include "witsml2_1/Well.h"
116119
#include "witsml2_1/Wellbore.h"
@@ -5426,6 +5429,12 @@ void deserialize(const string & inputFile)
54265429
for (auto* wellboreCubicTraj : wellboreCubicTrajSet)
54275430
{
54285431
showAllMetadata(wellboreCubicTraj);
5432+
auto const* wbtr201 = dynamic_cast<RESQML2_0_1_NS::WellboreTrajectoryRepresentation*>(wellboreCubicTraj);
5433+
if (wbtr201) {
5434+
auto const* devSurvey = wbtr201->getDeviationSurvey();
5435+
std::cout << "It contains a Deviation Survey (2.0.1 only option)" << std::endl;
5436+
auto angle = devSurvey->getAngleUom();
5437+
}
54295438
std::cout << "MD Datum is : " << wellboreCubicTraj->getMdDatum()->getTitle() << std::endl;
54305439
std::cout << "--------------------------------------------------" << std::endl;
54315440
if (wellboreCubicTraj->getXyzPointCountOfAllPatches() == 0) {

‎src/resqml2_0_1/DeviationSurveyRepresentation.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ namespace RESQML2_0_1_NS
156156
*
157157
* @returns The unit of measure of the azimuth and inclination angle values.
158158
*/
159-
gsoap_resqml2_0_1::eml20__PlaneAngleUom getAngleUom() const;
159+
DLL_IMPORT_OR_EXPORT gsoap_resqml2_0_1::eml20__PlaneAngleUom getAngleUom() const;
160160

161161
/**
162162
* Gets the MD double values associated to each trajectory station of this deviation survey

‎swig/swigResqml2_0_1Include.i‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,6 +1091,20 @@ namespace RESQML2_0_1_NS
10911091
* @returns True if it is a final version, false if not.
10921092
*/
10931093
bool isFinal() const;
1094+
1095+
/**
1096+
* Gets the unit of measure of the MDs along this deviation survey.
1097+
*
1098+
* @returns The unit of measure of the MDs.
1099+
*/
1100+
gsoap_resqml2_0_1::eml20__LengthUom getMdUom() const;
1101+
1102+
/**
1103+
* Gets the unit of measure of the azimuth and inclination angle values of this deviation survey.
1104+
*
1105+
* @returns The unit of measure of the azimuth and inclination angle values.
1106+
*/
1107+
gsoap_resqml2_0_1::eml20__PlaneAngleUom getAngleUom() const;
10941108

10951109
/**
10961110
* Gets the MD double values associated to each trajectory station of this deviation survey

0 commit comments

Comments
 (0)