Merge pull request #316 from F2I-Consulting/dev

v2.8.0.0
F2I-Consulting · Jun 19, 2023 · 79babc0 · 79babc0
2 parents 837d42d + e47f072
commit 79babc0
Show file tree

Hide file tree

Showing 24 changed files with 334 additions and 465 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,8 +10,8 @@ set (FESAPI_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
 # version mechanism
 set (Fesapi_VERSION_MAJOR 2)
-set (Fesapi_VERSION_MINOR 7)
-set (Fesapi_VERSION_PATCH 1)
+set (Fesapi_VERSION_MINOR 8)
+set (Fesapi_VERSION_PATCH 0)
 set (Fesapi_VERSION_TWEAK 0)
 
 set (Fesapi_VERSION ${Fesapi_VERSION_MAJOR}.${Fesapi_VERSION_MINOR}.${Fesapi_VERSION_PATCH}.${Fesapi_VERSION_TWEAK})

diff --git a/cmake/swigCsInclude.i b/cmake/swigCsInclude.i
@@ -1052,7 +1052,6 @@ namespace RESQML2_NS
 										PointsProperty*,
 										PolylineRepresentation*,
 										PolylineSetRepresentation*,
-										PropertySet*,
 										RepresentationSetRepresentation*,
 										RockFluidOrganizationInterpretation*,
 										RockFluidUnitInterpretation*,

diff --git a/cmake/swigJavaInclude.i b/cmake/swigJavaInclude.i
@@ -1064,7 +1064,6 @@ namespace RESQML2_NS
 						PointsProperty*,
 						PolylineRepresentation*,
 						PolylineSetRepresentation*,
-						PropertySet*,
 						RepresentationSetRepresentation*,
 						RockFluidOrganizationInterpretation*,
 						RockFluidUnitInterpretation*,

diff --git a/cmake/swigPythonInclude.i.in b/cmake/swigPythonInclude.i.in
@@ -107,7 +107,6 @@ namespace RESQML2_NS
 										PointsProperty*,
 										PolylineRepresentation*,
 										PolylineSetRepresentation*,
-										PropertySet*,
 										RepresentationSetRepresentation*,
 										RockFluidOrganizationInterpretation*,
 										RockFluidUnitInterpretation*,

diff --git a/example/example.cpp b/example/example.cpp
@@ -1008,7 +1008,7 @@ void serializeGrid(COMMON_NS::DataObjectRepository * pck, EML2_NS::AbstractHdfPr
 	int64_t prop2Values[2] = { 10, 11 };
 	discreteProp2->pushBackInt64Hdf5Array3dOfValues(prop2Values, 2, 1, 1, hdfProxy, 1111);
 
-	RESQML2_NS::PropertySet* propSet = pck->createPropertySet("", "Testing property set", false, true,gsoap_resqml2_0_1::resqml20__TimeSetKind::not_x0020a_x0020time_x0020set);
+	RESQML2_0_1_NS::PropertySet* propSet = pck->createPropertySet("", "Testing property set", false, true,gsoap_resqml2_0_1::resqml20__TimeSetKind::not_x0020a_x0020time_x0020set);
 	propSet->pushBackProperty(discreteProp1);
 	propSet->pushBackProperty(discreteProp2);
 
@@ -2525,9 +2525,9 @@ void showAllProperties(RESQML2_NS::AbstractRepresentation const * rep, bool* ena
 		RESQML2_NS::AbstractProperty const * prop = propertySet[propIndex];
 		showAllMetadata(prop, "\t");
 
-		std::vector<RESQML2_NS::PropertySet *> propSets = prop->getPropertySets();
+		std::vector<RESQML2_0_1_NS::PropertySet *> propSets = prop->getPropertySets();
 		for (size_t propSetIndex = 0; propSetIndex < propSets.size(); ++propSetIndex) {
-			RESQML2_NS::PropertySet* propSet = propSets[propSetIndex];
+			RESQML2_0_1_NS::PropertySet* propSet = propSets[propSetIndex];
 			std::cout << "\tContained in property set : ";
 			showAllMetadata(propSet, "\t");
 		}

diff --git a/src/common/DataObjectRepository.cpp b/src/common/DataObjectRepository.cpp
@@ -2400,7 +2400,7 @@ EML2_NS::PropertyKind* DataObjectRepository::createPropertyKind(const std::strin
 	}
 }
 
-RESQML2_NS::PropertySet* DataObjectRepository::createPropertySet(const std::string & guid, const std::string & title,
+RESQML2_0_1_NS::PropertySet* DataObjectRepository::createPropertySet(const std::string & guid, const std::string & title,
 	bool hasMultipleRealizations, bool hasSinglePropertyKind, gsoap_resqml2_0_1::resqml20__TimeSetKind timeSetKind)
 {
 		return new RESQML2_0_1_NS::PropertySet(this, guid, title, hasMultipleRealizations, hasSinglePropertyKind, timeSetKind);
@@ -2844,6 +2844,7 @@ GETTER_DATAOBJECTS_IMPL(RESQML2_NS::UnstructuredGridRepresentation, Unstructured
 GETTER_DATAOBJECTS_IMPL(RESQML2_NS::WellboreFeature, Wellbore)
 GETTER_DATAOBJECTS_IMPL(RESQML2_NS::WellboreTrajectoryRepresentation, WellboreTrajectoryRepresentation)
 GETTER_DATAOBJECTS_IMPL(RESQML2_NS::WellboreFrameRepresentation, WellboreFrameRepresentation)
+GETTER_DATAOBJECTS_IMPL(RESQML2_0_1_NS::PropertySet, PropertySet)
 
 GETTER_DATAOBJECTS_IMPL(WITSML2_NS::Well, WitsmlWell)
 GETTER_DATAOBJECTS_IMPL(WITSML2_NS::Wellbore, WitsmlWellbore)

diff --git a/src/common/DataObjectRepository.h b/src/common/DataObjectRepository.h
@@ -80,7 +80,6 @@ namespace RESQML2_NS
 	class PointsProperty;
 	class PolylineRepresentation;
 	class PolylineSetRepresentation;
-	class PropertySet;
 	class RepresentationSetRepresentation;
 	class RockFluidOrganizationInterpretation;
 	class RockFluidUnitInterpretation;
@@ -123,6 +122,7 @@ namespace RESQML2_0_1_NS
 	class Horizon;
 	class PointsProperty;
 	class PropertyKind;
+	class PropertySet;
 	class RockFluidUnitFeature;
 	class SeismicLineFeature;
 	class TectonicBoundaryFeature;
@@ -588,6 +588,8 @@ namespace COMMON_NS
 		GETTER_DATAOBJECTS(RESQML2_NS::WellboreTrajectoryRepresentation, WellboreTrajectoryRepresentation)
 		GETTER_DATAOBJECTS(RESQML2_NS::WellboreFrameRepresentation, WellboreFrameRepresentation)
 
+		GETTER_DATAOBJECTS(RESQML2_0_1_NS::PropertySet, PropertySet)
+
 		GETTER_DATAOBJECTS(WITSML2_NS::Well, WitsmlWell)
 		GETTER_DATAOBJECTS(WITSML2_NS::Wellbore, WitsmlWellbore)
 		GETTER_DATAOBJECTS(WITSML2_NS::Trajectory, WitsmlTrajectory)
@@ -2737,7 +2739,7 @@ namespace COMMON_NS
 		 *
 		 * @returns	A pointer to the new property set.
 		 */
-		DLL_IMPORT_OR_EXPORT RESQML2_NS::PropertySet* createPropertySet(const std::string & guid, const std::string & title,
+		DLL_IMPORT_OR_EXPORT RESQML2_0_1_NS::PropertySet* createPropertySet(const std::string & guid, const std::string & title,
 			bool hasMultipleRealizations, bool hasSinglePropertyKind, gsoap_resqml2_0_1::resqml20__TimeSetKind timeSetKind);
 
 		/**

diff --git a/src/resqml2/AbstractProperty.cpp b/src/resqml2/AbstractProperty.cpp
@@ -31,10 +31,10 @@ under the License.
 #include "../eml2/TimeSeries.h"
 
 #include "AbstractRepresentation.h"
-#include "PropertySet.h"
 #include "AbstractLocal3dCrs.h"
 
 #include "../resqml2_0_1/PropertyKindMapper.h"
+#include "../resqml2_0_1/PropertySet.h"
 
 using namespace RESQML2_NS;
 using namespace std;
@@ -279,31 +279,19 @@ gsoap_eml2_3::eml23__IndexableElement AbstractProperty::getAttachmentKind() cons
 	throw logic_error("Not implemented yet");
 }
 
-std::vector<RESQML2_NS::PropertySet *> AbstractProperty::getPropertySets() const
+std::vector<RESQML2_0_1_NS::PropertySet *> AbstractProperty::getPropertySets() const
 {
-	return repository->getSourceObjects<RESQML2_NS::PropertySet>(this);
+	return repository->getSourceObjects<RESQML2_0_1_NS::PropertySet>(this);
 }
 
-unsigned int AbstractProperty::getPropertySetCount() const
+uint64_t AbstractProperty::getPropertySetCount() const
 {
-	const std::vector<RESQML2_NS::PropertySet *> & propSets = getPropertySets();
-
-	if (propSets.size() > (std::numeric_limits<unsigned int>::max)()) {
-		throw range_error("Too much property set containing this property");
-	}
-
-	return static_cast<unsigned int>(propSets.size());
+	return getPropertySets().size();
 }
 
-RESQML2_NS::PropertySet * AbstractProperty::getPropertySet(unsigned int index) const
+RESQML2_0_1_NS::PropertySet * AbstractProperty::getPropertySet(uint64_t index) const
 {
-	const std::vector<RESQML2_NS::PropertySet *> & propSets = getPropertySets();
-
-	if (index < propSets.size()) {
-		return propSets[index];
-	}
-
-	throw out_of_range("The index of the prop Set is out of range");
+	return getPropertySets().at(index);
 }
 
 void AbstractProperty::setLocalCrs(AbstractLocal3dCrs * crs)

diff --git a/src/resqml2/AbstractProperty.h b/src/resqml2/AbstractProperty.h
@@ -146,7 +146,7 @@ namespace RESQML2_NS
 		 *
 		 * @returns A vector of all property sets which contain this property.
 		 */
-		DLL_IMPORT_OR_EXPORT std::vector<RESQML2_NS::PropertySet *> getPropertySets() const;
+		DLL_IMPORT_OR_EXPORT std::vector<RESQML2_0_1_NS::PropertySet *> getPropertySets() const;
 
 		/**
 		 * Gets the count of property sets which contain this property
@@ -156,7 +156,7 @@ namespace RESQML2_NS
 		 *
 		 * @returns	The count of property sets which contain this property.
 		 */
-		DLL_IMPORT_OR_EXPORT unsigned int getPropertySetCount() const;
+		DLL_IMPORT_OR_EXPORT uint64_t getPropertySetCount() const;
 
 		/**
 		 * Gets a given property set taken from all property sets which contain this property
@@ -167,7 +167,7 @@ namespace RESQML2_NS
 		 *
 		 * @returns	The property set at @p index.
 		 */
-		DLL_IMPORT_OR_EXPORT RESQML2_NS::PropertySet * getPropertySet(unsigned int index) const;
+		DLL_IMPORT_OR_EXPORT RESQML2_0_1_NS::PropertySet * getPropertySet(uint64_t index) const;
 
 		//*********************************************
 		//****************** CRS **********************
@@ -206,7 +206,7 @@ namespace RESQML2_NS
 		/**
 		 * Checks if this property has at least one realization index. Realization index is used if the property is
 		 * the result of a multi-realization process.
-		 * Reamrk : v2.0.1 is constrained to have a maximum of one realisation index
+		 * Remark : v2.0.1 is constrained to have a maximum of one realisation index
 		 *
 		 * @returns	True if the property has at least one realization index, false if not.
 		 */
@@ -216,6 +216,7 @@ namespace RESQML2_NS
 		 * Gets the realization index of this property. Realization index is used if the property is the
 		 * result of a multi-realization process. You should have checked before that this property
 		 * actually has a realization index.
+		 * Remark : v2.0.1 is constrained to have a maximum of one realisation index
 		 *
 		 * @exception	std::invalid_argument	If this property has actually no realization index.
 		 *
@@ -242,6 +243,7 @@ namespace RESQML2_NS
 		 * @exception	std::logic_error	 	If no supported gSOAP proxy is available.
 		 *
 		 * @param 		  	realizationIndices	The realization indices to set to this property.
+		 * Remark : v2.0.1 is constrained to have a maximum of one realisation index
 		 * @param [in,out]	hdfProxy		  	(Optional) The HDF proxy where to store @p
 		 * 										realizationIndices values. If @p nullptr (default), then
 		 * 										the repository default HDF proxy will be used.

diff --git a/src/resqml2/CMakeLists.txt b/src/resqml2/CMakeLists.txt
@@ -33,7 +33,6 @@ set(FESAPI_RESQML_2_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/${RESQML_PREFIX_2}/Abstr
 							${CMAKE_CURRENT_SOURCE_DIR}/${RESQML_PREFIX_2}/PointsProperty.cpp
 							${CMAKE_CURRENT_SOURCE_DIR}/${RESQML_PREFIX_2}/PolylineRepresentation.cpp
 							${CMAKE_CURRENT_SOURCE_DIR}/${RESQML_PREFIX_2}/PolylineSetRepresentation.cpp
-							${CMAKE_CURRENT_SOURCE_DIR}/${RESQML_PREFIX_2}/PropertySet.cpp
 							${CMAKE_CURRENT_SOURCE_DIR}/${RESQML_PREFIX_2}/RepresentationSetRepresentation.cpp
 							${CMAKE_CURRENT_SOURCE_DIR}/${RESQML_PREFIX_2}/RockFluidOrganizationInterpretation.cpp
 							${CMAKE_CURRENT_SOURCE_DIR}/${RESQML_PREFIX_2}/SealedVolumeFrameworkRepresentation.cpp
@@ -105,7 +104,6 @@ set(FESAPI_RESQML_2_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/${RESQML_PREFIX_2}/Abstr
 							${CMAKE_CURRENT_SOURCE_DIR}/${RESQML_PREFIX_2}/PointsProperty.h
 							${CMAKE_CURRENT_SOURCE_DIR}/${RESQML_PREFIX_2}/PolylineRepresentation.h
 							${CMAKE_CURRENT_SOURCE_DIR}/${RESQML_PREFIX_2}/PolylineSetRepresentation.h
-							${CMAKE_CURRENT_SOURCE_DIR}/${RESQML_PREFIX_2}/PropertySet.h
 							${CMAKE_CURRENT_SOURCE_DIR}/${RESQML_PREFIX_2}/RepresentationSetRepresentation.h
 							${CMAKE_CURRENT_SOURCE_DIR}/${RESQML_PREFIX_2}/RockFluidOrganizationInterpretation.h
 							${CMAKE_CURRENT_SOURCE_DIR}/${RESQML_PREFIX_2}/RockFluidUnitInterpretation.h

diff --git a/src/resqml2/PropertySet.cpp b/src/resqml2/PropertySet.cpp