Prepare release.

CHANGELOG.txt

@@ -1,5 +1,8 @@
 CHANGE LOG: OpenCMISS-Zinc Library
 
+v3.5.1
+Fix const usage in C++ API.
+
 v3.5.0
 Add support for relative paths in region find/create subregion; add get path, relative path, root.
 Add Apply and Argument fields which apply real-valued field expressions with argument binding, including from another region.

CMakeLists.txt

@@ -17,7 +17,7 @@ if(POLICY CMP0086)
 endif()
 
 # This is the project name and shows up in IDEs
-project(Zinc VERSION 3.5.0 LANGUAGES C CXX)
+project(Zinc VERSION 3.5.1 LANGUAGES C CXX)
 
 # Set this to the development release or release candidate version.
 set(Zinc_DEVELOPER_VERSION "")

src/api/opencmiss/zinc/context.hpp

@@ -92,53 +92,53 @@ class Context
 		return id;
 	}
 
-	char* getName()
+	char* getName() const
 	{
 		return cmzn_context_get_name(id);
 	}
 
-	int getVersion(int *versionOut3)
+	int getVersion(int *versionOut3) const
 	{
 		return cmzn_context_get_version(id, versionOut3);
 	}
 
-	const char* getRevision()
+	const char* getRevision() const
 	{
 		return cmzn_context_get_revision(id);
 	}
 
-	char *getVersionString()
+	char *getVersionString() const
 	{
 		return cmzn_context_get_version_string(id);
 	}
 
 	inline Region createRegion();
 
-	inline Region getDefaultRegion();
+	inline Region getDefaultRegion() const;
 
 	inline int setDefaultRegion(const Region& region);
 
-	inline Fontmodule getFontmodule();
+	inline Fontmodule getFontmodule() const;
 
-	inline Glyphmodule getGlyphmodule();
+	inline Glyphmodule getGlyphmodule() const;
 
-	inline Lightmodule getLightmodule();
+	inline Lightmodule getLightmodule() const;
 
-	inline Logger getLogger();
+	inline Logger getLogger() const;
 
-	inline Materialmodule getMaterialmodule();
+	inline Materialmodule getMaterialmodule() const;
 
-	inline Scenefiltermodule getScenefiltermodule();
+	inline Scenefiltermodule getScenefiltermodule() const;
 
-	inline Sceneviewermodule getSceneviewermodule();
+	inline Sceneviewermodule getSceneviewermodule() const;
 
-	inline Shadermodule getShadermodule();
+	inline Shadermodule getShadermodule() const;
 
-	inline Spectrummodule getSpectrummodule();
+	inline Spectrummodule getSpectrummodule() const;
 
-	inline Tessellationmodule getTessellationmodule();
+	inline Tessellationmodule getTessellationmodule() const;
 
-	inline Timekeepermodule getTimekeepermodule();
+	inline Timekeepermodule getTimekeepermodule() const;
 
 };
 

src/api/opencmiss/zinc/element.hpp

@@ -136,7 +136,7 @@ class Element
 		return id;
 	}
 
-	int getDimension()
+	int getDimension() const
 	{
 		return cmzn_element_get_dimension(id);
 	}
@@ -146,7 +146,7 @@ class Element
 		return Elementfieldtemplate(cmzn_element_get_elementfieldtemplate(this->id, field.getId(), componentNumber));
 	}
 
-	int getIdentifier()
+	int getIdentifier() const
 	{
 		return cmzn_element_get_identifier(id);
 	}
@@ -158,7 +158,7 @@ class Element
 
 	inline Mesh getMesh() const;
 
-	Node getNode(const Elementfieldtemplate &eft, int localNodeIndex)
+	Node getNode(const Elementfieldtemplate &eft, int localNodeIndex) const
 	{
 		return Node(cmzn_element_get_node(this->id, eft.getId(), localNodeIndex));
 	}
@@ -174,7 +174,7 @@ class Element
 		return cmzn_element_set_nodes_by_identifier(this->id, eft.getId(), identifiersCount, identifiersIn);
 	}
 
-	int getScaleFactor(const Elementfieldtemplate &eft, int scaleFactorIndex, double *valueOut)
+	int getScaleFactor(const Elementfieldtemplate &eft, int scaleFactorIndex, double *valueOut) const
 	{
 		return cmzn_element_get_scale_factor(this->id, eft.getId(), scaleFactorIndex, valueOut);
 	}
@@ -185,7 +185,7 @@ class Element
 	}
 
 	int getScaleFactors(const Elementfieldtemplate &eft, int valuesCount,
-		double *valuesOut)
+		double *valuesOut) const
 	{
 		return cmzn_element_get_scale_factors(this->id, eft.getId(), valuesCount, valuesOut);
 	}
@@ -226,7 +226,7 @@ class Element
 		return cmzn_element_shape_type_enum_to_string(static_cast<cmzn_element_shape_type>(type));
 	}
 
-	enum ShapeType getShapeType()
+	enum ShapeType getShapeType() const
 	{
 		return static_cast<ShapeType>(cmzn_element_get_shape_type(id));
 	}

src/api/opencmiss/zinc/elementbasis.hpp

@@ -81,7 +81,7 @@ class Elementbasis
 		return id;
 	}
 
-	int getDimension()
+	int getDimension() const
 	{
 		return cmzn_elementbasis_get_dimension(id);
 	}
@@ -96,7 +96,7 @@ class Elementbasis
 		return cmzn_elementbasis_function_type_enum_to_string(static_cast<cmzn_elementbasis_function_type>(type));
 	}
 
-	FunctionType getFunctionType(int chartComponent)
+	FunctionType getFunctionType(int chartComponent) const
 	{
 		return static_cast<FunctionType>(cmzn_elementbasis_get_function_type(id, chartComponent));
 	}
@@ -107,17 +107,17 @@ class Elementbasis
 			static_cast<cmzn_elementbasis_function_type>(functionType));
 	}
 
-	int getNumberOfNodes()
+	int getNumberOfNodes() const
 	{
 		return cmzn_elementbasis_get_number_of_nodes(id);
 	}
 
-	int getNumberOfFunctions()
+	int getNumberOfFunctions() const
 	{
 		return cmzn_elementbasis_get_number_of_functions(id);
 	}
 
-	int getNumberOfFunctionsPerNode(int nodeNumber)
+	int getNumberOfFunctionsPerNode(int nodeNumber) const
 	{
 		return cmzn_elementbasis_get_number_of_functions_per_node(id, nodeNumber);
 	}

src/api/opencmiss/zinc/elementtemplate.hpp

@@ -70,7 +70,7 @@ class Elementtemplate
 		return id;
 	}
 
-	Element::ShapeType getElementShapeType()
+	Element::ShapeType getElementShapeType() const
 	{
 		return static_cast<Element::ShapeType>(cmzn_elementtemplate_get_element_shape_type(id));
 	}
@@ -81,7 +81,7 @@ class Elementtemplate
 			static_cast<cmzn_element_shape_type>(shapeType));
 	}
 
-	int getNumberOfNodes()
+	int getNumberOfNodes() const
 	{
 		return cmzn_elementtemplate_get_number_of_nodes(id);
 	}
@@ -126,7 +126,7 @@ class Elementtemplate
 			componentNumber, basisNodeIndex, nodeFunctionIndex, versionNumber);
 	}
 
-	Node getNode(int localNodeIndex)
+	Node getNode(int localNodeIndex) const
 	{
 		return Node(cmzn_elementtemplate_get_node(id, localNodeIndex));
 	}

src/api/opencmiss/zinc/field.hpp

@@ -155,7 +155,7 @@ class Field
 
 	inline Fieldassignment createFieldassignment(const Field& sourceField);
 
-	bool isManaged()
+	bool isManaged() const
 	{
 		return cmzn_field_is_managed(id);
 	}
@@ -165,7 +165,7 @@ class Field
 		return cmzn_field_set_managed(id, value);
 	}
 
-	char *getComponentName(int componentNumber)
+	char *getComponentName(int componentNumber) const
 	{
 		return cmzn_field_get_component_name(id, componentNumber);
 	}
@@ -175,7 +175,7 @@ class Field
 		return cmzn_field_set_component_name(id, componentNumber, name);
 	}
 
-	double getCoordinateSystemFocus()
+	double getCoordinateSystemFocus() const
 	{
 		return cmzn_field_get_coordinate_system_focus(id);
 	}
@@ -195,7 +195,7 @@ class Field
 		return cmzn_field_coordinate_system_type_enum_to_string(static_cast<cmzn_field_coordinate_system_type>(type));
 	}
 
-	CoordinateSystemType getCoordinateSystemType()
+	CoordinateSystemType getCoordinateSystemType() const
 	{
 		return static_cast<CoordinateSystemType>(
 			cmzn_field_get_coordinate_system_type(id));
@@ -217,14 +217,14 @@ class Field
 		return cmzn_field_domain_type_enum_to_string(static_cast<cmzn_field_domain_type>(type));
 	}
 
-	inline Fieldparameters getFieldparameters();
+	inline Fieldparameters getFieldparameters() const;
 
-	int getNumberOfComponents()
+	int getNumberOfComponents() const
 	{
 		return cmzn_field_get_number_of_components(id);
 	}
 
-	char *getName()
+	char *getName() const
 	{
 		return cmzn_field_get_name(id);
 	}
@@ -234,17 +234,17 @@ class Field
 		return cmzn_field_set_name(id, name);
 	}
 
-	int getNumberOfSourceFields()
+	int getNumberOfSourceFields() const
 	{
 		return cmzn_field_get_number_of_source_fields(id);
 	}
 
-	Field getSourceField(int index)
+	Field getSourceField(int index) const
 	{
 		return Field(cmzn_field_get_source_field(id, index));
 	}
 
-	bool isTypeCoordinate()
+	bool isTypeCoordinate() const
 	{
 		return cmzn_field_is_type_coordinate(id);
 	}
@@ -254,7 +254,7 @@ class Field
 		return cmzn_field_set_type_coordinate(id, value);
 	}
 
-	ValueType getValueType()
+	ValueType getValueType() const
 	{
 		return static_cast<ValueType>(cmzn_field_get_value_type(id));
 	}
@@ -268,22 +268,22 @@ class Field
 
 	inline int assignString(const Fieldcache& cache, const char *stringValue);
 
-	inline bool dependsOnField(const Field& otherField)
+	inline bool dependsOnField(const Field& otherField) const
 	{
 		return cmzn_field_depends_on_field(this->id, otherField.id);
 	}
 
 	inline Element evaluateMeshLocation(const Fieldcache& cache, int coordinatesCount,
-		double *coordinatesOut);
+		double *coordinatesOut) const;
 
-	inline int evaluateReal(const Fieldcache& cache, int valuesCount, double *valuesOut);
+	inline int evaluateReal(const Fieldcache& cache, int valuesCount, double *valuesOut) const;
 
-	inline char *evaluateString(const Fieldcache& cache);
+	inline char *evaluateString(const Fieldcache& cache) const;
 
 	inline int evaluateDerivative(const Differentialoperator& differentialOperator,
-		const Fieldcache& cache, int valuesCount, double *valuesOut);
+		const Fieldcache& cache, int valuesCount, double *valuesOut) const;
 
-	inline bool isDefinedAtLocation(const Fieldcache& cache);
+	inline bool isDefinedAtLocation(const Fieldcache& cache) const;
 
 	inline int smooth(const Fieldsmoothing& fieldsmoothing);
 

src/api/opencmiss/zinc/fieldcache.hpp

@@ -128,30 +128,30 @@ inline int Field::assignString(const Fieldcache& cache, const char *stringValue)
 }
 
 inline Element Field::evaluateMeshLocation(const Fieldcache& cache, int coordinatesCount,
-	double *coordinatesOut)
+	double *coordinatesOut) const
 {
 	return Element(cmzn_field_evaluate_mesh_location(id,
 		cache.getId(), coordinatesCount, coordinatesOut));
 }
 
-inline int Field::evaluateReal(const Fieldcache& cache, int valuesCount, double *valuesOut)
+inline int Field::evaluateReal(const Fieldcache& cache, int valuesCount, double *valuesOut) const
 {
 	return cmzn_field_evaluate_real(id, cache.getId(), valuesCount, valuesOut);
 }
 
-inline char *Field::evaluateString(const Fieldcache& cache)
+inline char *Field::evaluateString(const Fieldcache& cache) const
 {
 	return cmzn_field_evaluate_string(id, cache.getId());
 }
 
 inline int Field::evaluateDerivative(const Differentialoperator& differentialOperator,
-	const Fieldcache& cache, int valuesCount, double *valuesOut)
+	const Fieldcache& cache, int valuesCount, double *valuesOut) const
 {
 	return cmzn_field_evaluate_derivative(id, differentialOperator.getId(),
 		cache.getId(), valuesCount, valuesOut);
 }
 
-inline bool Field::isDefinedAtLocation(const Fieldcache& cache)
+inline bool Field::isDefinedAtLocation(const Fieldcache& cache) const
 {
 	return cmzn_field_is_defined_at_location(id, cache.getId());
 }

src/api/opencmiss/zinc/fieldcomposite.hpp

@@ -53,7 +53,7 @@ class FieldComponent : public Field
 		Field(reinterpret_cast<cmzn_field_id>(field_component_id))
 	{	}
 
-	int getComponentIndex()
+	int getComponentIndex() const
 	{
 		return cmzn_field_component_get_component_index(getDerivedId());
 	}
@@ -63,7 +63,7 @@ class FieldComponent : public Field
 		return cmzn_field_component_set_component_index(getDerivedId(), componentIndex);
 	}
 
-	int getSourceComponentIndex(int index)
+	int getSourceComponentIndex(int index) const
 	{
 		return cmzn_field_component_get_source_component_index(getDerivedId(), index);
 	}