SCRUG-NA/2025
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install SeisComP and scanloc ARM64 nightly packages

Browse Source
This commit is contained in:
Enrico Ellguth
2025-10-29 12:34:04 +00:00
parent 2ff097f9d1
commit 165b829fb7
606 changed files with 24438 additions and 16358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/seiscomp/datamodel/access.h
View File

@ -92,25 +92,25 @@ class SC_SYSTEM_CORE_API Access : public Object {
Access();
//! Copy constructor
Access(const Access& other);
Access(const Access &other);
//! Destructor
~Access() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
Access& operator=(const Access& other);
Access &operator=(const Access &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Access& other) const;
bool operator!=(const Access& other) const;
bool operator==(const Access &other) const;
bool operator!=(const Access &other) const;
//! Wrapper that calls operator==
bool equal(const Access& other) const;
bool equal(const Access &other) const;
// ------------------------------------------------------------------
@ -151,17 +151,17 @@ class SC_SYSTEM_CORE_API Access : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const AccessIndex& index() const;
const AccessIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const Access* lhs) const;
bool equalIndex(const Access *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Routing* routing() const;
Routing *routing() const;
//! Implement Object interface
bool assign(Object *other) override;

32
include/seiscomp/datamodel/amplitude.h
View File

@ -67,28 +67,28 @@ class SC_SYSTEM_CORE_API Amplitude : public PublicObject {
public:
//! Copy constructor
Amplitude(const Amplitude& other);
Amplitude(const Amplitude &other);
//! Constructor with publicID
Amplitude(const std::string& publicID);
//! Destructor
~Amplitude() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static Amplitude* Create();
static Amplitude* Create(const std::string& publicID);
static Amplitude *Create();
static Amplitude *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static Amplitude* Find(const std::string& publicID);
static Amplitude *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -97,14 +97,14 @@ class SC_SYSTEM_CORE_API Amplitude : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
Amplitude& operator=(const Amplitude& other);
Amplitude &operator=(const Amplitude &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Amplitude& other) const;
bool operator!=(const Amplitude& other) const;
bool operator==(const Amplitude &other) const;
bool operator!=(const Amplitude &other) const;
//! Wrapper that calls operator==
bool equal(const Amplitude& other) const;
bool equal(const Amplitude &other) const;
// ------------------------------------------------------------------
@ -219,7 +219,7 @@ class SC_SYSTEM_CORE_API Amplitude : public PublicObject {
CreationInfo& creationInfo();
const CreationInfo& creationInfo() const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -232,7 +232,7 @@ class SC_SYSTEM_CORE_API Amplitude : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(Comment* obj);
bool add(Comment *obj);
/**
* Removes an object.
@ -241,7 +241,7 @@ class SC_SYSTEM_CORE_API Amplitude : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(Comment* obj);
bool remove(Comment *obj);
/**
* Removes an object of a particular class.
@ -250,19 +250,19 @@ class SC_SYSTEM_CORE_API Amplitude : public PublicObject {
* @return false The index is out of bounds
*/
bool removeComment(size_t i);
bool removeComment(const CommentIndex& i);
bool removeComment(const CommentIndex &i);
//! Retrieve the number of objects of a particular class
size_t commentCount() const;
//! Index access
//! @return The object at index i
Comment* comment(size_t i) const;
Comment* comment(const CommentIndex& i) const;
Comment *comment(size_t i) const;
Comment *comment(const CommentIndex &i) const;
//! Find an object by its unique attribute(s)
EventParameters* eventParameters() const;
EventParameters *eventParameters() const;
//! Implement Object interface
bool assign(Object *other) override;

20
include/seiscomp/datamodel/amplitudereference.h
View File

@ -78,28 +78,28 @@ class SC_SYSTEM_CORE_API AmplitudeReference : public Object {
AmplitudeReference();
//! Copy constructor
AmplitudeReference(const AmplitudeReference& other);
AmplitudeReference(const AmplitudeReference &other);
//! Custom constructor
AmplitudeReference(const std::string& amplitudeID);
//! Destructor
~AmplitudeReference() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
AmplitudeReference& operator=(const AmplitudeReference& other);
AmplitudeReference &operator=(const AmplitudeReference &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const AmplitudeReference& other) const;
bool operator!=(const AmplitudeReference& other) const;
bool operator==(const AmplitudeReference &other) const;
bool operator!=(const AmplitudeReference &other) const;
//! Wrapper that calls operator==
bool equal(const AmplitudeReference& other) const;
bool equal(const AmplitudeReference &other) const;
// ------------------------------------------------------------------
@ -115,17 +115,17 @@ class SC_SYSTEM_CORE_API AmplitudeReference : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const AmplitudeReferenceIndex& index() const;
const AmplitudeReferenceIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const AmplitudeReference* lhs) const;
bool equalIndex(const AmplitudeReference *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Reading* reading() const;
Reading *reading() const;
//! Implement Object interface
bool assign(Object *other) override;

38
include/seiscomp/datamodel/arclinklog.h
View File

@ -52,11 +52,11 @@ class SC_SYSTEM_CORE_API ArclinkLog : public PublicObject {
ArclinkLog();
//! Copy constructor
ArclinkLog(const ArclinkLog& other);
ArclinkLog(const ArclinkLog &other);
//! Destructor
~ArclinkLog() override;
// ------------------------------------------------------------------
// Operators
@ -64,16 +64,16 @@ class SC_SYSTEM_CORE_API ArclinkLog : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
ArclinkLog& operator=(const ArclinkLog& other);
ArclinkLog &operator=(const ArclinkLog &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const ArclinkLog& other) const;
bool operator!=(const ArclinkLog& other) const;
bool operator==(const ArclinkLog &other) const;
bool operator!=(const ArclinkLog &other) const;
//! Wrapper that calls operator==
bool equal(const ArclinkLog& other) const;
bool equal(const ArclinkLog &other) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -86,8 +86,8 @@ class SC_SYSTEM_CORE_API ArclinkLog : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(ArclinkRequest* obj);
bool add(ArclinkUser* obj);
bool add(ArclinkRequest *obj);
bool add(ArclinkUser *obj);
/**
* Removes an object.
@ -96,8 +96,8 @@ class SC_SYSTEM_CORE_API ArclinkLog : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(ArclinkRequest* obj);
bool remove(ArclinkUser* obj);
bool remove(ArclinkRequest *obj);
bool remove(ArclinkUser *obj);
/**
* Removes an object of a particular class.
@ -106,9 +106,9 @@ class SC_SYSTEM_CORE_API ArclinkLog : public PublicObject {
* @return false The index is out of bounds
*/
bool removeArclinkRequest(size_t i);
bool removeArclinkRequest(const ArclinkRequestIndex& i);
bool removeArclinkRequest(const ArclinkRequestIndex &i);
bool removeArclinkUser(size_t i);
bool removeArclinkUser(const ArclinkUserIndex& i);
bool removeArclinkUser(const ArclinkUserIndex &i);
//! Retrieve the number of objects of a particular class
size_t arclinkRequestCount() const;
@ -116,15 +116,15 @@ class SC_SYSTEM_CORE_API ArclinkLog : public PublicObject {
//! Index access
//! @return The object at index i
ArclinkRequest* arclinkRequest(size_t i) const;
ArclinkRequest* arclinkRequest(const ArclinkRequestIndex& i) const;
ArclinkRequest *arclinkRequest(size_t i) const;
ArclinkRequest *arclinkRequest(const ArclinkRequestIndex &i) const;
ArclinkUser* arclinkUser(size_t i) const;
ArclinkUser* arclinkUser(const ArclinkUserIndex& i) const;
ArclinkUser *arclinkUser(size_t i) const;
ArclinkUser *arclinkUser(const ArclinkUserIndex &i) const;
//! Find an object by its unique attribute(s)
ArclinkRequest* findArclinkRequest(const std::string& publicID) const;
ArclinkUser* findArclinkUser(const std::string& publicID) const;
ArclinkRequest *findArclinkRequest(const std::string& publicID) const;
ArclinkUser *findArclinkUser(const std::string& publicID) const;
//! Implement Object interface
bool assign(Object *other) override;

46
include/seiscomp/datamodel/arclinkrequest.h
View File

@ -91,28 +91,28 @@ class SC_SYSTEM_CORE_API ArclinkRequest : public PublicObject {
public:
//! Copy constructor
ArclinkRequest(const ArclinkRequest& other);
ArclinkRequest(const ArclinkRequest &other);
//! Constructor with publicID
ArclinkRequest(const std::string& publicID);
//! Destructor
~ArclinkRequest() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static ArclinkRequest* Create();
static ArclinkRequest* Create(const std::string& publicID);
static ArclinkRequest *Create();
static ArclinkRequest *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static ArclinkRequest* Find(const std::string& publicID);
static ArclinkRequest *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -121,14 +121,14 @@ class SC_SYSTEM_CORE_API ArclinkRequest : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
ArclinkRequest& operator=(const ArclinkRequest& other);
ArclinkRequest &operator=(const ArclinkRequest &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const ArclinkRequest& other) const;
bool operator!=(const ArclinkRequest& other) const;
bool operator==(const ArclinkRequest &other) const;
bool operator!=(const ArclinkRequest &other) const;
//! Wrapper that calls operator==
bool equal(const ArclinkRequest& other) const;
bool equal(const ArclinkRequest &other) const;
// ------------------------------------------------------------------
@ -178,12 +178,12 @@ class SC_SYSTEM_CORE_API ArclinkRequest : public PublicObject {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const ArclinkRequestIndex& index() const;
const ArclinkRequestIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const ArclinkRequest* lhs) const;
bool equalIndex(const ArclinkRequest *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -196,8 +196,8 @@ class SC_SYSTEM_CORE_API ArclinkRequest : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(ArclinkStatusLine* obj);
bool add(ArclinkRequestLine* obj);
bool add(ArclinkStatusLine *obj);
bool add(ArclinkRequestLine *obj);
/**
* Removes an object.
@ -206,8 +206,8 @@ class SC_SYSTEM_CORE_API ArclinkRequest : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(ArclinkStatusLine* obj);
bool remove(ArclinkRequestLine* obj);
bool remove(ArclinkStatusLine *obj);
bool remove(ArclinkRequestLine *obj);
/**
* Removes an object of a particular class.
@ -216,9 +216,9 @@ class SC_SYSTEM_CORE_API ArclinkRequest : public PublicObject {
* @return false The index is out of bounds
*/
bool removeArclinkStatusLine(size_t i);
bool removeArclinkStatusLine(const ArclinkStatusLineIndex& i);
bool removeArclinkStatusLine(const ArclinkStatusLineIndex &i);
bool removeArclinkRequestLine(size_t i);
bool removeArclinkRequestLine(const ArclinkRequestLineIndex& i);
bool removeArclinkRequestLine(const ArclinkRequestLineIndex &i);
//! Retrieve the number of objects of a particular class
size_t arclinkStatusLineCount() const;
@ -226,15 +226,15 @@ class SC_SYSTEM_CORE_API ArclinkRequest : public PublicObject {
//! Index access
//! @return The object at index i
ArclinkStatusLine* arclinkStatusLine(size_t i) const;
ArclinkStatusLine* arclinkStatusLine(const ArclinkStatusLineIndex& i) const;
ArclinkStatusLine *arclinkStatusLine(size_t i) const;
ArclinkStatusLine *arclinkStatusLine(const ArclinkStatusLineIndex &i) const;
ArclinkRequestLine* arclinkRequestLine(size_t i) const;
ArclinkRequestLine* arclinkRequestLine(const ArclinkRequestLineIndex& i) const;
ArclinkRequestLine *arclinkRequestLine(size_t i) const;
ArclinkRequestLine *arclinkRequestLine(const ArclinkRequestLineIndex &i) const;
//! Find an object by its unique attribute(s)
ArclinkLog* arclinkLog() const;
ArclinkLog *arclinkLog() const;
//! Implement Object interface
bool assign(Object *other) override;

20
include/seiscomp/datamodel/arclinkrequestline.h
View File

@ -85,25 +85,25 @@ class SC_SYSTEM_CORE_API ArclinkRequestLine : public Object {
ArclinkRequestLine();
//! Copy constructor
ArclinkRequestLine(const ArclinkRequestLine& other);
ArclinkRequestLine(const ArclinkRequestLine &other);
//! Destructor
~ArclinkRequestLine() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
ArclinkRequestLine& operator=(const ArclinkRequestLine& other);
ArclinkRequestLine &operator=(const ArclinkRequestLine &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const ArclinkRequestLine& other) const;
bool operator!=(const ArclinkRequestLine& other) const;
bool operator==(const ArclinkRequestLine &other) const;
bool operator!=(const ArclinkRequestLine &other) const;
//! Wrapper that calls operator==
bool equal(const ArclinkRequestLine& other) const;
bool equal(const ArclinkRequestLine &other) const;
// ------------------------------------------------------------------
@ -142,17 +142,17 @@ class SC_SYSTEM_CORE_API ArclinkRequestLine : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const ArclinkRequestLineIndex& index() const;
const ArclinkRequestLineIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const ArclinkRequestLine* lhs) const;
bool equalIndex(const ArclinkRequestLine *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
ArclinkRequest* arclinkRequest() const;
ArclinkRequest *arclinkRequest() const;
//! Implement Object interface
bool assign(Object *other) override;

12
include/seiscomp/datamodel/arclinkrequestsummary.h
View File

@ -47,25 +47,25 @@ class SC_SYSTEM_CORE_API ArclinkRequestSummary : public Core::BaseObject {
ArclinkRequestSummary();
//! Copy constructor
ArclinkRequestSummary(const ArclinkRequestSummary& other);
ArclinkRequestSummary(const ArclinkRequestSummary &other);
//! Destructor
~ArclinkRequestSummary() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
ArclinkRequestSummary& operator=(const ArclinkRequestSummary& other);
ArclinkRequestSummary &operator=(const ArclinkRequestSummary &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const ArclinkRequestSummary& other) const;
bool operator!=(const ArclinkRequestSummary& other) const;
bool operator==(const ArclinkRequestSummary &other) const;
bool operator!=(const ArclinkRequestSummary &other) const;
//! Wrapper that calls operator==
bool equal(const ArclinkRequestSummary& other) const;
bool equal(const ArclinkRequestSummary &other) const;
// ------------------------------------------------------------------

20
include/seiscomp/datamodel/arclinkstatusline.h
View File

@ -82,25 +82,25 @@ class SC_SYSTEM_CORE_API ArclinkStatusLine : public Object {
ArclinkStatusLine();
//! Copy constructor
ArclinkStatusLine(const ArclinkStatusLine& other);
ArclinkStatusLine(const ArclinkStatusLine &other);
//! Destructor
~ArclinkStatusLine() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
ArclinkStatusLine& operator=(const ArclinkStatusLine& other);
ArclinkStatusLine &operator=(const ArclinkStatusLine &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const ArclinkStatusLine& other) const;
bool operator!=(const ArclinkStatusLine& other) const;
bool operator==(const ArclinkStatusLine &other) const;
bool operator!=(const ArclinkStatusLine &other) const;
//! Wrapper that calls operator==
bool equal(const ArclinkStatusLine& other) const;
bool equal(const ArclinkStatusLine &other) const;
// ------------------------------------------------------------------
@ -128,17 +128,17 @@ class SC_SYSTEM_CORE_API ArclinkStatusLine : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const ArclinkStatusLineIndex& index() const;
const ArclinkStatusLineIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const ArclinkStatusLine* lhs) const;
bool equalIndex(const ArclinkStatusLine *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
ArclinkRequest* arclinkRequest() const;
ArclinkRequest *arclinkRequest() const;
//! Implement Object interface
bool assign(Object *other) override;

26
include/seiscomp/datamodel/arclinkuser.h
View File

@ -81,28 +81,28 @@ class SC_SYSTEM_CORE_API ArclinkUser : public PublicObject {
public:
//! Copy constructor
ArclinkUser(const ArclinkUser& other);
ArclinkUser(const ArclinkUser &other);
//! Constructor with publicID
ArclinkUser(const std::string& publicID);
//! Destructor
~ArclinkUser() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static ArclinkUser* Create();
static ArclinkUser* Create(const std::string& publicID);
static ArclinkUser *Create();
static ArclinkUser *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static ArclinkUser* Find(const std::string& publicID);
static ArclinkUser *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -111,14 +111,14 @@ class SC_SYSTEM_CORE_API ArclinkUser : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
ArclinkUser& operator=(const ArclinkUser& other);
ArclinkUser &operator=(const ArclinkUser &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const ArclinkUser& other) const;
bool operator!=(const ArclinkUser& other) const;
bool operator==(const ArclinkUser &other) const;
bool operator!=(const ArclinkUser &other) const;
//! Wrapper that calls operator==
bool equal(const ArclinkUser& other) const;
bool equal(const ArclinkUser &other) const;
// ------------------------------------------------------------------
@ -140,17 +140,17 @@ class SC_SYSTEM_CORE_API ArclinkUser : public PublicObject {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const ArclinkUserIndex& index() const;
const ArclinkUserIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const ArclinkUser* lhs) const;
bool equalIndex(const ArclinkUser *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
ArclinkLog* arclinkLog() const;
ArclinkLog *arclinkLog() const;
//! Implement Object interface
bool assign(Object *other) override;

20
include/seiscomp/datamodel/arrival.h
View File

@ -100,25 +100,25 @@ class SC_SYSTEM_CORE_API Arrival : public Object {
Arrival();
//! Copy constructor
Arrival(const Arrival& other);
Arrival(const Arrival &other);
//! Destructor
~Arrival() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
Arrival& operator=(const Arrival& other);
Arrival &operator=(const Arrival &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Arrival& other) const;
bool operator!=(const Arrival& other) const;
bool operator==(const Arrival &other) const;
bool operator!=(const Arrival &other) const;
//! Wrapper that calls operator==
bool equal(const Arrival& other) const;
bool equal(const Arrival &other) const;
// ------------------------------------------------------------------
@ -221,17 +221,17 @@ class SC_SYSTEM_CORE_API Arrival : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const ArrivalIndex& index() const;
const ArrivalIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const Arrival* lhs) const;
bool equalIndex(const Arrival *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Origin* origin() const;
Origin *origin() const;
//! Implement Object interface
bool assign(Object *other) override;

36
include/seiscomp/datamodel/auxdevice.h
View File

@ -87,28 +87,28 @@ class SC_SYSTEM_CORE_API AuxDevice : public PublicObject {
public:
//! Copy constructor
AuxDevice(const AuxDevice& other);
AuxDevice(const AuxDevice &other);
//! Constructor with publicID
AuxDevice(const std::string& publicID);
//! Destructor
~AuxDevice() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static AuxDevice* Create();
static AuxDevice* Create(const std::string& publicID);
static AuxDevice *Create();
static AuxDevice *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static AuxDevice* Find(const std::string& publicID);
static AuxDevice *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -117,14 +117,14 @@ class SC_SYSTEM_CORE_API AuxDevice : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
AuxDevice& operator=(const AuxDevice& other);
AuxDevice &operator=(const AuxDevice &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const AuxDevice& other) const;
bool operator!=(const AuxDevice& other) const;
bool operator==(const AuxDevice &other) const;
bool operator!=(const AuxDevice &other) const;
//! Wrapper that calls operator==
bool equal(const AuxDevice& other) const;
bool equal(const AuxDevice &other) const;
// ------------------------------------------------------------------
@ -157,12 +157,12 @@ class SC_SYSTEM_CORE_API AuxDevice : public PublicObject {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const AuxDeviceIndex& index() const;
const AuxDeviceIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const AuxDevice* lhs) const;
bool equalIndex(const AuxDevice *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -175,7 +175,7 @@ class SC_SYSTEM_CORE_API AuxDevice : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(AuxSource* obj);
bool add(AuxSource *obj);
/**
* Removes an object.
@ -184,7 +184,7 @@ class SC_SYSTEM_CORE_API AuxDevice : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(AuxSource* obj);
bool remove(AuxSource *obj);
/**
* Removes an object of a particular class.
@ -193,19 +193,19 @@ class SC_SYSTEM_CORE_API AuxDevice : public PublicObject {
* @return false The index is out of bounds
*/
bool removeAuxSource(size_t i);
bool removeAuxSource(const AuxSourceIndex& i);
bool removeAuxSource(const AuxSourceIndex &i);
//! Retrieve the number of objects of a particular class
size_t auxSourceCount() const;
//! Index access
//! @return The object at index i
AuxSource* auxSource(size_t i) const;
AuxSource* auxSource(const AuxSourceIndex& i) const;
AuxSource *auxSource(size_t i) const;
AuxSource *auxSource(const AuxSourceIndex &i) const;
//! Find an object by its unique attribute(s)
Inventory* inventory() const;
Inventory *inventory() const;
//! Implement Object interface
bool assign(Object *other) override;

20
include/seiscomp/datamodel/auxsource.h
View File

@ -82,7 +82,7 @@ class SC_SYSTEM_CORE_API AuxSource : public Object {
AuxSource();
//! Copy constructor
AuxSource(const AuxSource& other);
AuxSource(const AuxSource &other);
//! Custom constructor
AuxSource(const std::string& name);
@ -96,21 +96,21 @@ class SC_SYSTEM_CORE_API AuxSource : public Object {
//! Destructor
~AuxSource() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
AuxSource& operator=(const AuxSource& other);
AuxSource &operator=(const AuxSource &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const AuxSource& other) const;
bool operator!=(const AuxSource& other) const;
bool operator==(const AuxSource &other) const;
bool operator!=(const AuxSource &other) const;
//! Wrapper that calls operator==
bool equal(const AuxSource& other) const;
bool equal(const AuxSource &other) const;
// ------------------------------------------------------------------
@ -153,17 +153,17 @@ class SC_SYSTEM_CORE_API AuxSource : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const AuxSourceIndex& index() const;
const AuxSourceIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const AuxSource* lhs) const;
bool equalIndex(const AuxSource *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
AuxDevice* auxDevice() const;
AuxDevice *auxDevice() const;
//! Implement Object interface
bool assign(Object *other) override;

20
include/seiscomp/datamodel/auxstream.h
View File

@ -85,25 +85,25 @@ class SC_SYSTEM_CORE_API AuxStream : public Object {
AuxStream();
//! Copy constructor
AuxStream(const AuxStream& other);
AuxStream(const AuxStream &other);
//! Destructor
~AuxStream() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
AuxStream& operator=(const AuxStream& other);
AuxStream &operator=(const AuxStream &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const AuxStream& other) const;
bool operator!=(const AuxStream& other) const;
bool operator==(const AuxStream &other) const;
bool operator!=(const AuxStream &other) const;
//! Wrapper that calls operator==
bool equal(const AuxStream& other) const;
bool equal(const AuxStream &other) const;
// ------------------------------------------------------------------
@ -157,17 +157,17 @@ class SC_SYSTEM_CORE_API AuxStream : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const AuxStreamIndex& index() const;
const AuxStreamIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const AuxStream* lhs) const;
bool equalIndex(const AuxStream *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
SensorLocation* sensorLocation() const;
SensorLocation *sensorLocation() const;
//! Implement Object interface
bool assign(Object *other) override;

12
include/seiscomp/datamodel/axis.h
View File

@ -55,25 +55,25 @@ class SC_SYSTEM_CORE_API Axis : public Core::BaseObject {
Axis();
//! Copy constructor
Axis(const Axis& other);
Axis(const Axis &other);
//! Destructor
~Axis() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
Axis& operator=(const Axis& other);
Axis &operator=(const Axis &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Axis& other) const;
bool operator!=(const Axis& other) const;
bool operator==(const Axis &other) const;
bool operator!=(const Axis &other) const;
//! Wrapper that calls operator==
bool equal(const Axis& other) const;
bool equal(const Axis &other) const;
// ------------------------------------------------------------------

12
include/seiscomp/datamodel/blob.h
View File

@ -48,25 +48,25 @@ class SC_SYSTEM_CORE_API Blob : public Core::BaseObject {
Blob();
//! Copy constructor
Blob(const Blob& other);
Blob(const Blob &other);
//! Destructor
~Blob() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
Blob& operator=(const Blob& other);
Blob &operator=(const Blob &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Blob& other) const;
bool operator!=(const Blob& other) const;
bool operator==(const Blob &other) const;
bool operator!=(const Blob &other) const;
//! Wrapper that calls operator==
bool equal(const Blob& other) const;
bool equal(const Blob &other) const;
// ------------------------------------------------------------------

217
include/seiscomp/datamodel/catalog.h Normal file
View File

@ -0,0 +1,217 @@
/***************************************************************************
* Copyright (C) gempa GmbH *
* All rights reserved. *
* Contact: gempa GmbH (seiscomp-dev@gempa.de) *
* *
* GNU Affero General Public License Usage *
* This file may be used under the terms of the GNU Affero *
* Public License version 3.0 as published by the Free Software Foundation *
* and appearing in the file LICENSE included in the packaging of this *
* file. Please review the following information to ensure the GNU Affero *
* Public License version 3.0 requirements will be met: *
* https://www.gnu.org/licenses/agpl-3.0.html. *
* *
* Other Usage *
* Alternatively, this file may be used in accordance with the terms and *
* conditions contained in a signed written agreement between you and *
* gempa GmbH. *
***************************************************************************/
#ifndef SEISCOMP_DATAMODEL_CATALOG_H
#define SEISCOMP_DATAMODEL_CATALOG_H
#include <string>
#include <seiscomp/datamodel/creationinfo.h>
#include <seiscomp/core/datetime.h>
#include <vector>
#include <seiscomp/datamodel/comment.h>
#include <seiscomp/datamodel/notifier.h>
#include <seiscomp/datamodel/publicobject.h>
#include <seiscomp/core/exceptions.h>
namespace Seiscomp {
namespace DataModel {
DEFINE_SMARTPOINTER(Catalog);
DEFINE_SMARTPOINTER(Comment);
DEFINE_SMARTPOINTER(Event);
class EventParameters;
class SC_SYSTEM_CORE_API Catalog : public PublicObject {
DECLARE_SC_CLASS(Catalog)
DECLARE_SERIALIZATION;
DECLARE_METAOBJECT;
// ------------------------------------------------------------------
// Xstruction
// ------------------------------------------------------------------
protected:
//! Protected constructor
Catalog();
public:
//! Copy constructor
Catalog(const Catalog &other);
//! Constructor with publicID
Catalog(const std::string& publicID);
//! Destructor
~Catalog() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static Catalog *Create();
static Catalog *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static Catalog *Find(const std::string& publicID);
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
Catalog &operator=(const Catalog &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Catalog &other) const;
bool operator!=(const Catalog &other) const;
//! Wrapper that calls operator==
bool equal(const Catalog &other) const;
// ------------------------------------------------------------------
// Setters/Getters
// ------------------------------------------------------------------
public:
void setName(const std::string& name);
const std::string& name() const;
//! Catalog description
void setDescription(const std::string& description);
const std::string& description() const;
//! CreationInfo for the Catalog object.
void setCreationInfo(const OPT(CreationInfo)& creationInfo);
CreationInfo& creationInfo();
const CreationInfo& creationInfo() const;
//! Start of epoch in ISO datetime format
void setStart(Seiscomp::Core::Time start);
Seiscomp::Core::Time start() const;
//! End of epoch (empty if the catalog epoch is open)
void setEnd(const OPT(Seiscomp::Core::Time)& end);
Seiscomp::Core::Time end() const;
void setDynamic(bool dynamic);
bool dynamic() const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
/**
* Add an object.
* @param obj The object pointer
* @return true The object has been added
* @return false The object has not been added
* because it already exists in the list
* or it already has another parent
*/
bool add(Comment *obj);
bool add(Event *obj);
/**
* Removes an object.
* @param obj The object pointer
* @return true The object has been removed
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(Comment *obj);
bool remove(Event *obj);
/**
* Removes an object of a particular class.
* @param i The object index
* @return true The object has been removed
* @return false The index is out of bounds
*/
bool removeComment(size_t i);
bool removeComment(const CommentIndex &i);
bool removeEvent(size_t i);
//! Retrieve the number of objects of a particular class
size_t commentCount() const;
size_t eventCount() const;
//! Index access
//! @return The object at index i
Comment *comment(size_t i) const;
Comment *comment(const CommentIndex &i) const;
Event *event(size_t i) const;
//! Find an object by its unique attribute(s)
Event *findEvent(const std::string& publicID) const;
EventParameters *eventParameters() const;
//! Implement Object interface
bool assign(Object *other) override;
bool attachTo(PublicObject *parent) override;
bool detachFrom(PublicObject *parent) override;
bool detach() override;
//! Creates a clone
Object *clone() const override;
//! Implement PublicObject interface
bool updateChild(Object *child) override;
void accept(Visitor *visitor) override;
// ------------------------------------------------------------------
// Implementation
// ------------------------------------------------------------------
private:
// Attributes
std::string _name;
std::string _description;
OPT(CreationInfo) _creationInfo;
Seiscomp::Core::Time _start;
OPT(Seiscomp::Core::Time) _end;
bool _dynamic;
// Aggregations
std::vector<CommentPtr> _comments;
std::vector<EventPtr> _events;
DECLARE_SC_CLASSFACTORY_FRIEND(Catalog);
};
}
}
#endif

48
include/seiscomp/datamodel/comment.h
View File

@ -42,6 +42,7 @@ class Magnitude;
class StationMagnitude;
class Pick;
class Event;
class Catalog;
class Origin;
class Parameter;
class ParameterSet;
@ -97,25 +98,25 @@ class SC_SYSTEM_CORE_API Comment : public Object {
Comment();
//! Copy constructor
Comment(const Comment& other);
Comment(const Comment &other);
//! Destructor
~Comment() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
Comment& operator=(const Comment& other);
Comment &operator=(const Comment &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Comment& other) const;
bool operator!=(const Comment& other) const;
bool operator==(const Comment &other) const;
bool operator!=(const Comment &other) const;
//! Wrapper that calls operator==
bool equal(const Comment& other) const;
bool equal(const Comment &other) const;
// ------------------------------------------------------------------
@ -149,12 +150,12 @@ class SC_SYSTEM_CORE_API Comment : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const CommentIndex& index() const;
const CommentIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const Comment* lhs) const;
bool equalIndex(const Comment *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -164,20 +165,21 @@ class SC_SYSTEM_CORE_API Comment : public Object {
* Because different parent types are possible, just one
* of these methods will return a valid pointer at a time.
*/
MomentTensor* momentTensor() const;
FocalMechanism* focalMechanism() const;
Amplitude* amplitude() const;
Magnitude* magnitude() const;
StationMagnitude* stationMagnitude() const;
Pick* pick() const;
Event* event() const;
Origin* origin() const;
Parameter* parameter() const;
ParameterSet* parameterSet() const;
Stream* stream() const;
SensorLocation* sensorLocation() const;
Station* station() const;
Network* network() const;
MomentTensor *momentTensor() const;
FocalMechanism *focalMechanism() const;
Amplitude *amplitude() const;
Magnitude *magnitude() const;
StationMagnitude *stationMagnitude() const;
Pick *pick() const;
Event *event() const;
Catalog *catalog() const;
Origin *origin() const;
Parameter *parameter() const;
ParameterSet *parameterSet() const;
Stream *stream() const;
SensorLocation *sensorLocation() const;
Station *station() const;
Network *network() const;
//! Implement Object interface
bool assign(Object *other) override;

16
include/seiscomp/datamodel/complexarray.h
View File

@ -49,25 +49,25 @@ class SC_SYSTEM_CORE_API ComplexArray : public Core::BaseObject {
ComplexArray();
//! Copy constructor
ComplexArray(const ComplexArray& other);
ComplexArray(const ComplexArray &other);
//! Destructor
~ComplexArray() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
ComplexArray& operator=(const ComplexArray& other);
ComplexArray &operator=(const ComplexArray &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const ComplexArray& other) const;
bool operator!=(const ComplexArray& other) const;
bool operator==(const ComplexArray &other) const;
bool operator!=(const ComplexArray &other) const;
//! Wrapper that calls operator==
bool equal(const ComplexArray& other) const;
bool equal(const ComplexArray &other) const;
// ------------------------------------------------------------------
@ -75,8 +75,8 @@ class SC_SYSTEM_CORE_API ComplexArray : public Core::BaseObject {
// ------------------------------------------------------------------
public:
void setContent(const std::vector< std::complex<double> >&);
const std::vector< std::complex<double> >& content() const;
std::vector< std::complex<double> >& content();
const std::vector< std::complex<double> > &content() const;
std::vector< std::complex<double> > &content();
// ------------------------------------------------------------------

16
include/seiscomp/datamodel/compositetime.h
View File

@ -83,25 +83,25 @@ class SC_SYSTEM_CORE_API CompositeTime : public Object {
CompositeTime();
//! Copy constructor
CompositeTime(const CompositeTime& other);
CompositeTime(const CompositeTime &other);
//! Destructor
~CompositeTime() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
CompositeTime& operator=(const CompositeTime& other);
CompositeTime &operator=(const CompositeTime &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const CompositeTime& other) const;
bool operator!=(const CompositeTime& other) const;
bool operator==(const CompositeTime &other) const;
bool operator!=(const CompositeTime &other) const;
//! Wrapper that calls operator==
bool equal(const CompositeTime& other) const;
bool equal(const CompositeTime &other) const;
// ------------------------------------------------------------------
@ -139,12 +139,12 @@ class SC_SYSTEM_CORE_API CompositeTime : public Object {
RealQuantity& second();
const RealQuantity& second() const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Origin* origin() const;
Origin *origin() const;
//! Implement Object interface
bool assign(Object *other) override;

12
include/seiscomp/datamodel/confidenceellipsoid.h
View File

@ -101,25 +101,25 @@ class SC_SYSTEM_CORE_API ConfidenceEllipsoid : public Core::BaseObject {
ConfidenceEllipsoid();
//! Copy constructor
ConfidenceEllipsoid(const ConfidenceEllipsoid& other);
ConfidenceEllipsoid(const ConfidenceEllipsoid &other);
//! Destructor
~ConfidenceEllipsoid() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
ConfidenceEllipsoid& operator=(const ConfidenceEllipsoid& other);
ConfidenceEllipsoid &operator=(const ConfidenceEllipsoid &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const ConfidenceEllipsoid& other) const;
bool operator!=(const ConfidenceEllipsoid& other) const;
bool operator==(const ConfidenceEllipsoid &other) const;
bool operator!=(const ConfidenceEllipsoid &other) const;
//! Wrapper that calls operator==
bool equal(const ConfidenceEllipsoid& other) const;
bool equal(const ConfidenceEllipsoid &other) const;
// ------------------------------------------------------------------

30
include/seiscomp/datamodel/config.h
View File

@ -50,11 +50,11 @@ class SC_SYSTEM_CORE_API Config : public PublicObject {
Config();
//! Copy constructor
Config(const Config& other);
Config(const Config &other);
//! Destructor
~Config() override;
// ------------------------------------------------------------------
// Operators
@ -62,16 +62,16 @@ class SC_SYSTEM_CORE_API Config : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
Config& operator=(const Config& other);
Config &operator=(const Config &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Config& other) const;
bool operator!=(const Config& other) const;
bool operator==(const Config &other) const;
bool operator!=(const Config &other) const;
//! Wrapper that calls operator==
bool equal(const Config& other) const;
bool equal(const Config &other) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -84,8 +84,8 @@ class SC_SYSTEM_CORE_API Config : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(ParameterSet* obj);
bool add(ConfigModule* obj);
bool add(ParameterSet *obj);
bool add(ConfigModule *obj);
/**
* Removes an object.
@ -94,8 +94,8 @@ class SC_SYSTEM_CORE_API Config : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(ParameterSet* obj);
bool remove(ConfigModule* obj);
bool remove(ParameterSet *obj);
bool remove(ConfigModule *obj);
/**
* Removes an object of a particular class.
@ -112,12 +112,12 @@ class SC_SYSTEM_CORE_API Config : public PublicObject {
//! Index access
//! @return The object at index i
ParameterSet* parameterSet(size_t i) const;
ConfigModule* configModule(size_t i) const;
ParameterSet *parameterSet(size_t i) const;
ConfigModule *configModule(size_t i) const;
//! Find an object by its unique attribute(s)
ParameterSet* findParameterSet(const std::string& publicID) const;
ConfigModule* findConfigModule(const std::string& publicID) const;
ParameterSet *findParameterSet(const std::string& publicID) const;
ConfigModule *findConfigModule(const std::string& publicID) const;
//! Implement Object interface
bool assign(Object *other) override;

34
include/seiscomp/datamodel/configmodule.h
View File

@ -54,28 +54,28 @@ class SC_SYSTEM_CORE_API ConfigModule : public PublicObject {
public:
//! Copy constructor
ConfigModule(const ConfigModule& other);
ConfigModule(const ConfigModule &other);
//! Constructor with publicID
ConfigModule(const std::string& publicID);
//! Destructor
~ConfigModule() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static ConfigModule* Create();
static ConfigModule* Create(const std::string& publicID);
static ConfigModule *Create();
static ConfigModule *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static ConfigModule* Find(const std::string& publicID);
static ConfigModule *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -84,14 +84,14 @@ class SC_SYSTEM_CORE_API ConfigModule : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
ConfigModule& operator=(const ConfigModule& other);
ConfigModule &operator=(const ConfigModule &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const ConfigModule& other) const;
bool operator!=(const ConfigModule& other) const;
bool operator==(const ConfigModule &other) const;
bool operator!=(const ConfigModule &other) const;
//! Wrapper that calls operator==
bool equal(const ConfigModule& other) const;
bool equal(const ConfigModule &other) const;
// ------------------------------------------------------------------
@ -107,7 +107,7 @@ class SC_SYSTEM_CORE_API ConfigModule : public PublicObject {
void setEnabled(bool enabled);
bool enabled() const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -120,7 +120,7 @@ class SC_SYSTEM_CORE_API ConfigModule : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(ConfigStation* obj);
bool add(ConfigStation *obj);
/**
* Removes an object.
@ -129,7 +129,7 @@ class SC_SYSTEM_CORE_API ConfigModule : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(ConfigStation* obj);
bool remove(ConfigStation *obj);
/**
* Removes an object of a particular class.
@ -138,20 +138,20 @@ class SC_SYSTEM_CORE_API ConfigModule : public PublicObject {
* @return false The index is out of bounds
*/
bool removeConfigStation(size_t i);
bool removeConfigStation(const ConfigStationIndex& i);
bool removeConfigStation(const ConfigStationIndex &i);
//! Retrieve the number of objects of a particular class
size_t configStationCount() const;
//! Index access
//! @return The object at index i
ConfigStation* configStation(size_t i) const;
ConfigStation* configStation(const ConfigStationIndex& i) const;
ConfigStation *configStation(size_t i) const;
ConfigStation *configStation(const ConfigStationIndex &i) const;
//! Find an object by its unique attribute(s)
ConfigStation* findConfigStation(const std::string& publicID) const;
ConfigStation *findConfigStation(const std::string& publicID) const;
Config* config() const;
Config *config() const;
//! Implement Object interface
bool assign(Object *other) override;

36
include/seiscomp/datamodel/configstation.h
View File

@ -86,28 +86,28 @@ class SC_SYSTEM_CORE_API ConfigStation : public PublicObject {
public:
//! Copy constructor
ConfigStation(const ConfigStation& other);
ConfigStation(const ConfigStation &other);
//! Constructor with publicID
ConfigStation(const std::string& publicID);
//! Destructor
~ConfigStation() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static ConfigStation* Create();
static ConfigStation* Create(const std::string& publicID);
static ConfigStation *Create();
static ConfigStation *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static ConfigStation* Find(const std::string& publicID);
static ConfigStation *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -116,14 +116,14 @@ class SC_SYSTEM_CORE_API ConfigStation : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
ConfigStation& operator=(const ConfigStation& other);
ConfigStation &operator=(const ConfigStation &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const ConfigStation& other) const;
bool operator!=(const ConfigStation& other) const;
bool operator==(const ConfigStation &other) const;
bool operator!=(const ConfigStation &other) const;
//! Wrapper that calls operator==
bool equal(const ConfigStation& other) const;
bool equal(const ConfigStation &other) const;
// ------------------------------------------------------------------
@ -150,12 +150,12 @@ class SC_SYSTEM_CORE_API ConfigStation : public PublicObject {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const ConfigStationIndex& index() const;
const ConfigStationIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const ConfigStation* lhs) const;
bool equalIndex(const ConfigStation *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -168,7 +168,7 @@ class SC_SYSTEM_CORE_API ConfigStation : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(Setup* obj);
bool add(Setup *obj);
/**
* Removes an object.
@ -177,7 +177,7 @@ class SC_SYSTEM_CORE_API ConfigStation : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(Setup* obj);
bool remove(Setup *obj);
/**
* Removes an object of a particular class.
@ -186,19 +186,19 @@ class SC_SYSTEM_CORE_API ConfigStation : public PublicObject {
* @return false The index is out of bounds
*/
bool removeSetup(size_t i);
bool removeSetup(const SetupIndex& i);
bool removeSetup(const SetupIndex &i);
//! Retrieve the number of objects of a particular class
size_t setupCount() const;
//! Index access
//! @return The object at index i
Setup* setup(size_t i) const;
Setup* setup(const SetupIndex& i) const;
Setup *setup(size_t i) const;
Setup *setup(const SetupIndex &i) const;
//! Find an object by its unique attribute(s)
ConfigModule* configModule() const;
ConfigModule *configModule() const;
//! Implement Object interface
bool assign(Object *other) override;

12
include/seiscomp/datamodel/creationinfo.h
View File

@ -53,25 +53,25 @@ class SC_SYSTEM_CORE_API CreationInfo : public Core::BaseObject {
CreationInfo();
//! Copy constructor
CreationInfo(const CreationInfo& other);
CreationInfo(const CreationInfo &other);
//! Destructor
~CreationInfo() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
CreationInfo& operator=(const CreationInfo& other);
CreationInfo &operator=(const CreationInfo &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const CreationInfo& other) const;
bool operator!=(const CreationInfo& other) const;
bool operator==(const CreationInfo &other) const;
bool operator!=(const CreationInfo &other) const;
//! Wrapper that calls operator==
bool equal(const CreationInfo& other) const;
bool equal(const CreationInfo &other) const;
// ------------------------------------------------------------------

20
include/seiscomp/datamodel/dataattributeextent.h
View File

@ -81,25 +81,25 @@ class SC_SYSTEM_CORE_API DataAttributeExtent : public Object {
DataAttributeExtent();
//! Copy constructor
DataAttributeExtent(const DataAttributeExtent& other);
DataAttributeExtent(const DataAttributeExtent &other);
//! Destructor
~DataAttributeExtent() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
DataAttributeExtent& operator=(const DataAttributeExtent& other);
DataAttributeExtent &operator=(const DataAttributeExtent &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const DataAttributeExtent& other) const;
bool operator!=(const DataAttributeExtent& other) const;
bool operator==(const DataAttributeExtent &other) const;
bool operator!=(const DataAttributeExtent &other) const;
//! Wrapper that calls operator==
bool equal(const DataAttributeExtent& other) const;
bool equal(const DataAttributeExtent &other) const;
// ------------------------------------------------------------------
@ -138,17 +138,17 @@ class SC_SYSTEM_CORE_API DataAttributeExtent : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const DataAttributeExtentIndex& index() const;
const DataAttributeExtentIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const DataAttributeExtent* lhs) const;
bool equalIndex(const DataAttributeExtent *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
DataExtent* dataExtent() const;
DataExtent *dataExtent() const;
//! Implement Object interface
bool assign(Object *other) override;

26
include/seiscomp/datamodel/dataavailability.h
View File

@ -54,11 +54,11 @@ class SC_SYSTEM_CORE_API DataAvailability : public PublicObject {
DataAvailability();
//! Copy constructor
DataAvailability(const DataAvailability& other);
DataAvailability(const DataAvailability &other);
//! Destructor
~DataAvailability() override;
// ------------------------------------------------------------------
// Operators
@ -66,16 +66,16 @@ class SC_SYSTEM_CORE_API DataAvailability : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
DataAvailability& operator=(const DataAvailability& other);
DataAvailability &operator=(const DataAvailability &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const DataAvailability& other) const;
bool operator!=(const DataAvailability& other) const;
bool operator==(const DataAvailability &other) const;
bool operator!=(const DataAvailability &other) const;
//! Wrapper that calls operator==
bool equal(const DataAvailability& other) const;
bool equal(const DataAvailability &other) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -88,7 +88,7 @@ class SC_SYSTEM_CORE_API DataAvailability : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(DataExtent* obj);
bool add(DataExtent *obj);
/**
* Removes an object.
@ -97,7 +97,7 @@ class SC_SYSTEM_CORE_API DataAvailability : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(DataExtent* obj);
bool remove(DataExtent *obj);
/**
* Removes an object of a particular class.
@ -106,18 +106,18 @@ class SC_SYSTEM_CORE_API DataAvailability : public PublicObject {
* @return false The index is out of bounds
*/
bool removeDataExtent(size_t i);
bool removeDataExtent(const DataExtentIndex& i);
bool removeDataExtent(const DataExtentIndex &i);
//! Retrieve the number of objects of a particular class
size_t dataExtentCount() const;
//! Index access
//! @return The object at index i
DataExtent* dataExtent(size_t i) const;
DataExtent* dataExtent(const DataExtentIndex& i) const;
DataExtent *dataExtent(size_t i) const;
DataExtent *dataExtent(const DataExtentIndex &i) const;
//! Find an object by its unique attribute(s)
DataExtent* findDataExtent(const std::string& publicID) const;
DataExtent *findDataExtent(const std::string& publicID) const;
//! Implement Object interface
bool assign(Object *other) override;

144
include/seiscomp/datamodel/databasearchive.h
View File

@ -241,10 +241,10 @@ class SC_SYSTEM_CORE_API DatabaseArchive : protected Core::Archive,
//! Implements derived method
//! @param dataSource user:password@host:port/database
bool open(const char* dataSource);
bool open(const char* dataSource) override;
//! Implements derived method
void close();
void close() override;
//! Returns the used database driver
Seiscomp::IO::DatabaseInterface* driver() const;
@ -261,6 +261,22 @@ class SC_SYSTEM_CORE_API DatabaseArchive : protected Core::Archive,
void benchmarkQueries(int count);
/**
* @brief Returns the query to fetch objects of a particular type.
* @param parentID The publicID of the parent object. When empty then
* it won't be included in the query.
* @param classType The type of the object to be read.
* @param ignorePublicObject If true then the PublicObject table will
* not be joined. That might be important if
* during a schema evolution an objectsturned
* into a PublicObject but an old version
* should be read.
* @return The query and a flag if a where clause is present.
*/
std::pair<std::string,bool> getObjectsQuery(const std::string &parentID,
const Seiscomp::Core::RTTI &classType,
bool ignorePublicObject = false);
/**
* Reads a public object from the database.
* @param classType The type of the object to be read. The type has
@ -269,8 +285,8 @@ class SC_SYSTEM_CORE_API DatabaseArchive : protected Core::Archive,
* @return An unmanaged object pointer. The ownership goes over
* to the caller.
*/
PublicObject* getObject(const Seiscomp::Core::RTTI& classType,
const std::string& publicID);
PublicObject* getObject(const Seiscomp::Core::RTTI &classType,
const std::string &publicID);
/**
* Returns an iterator over all objects of a given type.
@ -285,8 +301,8 @@ class SC_SYSTEM_CORE_API DatabaseArchive : protected Core::Archive,
* should be read.
* @return The database iterator
*/
DatabaseIterator getObjects(const std::string& parentID,
const Seiscomp::Core::RTTI& classType,
DatabaseIterator getObjects(const std::string &parentID,
const Seiscomp::Core::RTTI &classType,
bool ignorePublicObject = false);
/**
@ -302,8 +318,8 @@ class SC_SYSTEM_CORE_API DatabaseArchive : protected Core::Archive,
* should be read.
* @return The database iterator
*/
DatabaseIterator getObjects(const PublicObject* parent,
const Seiscomp::Core::RTTI& classType,
DatabaseIterator getObjects(const PublicObject *parent,
const Seiscomp::Core::RTTI &classType,
bool ignorePublicObject = false);
/**
@ -314,8 +330,8 @@ class SC_SYSTEM_CORE_API DatabaseArchive : protected Core::Archive,
* @param classType The type of the objects to iterate over.
* @return The object count
*/
size_t getObjectCount(const std::string& parentID,
const Seiscomp::Core::RTTI& classType);
size_t getObjectCount(const std::string &parentID,
const Seiscomp::Core::RTTI &classType);
/**
* Returns the number of objects of a given type for a parent
@ -325,7 +341,7 @@ class SC_SYSTEM_CORE_API DatabaseArchive : protected Core::Archive,
* @param classType The type of the objects to iterate over.
* @return The object count
*/
size_t getObjectCount(const PublicObject* parent,
size_t getObjectCount(const PublicObject *parent,
const Seiscomp::Core::RTTI &classType);
@ -338,7 +354,7 @@ class SC_SYSTEM_CORE_API DatabaseArchive : protected Core::Archive,
* @param object The PublicObject whose parent is queried.
* @return The publicID of the parent or an empty string.
*/
std::string parentPublicID(const PublicObject* object);
std::string parentPublicID(const PublicObject *object);
/**
* Inserts an object into the database.
@ -390,7 +406,7 @@ class SC_SYSTEM_CORE_API DatabaseArchive : protected Core::Archive,
// ----------------------------------------------------------------------
protected:
//! Implements derived method
bool create(const char* dataSource);
bool create(const char* dataSource) override;
// ----------------------------------------------------------------------
@ -398,40 +414,40 @@ class SC_SYSTEM_CORE_API DatabaseArchive : protected Core::Archive,
// ----------------------------------------------------------------------
protected:
//! Reads an integer
virtual void read(std::int8_t& value);
virtual void read(std::int16_t& value);
virtual void read(std::int32_t& value);
virtual void read(std::int64_t& value);
virtual void read(std::int8_t& value) override;
virtual void read(std::int16_t& value) override;
virtual void read(std::int32_t& value) override;
virtual void read(std::int64_t& value) override;
//! Reads a float
virtual void read(float& value);
virtual void read(float& value) override;
//! Reads a double
virtual void read(double& value);
virtual void read(double& value) override;
//! Reads a float complex
virtual void read(std::complex<float>& value);
virtual void read(std::complex<float>& value) override;
//! Reads a double complex
virtual void read(std::complex<double>& value);
virtual void read(std::complex<double>& value) override;
//! Reads a boolean
virtual void read(bool& value);
virtual void read(bool& value) override;
//! Reads a vector of native types
virtual void read(std::vector<char>& value);
virtual void read(std::vector<int8_t>& value);
virtual void read(std::vector<int16_t>& value);
virtual void read(std::vector<int32_t>& value);
virtual void read(std::vector<int64_t>& value);
virtual void read(std::vector<float>& value);
virtual void read(std::vector<double>& value);
virtual void read(std::vector<std::string>& value);
virtual void read(std::vector<Core::Time>& value);
virtual void read(std::vector<char>& value) override;
virtual void read(std::vector<int8_t>& value) override;
virtual void read(std::vector<int16_t>& value) override;
virtual void read(std::vector<int32_t>& value) override;
virtual void read(std::vector<int64_t>& value) override;
virtual void read(std::vector<float>& value) override;
virtual void read(std::vector<double>& value) override;
virtual void read(std::vector<std::string>& value) override;
virtual void read(std::vector<Core::Time>& value) override;
//! Reads a vector of complex doubles
virtual void read(std::vector<std::complex<double> >& value);
virtual void read(std::vector<std::complex<double> >& value) override;
//! Reads a string
virtual void read(std::string& value);
virtual void read(std::string& value) override;
//! Reads a time
virtual void read(Seiscomp::Core::Time& value);
virtual void read(Seiscomp::Core::Time& value) override;
// ------------------------------------------------------------------
@ -439,47 +455,47 @@ class SC_SYSTEM_CORE_API DatabaseArchive : protected Core::Archive,
// ------------------------------------------------------------------
protected:
//! Writes an integer
virtual void write(std::int8_t value);
virtual void write(std::int16_t value);
virtual void write(std::int32_t value);
virtual void write(std::int64_t value);
virtual void write(std::int8_t value) override;
virtual void write(std::int16_t value) override;
virtual void write(std::int32_t value) override;
virtual void write(std::int64_t value) override;
//! Writes a float
virtual void write(float value);
virtual void write(float value) override;
//! Writes a double
virtual void write(double value);
virtual void write(double value) override;
//! Writes a float complex
virtual void write(std::complex<float>& value);
virtual void write(std::complex<float>& value) override;
//! Writes a double complex
virtual void write(std::complex<double>& value);
virtual void write(std::complex<double>& value) override;
//! Writes a boolean
virtual void write(bool value);
virtual void write(bool value) override;
//! Writes a vector of native types
virtual void write(std::vector<char>& value);
virtual void write(std::vector<int8_t>& value);
virtual void write(std::vector<int16_t>& value);
virtual void write(std::vector<int32_t>& value);
virtual void write(std::vector<int64_t>& value);
virtual void write(std::vector<float>& value);
virtual void write(std::vector<double>& value);
virtual void write(std::vector<std::string>& value);
virtual void write(std::vector<Core::Time>& value);
virtual void write(std::vector<char>& value) override;
virtual void write(std::vector<int8_t>& value) override;
virtual void write(std::vector<int16_t>& value) override;
virtual void write(std::vector<int32_t>& value) override;
virtual void write(std::vector<int64_t>& value) override;
virtual void write(std::vector<float>& value) override;
virtual void write(std::vector<double>& value) override;
virtual void write(std::vector<std::string>& value) override;
virtual void write(std::vector<Core::Time>& value) override;
//! Writes a vector of complex doubles
virtual void write(std::vector<std::complex<double> >& value);
virtual void write(std::vector<std::complex<double> >& value) override;
//! Writes a string
virtual void write(std::string& value);
virtual void write(std::string& value) override;
//! Writes a time
virtual void write(Seiscomp::Core::Time& value);
virtual void write(Seiscomp::Core::Time& value) override;
// ------------------------------------------------------------------
// Protected observer interface
// ------------------------------------------------------------------
protected:
virtual void onObjectDestroyed(Object* object);
virtual void onObjectDestroyed(Object* object) override;
// ------------------------------------------------------------------
@ -487,23 +503,23 @@ class SC_SYSTEM_CORE_API DatabaseArchive : protected Core::Archive,
// ------------------------------------------------------------------
protected:
//! Implements derived method
virtual bool locateObjectByName(const char* name, const char* targetClass, bool nullable);
virtual bool locateObjectByName(const char* name, const char* targetClass, bool nullable) override;
//! Implements derived method
virtual bool locateNextObjectByName(const char* name, const char* targetClass);
virtual bool locateNextObjectByName(const char* name, const char* targetClass) override;
//! Implements derived method
virtual void locateNullObjectByName(const char* name, const char* targetClass, bool first);
virtual void locateNullObjectByName(const char* name, const char* targetClass, bool first) override;
//! Implements derived method
virtual std::string determineClassName();
virtual std::string determineClassName() override;
//! Implements derived method
virtual void setClassName(const char*);
virtual void setClassName(const char*) override;
//! Implements derived method
void serialize(RootType* object);
void serialize(RootType* object) override;
//! Implements derived method
void serialize(SerializeDispatcher&);
void serialize(SerializeDispatcher&) override;
std::string buildQuery(const std::string& table,
const std::string& filter = "");
@ -546,7 +562,7 @@ class SC_SYSTEM_CORE_API DatabaseArchive : protected Core::Archive,
//! Removes an objects from the id cache
void removeId(Object*);
//! Returns the current field content
const char* cfield() const { return _field; }

15
include/seiscomp/datamodel/databasequery.h
View File

@ -74,10 +74,6 @@ class SC_SYSTEM_CORE_API DatabaseQuery : public DatabaseReader {
// Query interface
// ----------------------------------------------------------------------
public:
Station* getStation(const std::string& network_code,
const std::string& station_code,
Seiscomp::Core::Time time);
/**
* Returns the Event referencing a particular Origin.
* @param originID The publicID of the Origin
@ -324,6 +320,17 @@ class SC_SYSTEM_CORE_API DatabaseQuery : public DatabaseReader {
DatabaseIterator getEvents(Seiscomp::Core::Time startTime,
Seiscomp::Core::Time endTime);
/**
* Returns events in a given time range
* @param catalogID the publicID of the parent catalog
* @param startTime start time
* @param endTime end time
* @return An iterator to iterate over the events
*/
DatabaseIterator getEvents(const std::string& catalogID,
Seiscomp::Core::Time startTime,
Seiscomp::Core::Time endTime);
/**
* Returns origins for a given event ordered by creation date
* the oldest first.

38
include/seiscomp/datamodel/databasereader.h
View File

@ -48,6 +48,7 @@ class DataUsed;
class MomentTensorPhaseSetting;
class MomentTensorStationContribution;
class MomentTensorComponentContribution;
class Catalog;
class Event;
class EventDescription;
class OriginReference;
@ -132,16 +133,17 @@ class SC_SYSTEM_CORE_API DatabaseReader : public DatabaseArchive {
* over to the caller. If no object has been found, NULL
* is returned.
*/
PublicObject* loadObject(const Seiscomp::Core::RTTI& classType,
PublicObject *loadObject(const Seiscomp::Core::RTTI& classType,
const std::string& publicID);
EventParameters* loadEventParameters();
EventParameters *loadEventParameters();
int load(EventParameters*);
int loadPicks(EventParameters*);
int loadAmplitudes(EventParameters*);
int loadReadings(EventParameters*);
int loadOrigins(EventParameters*);
int loadFocalMechanisms(EventParameters*);
int loadCatalogs(EventParameters*);
int loadEvents(EventParameters*);
int load(Pick*);
int loadComments(Pick*);
@ -171,13 +173,16 @@ class SC_SYSTEM_CORE_API DatabaseReader : public DatabaseArchive {
int loadMomentTensorStationContributions(MomentTensor*);
int load(MomentTensorStationContribution*);
int loadMomentTensorComponentContributions(MomentTensorStationContribution*);
int load(Catalog*);
int loadComments(Catalog*);
int loadEvents(Catalog*);
int load(Event*);
int loadEventDescriptions(Event*);
int loadComments(Event*);
int loadOriginReferences(Event*);
int loadFocalMechanismReferences(Event*);
Config* loadConfig();
Config *loadConfig();
int load(Config*);
int loadParameterSets(Config*);
int loadConfigModules(Config*);
@ -190,14 +195,14 @@ class SC_SYSTEM_CORE_API DatabaseReader : public DatabaseArchive {
int loadConfigStations(ConfigModule*);
int load(ConfigStation*);
int loadSetups(ConfigStation*);
QualityControl* loadQualityControl();
QualityControl *loadQualityControl();
int load(QualityControl*);
int loadQCLogs(QualityControl*);
int loadWaveformQualitys(QualityControl*);
int loadOutages(QualityControl*);
Inventory* loadInventory();
Inventory *loadInventory();
int load(Inventory*);
int loadStationGroups(Inventory*);
int loadAuxDevices(Inventory*);
@ -230,34 +235,33 @@ class SC_SYSTEM_CORE_API DatabaseReader : public DatabaseArchive {
int loadStreams(SensorLocation*);
int load(Stream*);
int loadComments(Stream*);
Routing* loadRouting();
Routing *loadRouting();
int load(Routing*);
int loadRoutes(Routing*);
int loadAccesss(Routing*);
int load(Route*);
int loadRouteArclinks(Route*);
int loadRouteSeedlinks(Route*);
Journaling* loadJournaling();
Journaling *loadJournaling();
int load(Journaling*);
int loadJournalEntrys(Journaling*);
ArclinkLog* loadArclinkLog();
ArclinkLog *loadArclinkLog();
int load(ArclinkLog*);
int loadArclinkRequests(ArclinkLog*);
int loadArclinkUsers(ArclinkLog*);
int load(ArclinkRequest*);
int loadArclinkStatusLines(ArclinkRequest*);
int loadArclinkRequestLines(ArclinkRequest*);
DataAvailability* loadDataAvailability();
DataAvailability *loadDataAvailability();
int load(DataAvailability*);
int loadDataExtents(DataAvailability*);
int load(DataExtent*);
int loadDataSegments(DataExtent*);
int loadDataAttributeExtents(DataExtent*);
};
// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

46
include/seiscomp/datamodel/dataextent.h
View File

@ -86,28 +86,28 @@ class SC_SYSTEM_CORE_API DataExtent : public PublicObject {
public:
//! Copy constructor
DataExtent(const DataExtent& other);
DataExtent(const DataExtent &other);
//! Constructor with publicID
DataExtent(const std::string& publicID);
//! Destructor
~DataExtent() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static DataExtent* Create();
static DataExtent* Create(const std::string& publicID);
static DataExtent *Create();
static DataExtent *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static DataExtent* Find(const std::string& publicID);
static DataExtent *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -116,14 +116,14 @@ class SC_SYSTEM_CORE_API DataExtent : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
DataExtent& operator=(const DataExtent& other);
DataExtent &operator=(const DataExtent &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const DataExtent& other) const;
bool operator!=(const DataExtent& other) const;
bool operator==(const DataExtent &other) const;
bool operator!=(const DataExtent &other) const;
//! Wrapper that calls operator==
bool equal(const DataExtent& other) const;
bool equal(const DataExtent &other) const;
// ------------------------------------------------------------------
@ -160,12 +160,12 @@ class SC_SYSTEM_CORE_API DataExtent : public PublicObject {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const DataExtentIndex& index() const;
const DataExtentIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const DataExtent* lhs) const;
bool equalIndex(const DataExtent *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -178,8 +178,8 @@ class SC_SYSTEM_CORE_API DataExtent : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(DataSegment* obj);
bool add(DataAttributeExtent* obj);
bool add(DataSegment *obj);
bool add(DataAttributeExtent *obj);
/**
* Removes an object.
@ -188,8 +188,8 @@ class SC_SYSTEM_CORE_API DataExtent : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(DataSegment* obj);
bool remove(DataAttributeExtent* obj);
bool remove(DataSegment *obj);
bool remove(DataAttributeExtent *obj);
/**
* Removes an object of a particular class.
@ -198,9 +198,9 @@ class SC_SYSTEM_CORE_API DataExtent : public PublicObject {
* @return false The index is out of bounds
*/
bool removeDataSegment(size_t i);
bool removeDataSegment(const DataSegmentIndex& i);
bool removeDataSegment(const DataSegmentIndex &i);
bool removeDataAttributeExtent(size_t i);
bool removeDataAttributeExtent(const DataAttributeExtentIndex& i);
bool removeDataAttributeExtent(const DataAttributeExtentIndex &i);
//! Retrieve the number of objects of a particular class
size_t dataSegmentCount() const;
@ -208,15 +208,15 @@ class SC_SYSTEM_CORE_API DataExtent : public PublicObject {
//! Index access
//! @return The object at index i
DataSegment* dataSegment(size_t i) const;
DataSegment* dataSegment(const DataSegmentIndex& i) const;
DataSegment *dataSegment(size_t i) const;
DataSegment *dataSegment(const DataSegmentIndex &i) const;
DataAttributeExtent* dataAttributeExtent(size_t i) const;
DataAttributeExtent* dataAttributeExtent(const DataAttributeExtentIndex& i) const;
DataAttributeExtent *dataAttributeExtent(size_t i) const;
DataAttributeExtent *dataAttributeExtent(const DataAttributeExtentIndex &i) const;
//! Find an object by its unique attribute(s)
DataAvailability* dataAvailability() const;
DataAvailability *dataAvailability() const;
//! Implement Object interface
bool assign(Object *other) override;

46
include/seiscomp/datamodel/datalogger.h
View File

@ -89,28 +89,28 @@ class SC_SYSTEM_CORE_API Datalogger : public PublicObject {
public:
//! Copy constructor
Datalogger(const Datalogger& other);
Datalogger(const Datalogger &other);
//! Constructor with publicID
Datalogger(const std::string& publicID);
//! Destructor
~Datalogger() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static Datalogger* Create();
static Datalogger* Create(const std::string& publicID);
static Datalogger *Create();
static Datalogger *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static Datalogger* Find(const std::string& publicID);
static Datalogger *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -119,14 +119,14 @@ class SC_SYSTEM_CORE_API Datalogger : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
Datalogger& operator=(const Datalogger& other);
Datalogger &operator=(const Datalogger &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Datalogger& other) const;
bool operator!=(const Datalogger& other) const;
bool operator==(const Datalogger &other) const;
bool operator!=(const Datalogger &other) const;
//! Wrapper that calls operator==
bool equal(const Datalogger& other) const;
bool equal(const Datalogger &other) const;
// ------------------------------------------------------------------
@ -188,12 +188,12 @@ class SC_SYSTEM_CORE_API Datalogger : public PublicObject {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const DataloggerIndex& index() const;
const DataloggerIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const Datalogger* lhs) const;
bool equalIndex(const Datalogger *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -206,8 +206,8 @@ class SC_SYSTEM_CORE_API Datalogger : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(DataloggerCalibration* obj);
bool add(Decimation* obj);
bool add(DataloggerCalibration *obj);
bool add(Decimation *obj);
/**
* Removes an object.
@ -216,8 +216,8 @@ class SC_SYSTEM_CORE_API Datalogger : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(DataloggerCalibration* obj);
bool remove(Decimation* obj);
bool remove(DataloggerCalibration *obj);
bool remove(Decimation *obj);
/**
* Removes an object of a particular class.
@ -226,9 +226,9 @@ class SC_SYSTEM_CORE_API Datalogger : public PublicObject {
* @return false The index is out of bounds
*/
bool removeDataloggerCalibration(size_t i);
bool removeDataloggerCalibration(const DataloggerCalibrationIndex& i);
bool removeDataloggerCalibration(const DataloggerCalibrationIndex &i);
bool removeDecimation(size_t i);
bool removeDecimation(const DecimationIndex& i);
bool removeDecimation(const DecimationIndex &i);
//! Retrieve the number of objects of a particular class
size_t dataloggerCalibrationCount() const;
@ -236,15 +236,15 @@ class SC_SYSTEM_CORE_API Datalogger : public PublicObject {
//! Index access
//! @return The object at index i
DataloggerCalibration* dataloggerCalibration(size_t i) const;
DataloggerCalibration* dataloggerCalibration(const DataloggerCalibrationIndex& i) const;
DataloggerCalibration *dataloggerCalibration(size_t i) const;
DataloggerCalibration *dataloggerCalibration(const DataloggerCalibrationIndex &i) const;
Decimation* decimation(size_t i) const;
Decimation* decimation(const DecimationIndex& i) const;
Decimation *decimation(size_t i) const;
Decimation *decimation(const DecimationIndex &i) const;
//! Find an object by its unique attribute(s)
Inventory* inventory() const;
Inventory *inventory() const;
//! Implement Object interface
bool assign(Object *other) override;

20
include/seiscomp/datamodel/dataloggercalibration.h
View File

@ -87,25 +87,25 @@ class SC_SYSTEM_CORE_API DataloggerCalibration : public Object {
DataloggerCalibration();
//! Copy constructor
DataloggerCalibration(const DataloggerCalibration& other);
DataloggerCalibration(const DataloggerCalibration &other);
//! Destructor
~DataloggerCalibration() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
DataloggerCalibration& operator=(const DataloggerCalibration& other);
DataloggerCalibration &operator=(const DataloggerCalibration &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const DataloggerCalibration& other) const;
bool operator!=(const DataloggerCalibration& other) const;
bool operator==(const DataloggerCalibration &other) const;
bool operator!=(const DataloggerCalibration &other) const;
//! Wrapper that calls operator==
bool equal(const DataloggerCalibration& other) const;
bool equal(const DataloggerCalibration &other) const;
// ------------------------------------------------------------------
@ -147,17 +147,17 @@ class SC_SYSTEM_CORE_API DataloggerCalibration : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const DataloggerCalibrationIndex& index() const;
const DataloggerCalibrationIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const DataloggerCalibration* lhs) const;
bool equalIndex(const DataloggerCalibration *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Datalogger* datalogger() const;
Datalogger *datalogger() const;
//! Implement Object interface
bool assign(Object *other) override;

20
include/seiscomp/datamodel/datasegment.h
View File

@ -79,25 +79,25 @@ class SC_SYSTEM_CORE_API DataSegment : public Object {
DataSegment();
//! Copy constructor
DataSegment(const DataSegment& other);
DataSegment(const DataSegment &other);
//! Destructor
~DataSegment() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
DataSegment& operator=(const DataSegment& other);
DataSegment &operator=(const DataSegment &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const DataSegment& other) const;
bool operator!=(const DataSegment& other) const;
bool operator==(const DataSegment &other) const;
bool operator!=(const DataSegment &other) const;
//! Wrapper that calls operator==
bool equal(const DataSegment& other) const;
bool equal(const DataSegment &other) const;
// ------------------------------------------------------------------
@ -135,17 +135,17 @@ class SC_SYSTEM_CORE_API DataSegment : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const DataSegmentIndex& index() const;
const DataSegmentIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const DataSegment* lhs) const;
bool equalIndex(const DataSegment *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
DataExtent* dataExtent() const;
DataExtent *dataExtent() const;
//! Implement Object interface
bool assign(Object *other) override;

16
include/seiscomp/datamodel/dataused.h
View File

@ -54,25 +54,25 @@ class SC_SYSTEM_CORE_API DataUsed : public Object {
DataUsed();
//! Copy constructor
DataUsed(const DataUsed& other);
DataUsed(const DataUsed &other);
//! Destructor
~DataUsed() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
DataUsed& operator=(const DataUsed& other);
DataUsed &operator=(const DataUsed &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const DataUsed& other) const;
bool operator!=(const DataUsed& other) const;
bool operator==(const DataUsed &other) const;
bool operator!=(const DataUsed &other) const;
//! Wrapper that calls operator==
bool equal(const DataUsed& other) const;
bool equal(const DataUsed &other) const;
// ------------------------------------------------------------------
@ -96,12 +96,12 @@ class SC_SYSTEM_CORE_API DataUsed : public Object {
void setShortestPeriod(const OPT(double)& shortestPeriod);
double shortestPeriod() const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
MomentTensor* momentTensor() const;
MomentTensor *momentTensor() const;
//! Implement Object interface
bool assign(Object *other) override;

20
include/seiscomp/datamodel/decimation.h
View File

@ -83,25 +83,25 @@ class SC_SYSTEM_CORE_API Decimation : public Object {
Decimation();
//! Copy constructor
Decimation(const Decimation& other);
Decimation(const Decimation &other);
//! Destructor
~Decimation() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
Decimation& operator=(const Decimation& other);
Decimation &operator=(const Decimation &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Decimation& other) const;
bool operator!=(const Decimation& other) const;
bool operator==(const Decimation &other) const;
bool operator!=(const Decimation &other) const;
//! Wrapper that calls operator==
bool equal(const Decimation& other) const;
bool equal(const Decimation &other) const;
// ------------------------------------------------------------------
@ -138,17 +138,17 @@ class SC_SYSTEM_CORE_API Decimation : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const DecimationIndex& index() const;
const DecimationIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const Decimation* lhs) const;
bool equalIndex(const Decimation *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Datalogger* datalogger() const;
Datalogger *datalogger() const;
//! Implement Object interface
bool assign(Object *other) override;

69
include/seiscomp/datamodel/event.h
View File

@ -45,6 +45,7 @@ DEFINE_SMARTPOINTER(Comment);
DEFINE_SMARTPOINTER(OriginReference);
DEFINE_SMARTPOINTER(FocalMechanismReference);
class Catalog;
class EventParameters;
@ -79,28 +80,28 @@ class SC_SYSTEM_CORE_API Event : public PublicObject {
public:
//! Copy constructor
Event(const Event& other);
Event(const Event &other);
//! Constructor with publicID
Event(const std::string& publicID);
//! Destructor
~Event() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static Event* Create();
static Event* Create(const std::string& publicID);
static Event *Create();
static Event *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static Event* Find(const std::string& publicID);
static Event *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -109,14 +110,14 @@ class SC_SYSTEM_CORE_API Event : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
Event& operator=(const Event& other);
Event &operator=(const Event &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Event& other) const;
bool operator!=(const Event& other) const;
bool operator==(const Event &other) const;
bool operator!=(const Event &other) const;
//! Wrapper that calls operator==
bool equal(const Event& other) const;
bool equal(const Event &other) const;
// ------------------------------------------------------------------
@ -150,7 +151,7 @@ class SC_SYSTEM_CORE_API Event : public PublicObject {
CreationInfo& creationInfo();
const CreationInfo& creationInfo() const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -163,10 +164,10 @@ class SC_SYSTEM_CORE_API Event : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(EventDescription* obj);
bool add(Comment* obj);
bool add(OriginReference* obj);
bool add(FocalMechanismReference* obj);
bool add(EventDescription *obj);
bool add(Comment *obj);
bool add(OriginReference *obj);
bool add(FocalMechanismReference *obj);
/**
* Removes an object.
@ -175,10 +176,10 @@ class SC_SYSTEM_CORE_API Event : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(EventDescription* obj);
bool remove(Comment* obj);
bool remove(OriginReference* obj);
bool remove(FocalMechanismReference* obj);
bool remove(EventDescription *obj);
bool remove(Comment *obj);
bool remove(OriginReference *obj);
bool remove(FocalMechanismReference *obj);
/**
* Removes an object of a particular class.
@ -187,13 +188,13 @@ class SC_SYSTEM_CORE_API Event : public PublicObject {
* @return false The index is out of bounds
*/
bool removeEventDescription(size_t i);
bool removeEventDescription(const EventDescriptionIndex& i);
bool removeEventDescription(const EventDescriptionIndex &i);
bool removeComment(size_t i);
bool removeComment(const CommentIndex& i);
bool removeComment(const CommentIndex &i);
bool removeOriginReference(size_t i);
bool removeOriginReference(const OriginReferenceIndex& i);
bool removeOriginReference(const OriginReferenceIndex &i);
bool removeFocalMechanismReference(size_t i);
bool removeFocalMechanismReference(const FocalMechanismReferenceIndex& i);
bool removeFocalMechanismReference(const FocalMechanismReferenceIndex &i);
//! Retrieve the number of objects of a particular class
size_t eventDescriptionCount() const;
@ -203,21 +204,27 @@ class SC_SYSTEM_CORE_API Event : public PublicObject {
//! Index access
//! @return The object at index i
EventDescription* eventDescription(size_t i) const;
EventDescription* eventDescription(const EventDescriptionIndex& i) const;
EventDescription *eventDescription(size_t i) const;
EventDescription *eventDescription(const EventDescriptionIndex &i) const;
Comment* comment(size_t i) const;
Comment* comment(const CommentIndex& i) const;
Comment *comment(size_t i) const;
Comment *comment(const CommentIndex &i) const;
OriginReference* originReference(size_t i) const;
OriginReference* originReference(const OriginReferenceIndex& i) const;
OriginReference *originReference(size_t i) const;
OriginReference *originReference(const OriginReferenceIndex &i) const;
FocalMechanismReference* focalMechanismReference(size_t i) const;
FocalMechanismReference* focalMechanismReference(const FocalMechanismReferenceIndex& i) const;
FocalMechanismReference *focalMechanismReference(size_t i) const;
FocalMechanismReference *focalMechanismReference(const FocalMechanismReferenceIndex &i) const;
//! Find an object by its unique attribute(s)
EventParameters* eventParameters() const;
/**
* The following methods return the parent object by type.
* Because different parent types are possible, just one
* of these methods will return a valid pointer at a time.
*/
Catalog *catalog() const;
EventParameters *eventParameters() const;
//! Implement Object interface
bool assign(Object *other) override;

20
include/seiscomp/datamodel/eventdescription.h
View File

@ -86,7 +86,7 @@ class SC_SYSTEM_CORE_API EventDescription : public Object {
EventDescription();
//! Copy constructor
EventDescription(const EventDescription& other);
EventDescription(const EventDescription &other);
//! Custom constructor
EventDescription(const std::string& text);
@ -95,21 +95,21 @@ class SC_SYSTEM_CORE_API EventDescription : public Object {
//! Destructor
~EventDescription() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
EventDescription& operator=(const EventDescription& other);
EventDescription &operator=(const EventDescription &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const EventDescription& other) const;
bool operator!=(const EventDescription& other) const;
bool operator==(const EventDescription &other) const;
bool operator!=(const EventDescription &other) const;
//! Wrapper that calls operator==
bool equal(const EventDescription& other) const;
bool equal(const EventDescription &other) const;
// ------------------------------------------------------------------
@ -130,17 +130,17 @@ class SC_SYSTEM_CORE_API EventDescription : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const EventDescriptionIndex& index() const;
const EventDescriptionIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const EventDescription* lhs) const;
bool equalIndex(const EventDescription *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Event* event() const;
Event *event() const;
//! Implement Object interface
bool assign(Object *other) override;

70
include/seiscomp/datamodel/eventparameters.h
View File

@ -38,6 +38,7 @@ DEFINE_SMARTPOINTER(Amplitude);
DEFINE_SMARTPOINTER(Reading);
DEFINE_SMARTPOINTER(Origin);
DEFINE_SMARTPOINTER(FocalMechanism);
DEFINE_SMARTPOINTER(Catalog);
DEFINE_SMARTPOINTER(Event);
@ -59,11 +60,11 @@ class SC_SYSTEM_CORE_API EventParameters : public PublicObject {
EventParameters();
//! Copy constructor
EventParameters(const EventParameters& other);
EventParameters(const EventParameters &other);
//! Destructor
~EventParameters() override;
// ------------------------------------------------------------------
// Operators
@ -71,16 +72,16 @@ class SC_SYSTEM_CORE_API EventParameters : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
EventParameters& operator=(const EventParameters& other);
EventParameters &operator=(const EventParameters &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const EventParameters& other) const;
bool operator!=(const EventParameters& other) const;
bool operator==(const EventParameters &other) const;
bool operator!=(const EventParameters &other) const;
//! Wrapper that calls operator==
bool equal(const EventParameters& other) const;
bool equal(const EventParameters &other) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -93,12 +94,13 @@ class SC_SYSTEM_CORE_API EventParameters : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(Pick* obj);
bool add(Amplitude* obj);
bool add(Reading* obj);
bool add(Origin* obj);
bool add(FocalMechanism* obj);
bool add(Event* obj);
bool add(Pick *obj);
bool add(Amplitude *obj);
bool add(Reading *obj);
bool add(Origin *obj);
bool add(FocalMechanism *obj);
bool add(Catalog *obj);
bool add(Event *obj);
/**
* Removes an object.
@ -107,12 +109,13 @@ class SC_SYSTEM_CORE_API EventParameters : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(Pick* obj);
bool remove(Amplitude* obj);
bool remove(Reading* obj);
bool remove(Origin* obj);
bool remove(FocalMechanism* obj);
bool remove(Event* obj);
bool remove(Pick *obj);
bool remove(Amplitude *obj);
bool remove(Reading *obj);
bool remove(Origin *obj);
bool remove(FocalMechanism *obj);
bool remove(Catalog *obj);
bool remove(Event *obj);
/**
* Removes an object of a particular class.
@ -125,6 +128,7 @@ class SC_SYSTEM_CORE_API EventParameters : public PublicObject {
bool removeReading(size_t i);
bool removeOrigin(size_t i);
bool removeFocalMechanism(size_t i);
bool removeCatalog(size_t i);
bool removeEvent(size_t i);
//! Retrieve the number of objects of a particular class
@ -133,24 +137,27 @@ class SC_SYSTEM_CORE_API EventParameters : public PublicObject {
size_t readingCount() const;
size_t originCount() const;
size_t focalMechanismCount() const;
size_t catalogCount() const;
size_t eventCount() const;
//! Index access
//! @return The object at index i
Pick* pick(size_t i) const;
Amplitude* amplitude(size_t i) const;
Reading* reading(size_t i) const;
Origin* origin(size_t i) const;
FocalMechanism* focalMechanism(size_t i) const;
Event* event(size_t i) const;
Pick *pick(size_t i) const;
Amplitude *amplitude(size_t i) const;
Reading *reading(size_t i) const;
Origin *origin(size_t i) const;
FocalMechanism *focalMechanism(size_t i) const;
Catalog *catalog(size_t i) const;
Event *event(size_t i) const;
//! Find an object by its unique attribute(s)
Pick* findPick(const std::string& publicID) const;
Amplitude* findAmplitude(const std::string& publicID) const;
Reading* findReading(const std::string& publicID) const;
Origin* findOrigin(const std::string& publicID) const;
FocalMechanism* findFocalMechanism(const std::string& publicID) const;
Event* findEvent(const std::string& publicID) const;
Pick *findPick(const std::string& publicID) const;
Amplitude *findAmplitude(const std::string& publicID) const;
Reading *findReading(const std::string& publicID) const;
Origin *findOrigin(const std::string& publicID) const;
FocalMechanism *findFocalMechanism(const std::string& publicID) const;
Catalog *findCatalog(const std::string& publicID) const;
Event *findEvent(const std::string& publicID) const;
//! Implement Object interface
bool assign(Object *other) override;
@ -177,6 +184,7 @@ class SC_SYSTEM_CORE_API EventParameters : public PublicObject {
std::vector<ReadingPtr> _readings;
std::vector<OriginPtr> _origins;
std::vector<FocalMechanismPtr> _focalMechanisms;
std::vector<CatalogPtr> _catalogs;
std::vector<EventPtr> _events;
DECLARE_SC_CLASSFACTORY_FRIEND(EventParameters);

2
include/seiscomp/datamodel/eventparameters_package.h
View File

@ -23,6 +23,7 @@
#include <seiscomp/datamodel/eventdescription.h>
#include <seiscomp/datamodel/comment.h>
#include <seiscomp/datamodel/dataused.h>
#include <seiscomp/datamodel/compositetime.h>
#include <seiscomp/datamodel/pickreference.h>
@ -41,6 +42,7 @@
#include <seiscomp/datamodel/originreference.h>
#include <seiscomp/datamodel/focalmechanismreference.h>
#include <seiscomp/datamodel/event.h>
#include <seiscomp/datamodel/catalog.h>
#include <seiscomp/datamodel/arrival.h>
#include <seiscomp/datamodel/origin.h>
#include <seiscomp/datamodel/eventparameters.h>

8
include/seiscomp/datamodel/exchange/binary.h
View File

@ -77,8 +77,8 @@ class ExporterBinary : public IO::XML::Exporter {
// Exporter interface
// ------------------------------------------------------------------
protected:
bool put(std::streambuf* buf, Core::BaseObject *);
bool put(std::streambuf* buf, const IO::ExportObjectList &objects);
bool put(std::streambuf* buf, Core::BaseObject *) override;
bool put(std::streambuf* buf, const IO::ExportObjectList &objects) override;
};
@ -95,8 +95,8 @@ class ExporterVBinary : public IO::XML::Exporter {
// Exporter interface
// ------------------------------------------------------------------
protected:
bool put(std::streambuf* buf, Core::BaseObject *);
bool put(std::streambuf* buf, const IO::ExportObjectList &objects);
bool put(std::streambuf* buf, Core::BaseObject *) override;
bool put(std::streambuf* buf, const IO::ExportObjectList &objects) override;
};

6
include/seiscomp/datamodel/exchange/bson.h
View File

@ -43,7 +43,7 @@ class ImporterBSON : public IO::Importer {
// Importer interface
// ------------------------------------------------------------------
protected:
Core::BaseObject *get(std::streambuf* buf);
Core::BaseObject *get(std::streambuf* buf) override;
};
@ -60,7 +60,7 @@ class ExporterBSON : public IO::Exporter {
// Exporter interface
// ------------------------------------------------------------------
protected:
bool put(std::streambuf* buf, Core::BaseObject *);
bool put(std::streambuf* buf, Core::BaseObject *) override;
};
@ -77,7 +77,7 @@ class ExporterBSONJSON : public IO::Exporter {
// Exporter interface
// ------------------------------------------------------------------
protected:
bool put(std::streambuf* buf, Core::BaseObject *);
bool put(std::streambuf* buf, Core::BaseObject *) override;
};

2
include/seiscomp/datamodel/exchange/csv.h
View File

@ -45,7 +45,7 @@ class ExporterCSV : public IO::Exporter {
// Exporter interface
// ------------------------------------------------------------------
protected:
bool put(std::streambuf* buf, Core::BaseObject *);
bool put(std::streambuf* buf, Core::BaseObject *) override;
private:
std::string _delim;

2
include/seiscomp/datamodel/exchange/hyp71sum2k.h
View File

@ -42,7 +42,7 @@ class ExporterHYP71SUM2K : public IO::Exporter {
// Exporter interface
// ------------------------------------------------------------------
protected:
bool put(std::streambuf* buf, Core::BaseObject *);
bool put(std::streambuf* buf, Core::BaseObject *) override;
};

2
include/seiscomp/datamodel/exchange/ims10.h
View File

@ -46,7 +46,7 @@ class ExporterIMS10 : public IO::Exporter {
// Exporter interface
// ------------------------------------------------------------------
protected:
bool put(std::streambuf* buf, Core::BaseObject *);
bool put(std::streambuf* buf, Core::BaseObject *) override;
private:
// ------------------------------------------------------------------
// Members

4
include/seiscomp/datamodel/exchange/json.h
View File

@ -43,7 +43,7 @@ class ImporterJSON : public IO::Importer {
// Importer interface
// ------------------------------------------------------------------
protected:
Core::BaseObject *get(std::streambuf* buf);
Core::BaseObject *get(std::streambuf* buf) override;
};
@ -60,7 +60,7 @@ class ExporterJSON : public IO::Exporter {
// Exporter interface
// ------------------------------------------------------------------
protected:
bool put(std::streambuf* buf, Core::BaseObject *);
bool put(std::streambuf* buf, Core::BaseObject *) override;
};

6
include/seiscomp/datamodel/exchange/trunk.h
View File

@ -43,7 +43,7 @@ class ImporterTrunk : public IO::Importer {
// Importer interface
// ------------------------------------------------------------------
protected:
Core::BaseObject *get(std::streambuf* buf);
Core::BaseObject *get(std::streambuf* buf) override;
};
@ -60,8 +60,8 @@ class ExporterTrunk : public IO::Exporter {
// Exporter interface
// ------------------------------------------------------------------
protected:
bool put(std::streambuf* buf, Core::BaseObject *);
bool put(std::streambuf* buf, const IO::ExportObjectList &objects);
bool put(std::streambuf* buf, Core::BaseObject *) override;
bool put(std::streambuf* buf, const IO::ExportObjectList &objects) override;
};

40
include/seiscomp/datamodel/focalmechanism.h
View File

@ -69,28 +69,28 @@ class SC_SYSTEM_CORE_API FocalMechanism : public PublicObject {
public:
//! Copy constructor
FocalMechanism(const FocalMechanism& other);
FocalMechanism(const FocalMechanism &other);
//! Constructor with publicID
FocalMechanism(const std::string& publicID);
//! Destructor
~FocalMechanism() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static FocalMechanism* Create();
static FocalMechanism* Create(const std::string& publicID);
static FocalMechanism *Create();
static FocalMechanism *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static FocalMechanism* Find(const std::string& publicID);
static FocalMechanism *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -99,14 +99,14 @@ class SC_SYSTEM_CORE_API FocalMechanism : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
FocalMechanism& operator=(const FocalMechanism& other);
FocalMechanism &operator=(const FocalMechanism &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const FocalMechanism& other) const;
bool operator!=(const FocalMechanism& other) const;
bool operator==(const FocalMechanism &other) const;
bool operator!=(const FocalMechanism &other) const;
//! Wrapper that calls operator==
bool equal(const FocalMechanism& other) const;
bool equal(const FocalMechanism &other) const;
// ------------------------------------------------------------------
@ -169,7 +169,7 @@ class SC_SYSTEM_CORE_API FocalMechanism : public PublicObject {
CreationInfo& creationInfo();
const CreationInfo& creationInfo() const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -182,8 +182,8 @@ class SC_SYSTEM_CORE_API FocalMechanism : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(Comment* obj);
bool add(MomentTensor* obj);
bool add(Comment *obj);
bool add(MomentTensor *obj);
/**
* Removes an object.
@ -192,8 +192,8 @@ class SC_SYSTEM_CORE_API FocalMechanism : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(Comment* obj);
bool remove(MomentTensor* obj);
bool remove(Comment *obj);
bool remove(MomentTensor *obj);
/**
* Removes an object of a particular class.
@ -202,7 +202,7 @@ class SC_SYSTEM_CORE_API FocalMechanism : public PublicObject {
* @return false The index is out of bounds
*/
bool removeComment(size_t i);
bool removeComment(const CommentIndex& i);
bool removeComment(const CommentIndex &i);
bool removeMomentTensor(size_t i);
//! Retrieve the number of objects of a particular class
@ -211,14 +211,14 @@ class SC_SYSTEM_CORE_API FocalMechanism : public PublicObject {
//! Index access
//! @return The object at index i
Comment* comment(size_t i) const;
Comment* comment(const CommentIndex& i) const;
MomentTensor* momentTensor(size_t i) const;
Comment *comment(size_t i) const;
Comment *comment(const CommentIndex &i) const;
MomentTensor *momentTensor(size_t i) const;
//! Find an object by its unique attribute(s)
MomentTensor* findMomentTensor(const std::string& publicID) const;
MomentTensor *findMomentTensor(const std::string& publicID) const;
EventParameters* eventParameters() const;
EventParameters *eventParameters() const;
//! Implement Object interface
bool assign(Object *other) override;

20
include/seiscomp/datamodel/focalmechanismreference.h
View File

@ -78,28 +78,28 @@ class SC_SYSTEM_CORE_API FocalMechanismReference : public Object {
FocalMechanismReference();
//! Copy constructor
FocalMechanismReference(const FocalMechanismReference& other);
FocalMechanismReference(const FocalMechanismReference &other);
//! Custom constructor
FocalMechanismReference(const std::string& focalMechanismID);
//! Destructor
~FocalMechanismReference() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
FocalMechanismReference& operator=(const FocalMechanismReference& other);
FocalMechanismReference &operator=(const FocalMechanismReference &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const FocalMechanismReference& other) const;
bool operator!=(const FocalMechanismReference& other) const;
bool operator==(const FocalMechanismReference &other) const;
bool operator!=(const FocalMechanismReference &other) const;
//! Wrapper that calls operator==
bool equal(const FocalMechanismReference& other) const;
bool equal(const FocalMechanismReference &other) const;
// ------------------------------------------------------------------
@ -115,17 +115,17 @@ class SC_SYSTEM_CORE_API FocalMechanismReference : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const FocalMechanismReferenceIndex& index() const;
const FocalMechanismReferenceIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const FocalMechanismReference* lhs) const;
bool equalIndex(const FocalMechanismReference *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Event* event() const;
Event *event() const;
//! Implement Object interface
bool assign(Object *other) override;

12
include/seiscomp/datamodel/integerquantity.h
View File

@ -66,7 +66,7 @@ class SC_SYSTEM_CORE_API IntegerQuantity : public Core::BaseObject {
IntegerQuantity();
//! Copy constructor
IntegerQuantity(const IntegerQuantity& other);
IntegerQuantity(const IntegerQuantity &other);
//! Custom constructor
IntegerQuantity(int value,
@ -77,7 +77,7 @@ class SC_SYSTEM_CORE_API IntegerQuantity : public Core::BaseObject {
//! Destructor
~IntegerQuantity() override;
// ------------------------------------------------------------------
// Operators
@ -87,14 +87,14 @@ class SC_SYSTEM_CORE_API IntegerQuantity : public Core::BaseObject {
operator int() const;
//! Copies the metadata of other to this
IntegerQuantity& operator=(const IntegerQuantity& other);
IntegerQuantity &operator=(const IntegerQuantity &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const IntegerQuantity& other) const;
bool operator!=(const IntegerQuantity& other) const;
bool operator==(const IntegerQuantity &other) const;
bool operator!=(const IntegerQuantity &other) const;
//! Wrapper that calls operator==
bool equal(const IntegerQuantity& other) const;
bool equal(const IntegerQuantity &other) const;
// ------------------------------------------------------------------

134
include/seiscomp/datamodel/inventory.h
View File

@ -68,11 +68,11 @@ class SC_SYSTEM_CORE_API Inventory : public PublicObject {
Inventory();
//! Copy constructor
Inventory(const Inventory& other);
Inventory(const Inventory &other);
//! Destructor
~Inventory() override;
// ------------------------------------------------------------------
// Operators
@ -80,16 +80,16 @@ class SC_SYSTEM_CORE_API Inventory : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
Inventory& operator=(const Inventory& other);
Inventory &operator=(const Inventory &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Inventory& other) const;
bool operator!=(const Inventory& other) const;
bool operator==(const Inventory &other) const;
bool operator!=(const Inventory &other) const;
//! Wrapper that calls operator==
bool equal(const Inventory& other) const;
bool equal(const Inventory &other) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -102,16 +102,16 @@ class SC_SYSTEM_CORE_API Inventory : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(StationGroup* obj);
bool add(AuxDevice* obj);
bool add(Sensor* obj);
bool add(Datalogger* obj);
bool add(ResponsePAZ* obj);
bool add(ResponseFIR* obj);
bool add(ResponseIIR* obj);
bool add(ResponsePolynomial* obj);
bool add(ResponseFAP* obj);
bool add(Network* obj);
bool add(StationGroup *obj);
bool add(AuxDevice *obj);
bool add(Sensor *obj);
bool add(Datalogger *obj);
bool add(ResponsePAZ *obj);
bool add(ResponseFIR *obj);
bool add(ResponseIIR *obj);
bool add(ResponsePolynomial *obj);
bool add(ResponseFAP *obj);
bool add(Network *obj);
/**
* Removes an object.
@ -120,16 +120,16 @@ class SC_SYSTEM_CORE_API Inventory : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(StationGroup* obj);
bool remove(AuxDevice* obj);
bool remove(Sensor* obj);
bool remove(Datalogger* obj);
bool remove(ResponsePAZ* obj);
bool remove(ResponseFIR* obj);
bool remove(ResponseIIR* obj);
bool remove(ResponsePolynomial* obj);
bool remove(ResponseFAP* obj);
bool remove(Network* obj);
bool remove(StationGroup *obj);
bool remove(AuxDevice *obj);
bool remove(Sensor *obj);
bool remove(Datalogger *obj);
bool remove(ResponsePAZ *obj);
bool remove(ResponseFIR *obj);
bool remove(ResponseIIR *obj);
bool remove(ResponsePolynomial *obj);
bool remove(ResponseFAP *obj);
bool remove(Network *obj);
/**
* Removes an object of a particular class.
@ -138,25 +138,25 @@ class SC_SYSTEM_CORE_API Inventory : public PublicObject {
* @return false The index is out of bounds
*/
bool removeStationGroup(size_t i);
bool removeStationGroup(const StationGroupIndex& i);
bool removeStationGroup(const StationGroupIndex &i);
bool removeAuxDevice(size_t i);
bool removeAuxDevice(const AuxDeviceIndex& i);
bool removeAuxDevice(const AuxDeviceIndex &i);
bool removeSensor(size_t i);
bool removeSensor(const SensorIndex& i);
bool removeSensor(const SensorIndex &i);
bool removeDatalogger(size_t i);
bool removeDatalogger(const DataloggerIndex& i);
bool removeDatalogger(const DataloggerIndex &i);
bool removeResponsePAZ(size_t i);
bool removeResponsePAZ(const ResponsePAZIndex& i);
bool removeResponsePAZ(const ResponsePAZIndex &i);
bool removeResponseFIR(size_t i);
bool removeResponseFIR(const ResponseFIRIndex& i);
bool removeResponseFIR(const ResponseFIRIndex &i);
bool removeResponseIIR(size_t i);
bool removeResponseIIR(const ResponseIIRIndex& i);
bool removeResponseIIR(const ResponseIIRIndex &i);
bool removeResponsePolynomial(size_t i);
bool removeResponsePolynomial(const ResponsePolynomialIndex& i);
bool removeResponsePolynomial(const ResponsePolynomialIndex &i);
bool removeResponseFAP(size_t i);
bool removeResponseFAP(const ResponseFAPIndex& i);
bool removeResponseFAP(const ResponseFAPIndex &i);
bool removeNetwork(size_t i);
bool removeNetwork(const NetworkIndex& i);
bool removeNetwork(const NetworkIndex &i);
//! Retrieve the number of objects of a particular class
size_t stationGroupCount() const;
@ -172,47 +172,47 @@ class SC_SYSTEM_CORE_API Inventory : public PublicObject {
//! Index access
//! @return The object at index i
StationGroup* stationGroup(size_t i) const;
StationGroup* stationGroup(const StationGroupIndex& i) const;
StationGroup *stationGroup(size_t i) const;
StationGroup *stationGroup(const StationGroupIndex &i) const;
AuxDevice* auxDevice(size_t i) const;
AuxDevice* auxDevice(const AuxDeviceIndex& i) const;
AuxDevice *auxDevice(size_t i) const;
AuxDevice *auxDevice(const AuxDeviceIndex &i) const;
Sensor* sensor(size_t i) const;
Sensor* sensor(const SensorIndex& i) const;
Sensor *sensor(size_t i) const;
Sensor *sensor(const SensorIndex &i) const;
Datalogger* datalogger(size_t i) const;
Datalogger* datalogger(const DataloggerIndex& i) const;
Datalogger *datalogger(size_t i) const;
Datalogger *datalogger(const DataloggerIndex &i) const;
ResponsePAZ* responsePAZ(size_t i) const;
ResponsePAZ* responsePAZ(const ResponsePAZIndex& i) const;
ResponsePAZ *responsePAZ(size_t i) const;
ResponsePAZ *responsePAZ(const ResponsePAZIndex &i) const;
ResponseFIR* responseFIR(size_t i) const;
ResponseFIR* responseFIR(const ResponseFIRIndex& i) const;
ResponseFIR *responseFIR(size_t i) const;
ResponseFIR *responseFIR(const ResponseFIRIndex &i) const;
ResponseIIR* responseIIR(size_t i) const;
ResponseIIR* responseIIR(const ResponseIIRIndex& i) const;
ResponseIIR *responseIIR(size_t i) const;
ResponseIIR *responseIIR(const ResponseIIRIndex &i) const;
ResponsePolynomial* responsePolynomial(size_t i) const;
ResponsePolynomial* responsePolynomial(const ResponsePolynomialIndex& i) const;
ResponsePolynomial *responsePolynomial(size_t i) const;
ResponsePolynomial *responsePolynomial(const ResponsePolynomialIndex &i) const;
ResponseFAP* responseFAP(size_t i) const;
ResponseFAP* responseFAP(const ResponseFAPIndex& i) const;
ResponseFAP *responseFAP(size_t i) const;
ResponseFAP *responseFAP(const ResponseFAPIndex &i) const;
Network* network(size_t i) const;
Network* network(const NetworkIndex& i) const;
Network *network(size_t i) const;
Network *network(const NetworkIndex &i) const;
//! Find an object by its unique attribute(s)
StationGroup* findStationGroup(const std::string& publicID) const;
AuxDevice* findAuxDevice(const std::string& publicID) const;
Sensor* findSensor(const std::string& publicID) const;
Datalogger* findDatalogger(const std::string& publicID) const;
ResponsePAZ* findResponsePAZ(const std::string& publicID) const;
ResponseFIR* findResponseFIR(const std::string& publicID) const;
ResponseIIR* findResponseIIR(const std::string& publicID) const;
ResponsePolynomial* findResponsePolynomial(const std::string& publicID) const;
ResponseFAP* findResponseFAP(const std::string& publicID) const;
Network* findNetwork(const std::string& publicID) const;
StationGroup *findStationGroup(const std::string& publicID) const;
AuxDevice *findAuxDevice(const std::string& publicID) const;
Sensor *findSensor(const std::string& publicID) const;
Datalogger *findDatalogger(const std::string& publicID) const;
ResponsePAZ *findResponsePAZ(const std::string& publicID) const;
ResponseFIR *findResponseFIR(const std::string& publicID) const;
ResponseIIR *findResponseIIR(const std::string& publicID) const;
ResponsePolynomial *findResponsePolynomial(const std::string& publicID) const;
ResponseFAP *findResponseFAP(const std::string& publicID) const;
Network *findNetwork(const std::string& publicID) const;
//! Implement Object interface
bool assign(Object *other) override;

16
include/seiscomp/datamodel/journalentry.h
View File

@ -50,25 +50,25 @@ class SC_SYSTEM_CORE_API JournalEntry : public Object {
JournalEntry();
//! Copy constructor
JournalEntry(const JournalEntry& other);
JournalEntry(const JournalEntry &other);
//! Destructor
~JournalEntry() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
JournalEntry& operator=(const JournalEntry& other);
JournalEntry &operator=(const JournalEntry &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const JournalEntry& other) const;
bool operator!=(const JournalEntry& other) const;
bool operator==(const JournalEntry &other) const;
bool operator!=(const JournalEntry &other) const;
//! Wrapper that calls operator==
bool equal(const JournalEntry& other) const;
bool equal(const JournalEntry &other) const;
// ------------------------------------------------------------------
@ -90,12 +90,12 @@ class SC_SYSTEM_CORE_API JournalEntry : public Object {
void setParameters(const std::string& parameters);
const std::string& parameters() const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Journaling* journaling() const;
Journaling *journaling() const;
//! Implement Object interface
bool assign(Object *other) override;

22
include/seiscomp/datamodel/journaling.h
View File

@ -49,11 +49,11 @@ class SC_SYSTEM_CORE_API Journaling : public PublicObject {
Journaling();
//! Copy constructor
Journaling(const Journaling& other);
Journaling(const Journaling &other);
//! Destructor
~Journaling() override;
// ------------------------------------------------------------------
// Operators
@ -61,16 +61,16 @@ class SC_SYSTEM_CORE_API Journaling : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
Journaling& operator=(const Journaling& other);
Journaling &operator=(const Journaling &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Journaling& other) const;
bool operator!=(const Journaling& other) const;
bool operator==(const Journaling &other) const;
bool operator!=(const Journaling &other) const;
//! Wrapper that calls operator==
bool equal(const Journaling& other) const;
bool equal(const Journaling &other) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -83,7 +83,7 @@ class SC_SYSTEM_CORE_API Journaling : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(JournalEntry* obj);
bool add(JournalEntry *obj);
/**
* Removes an object.
@ -92,7 +92,7 @@ class SC_SYSTEM_CORE_API Journaling : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(JournalEntry* obj);
bool remove(JournalEntry *obj);
/**
* Removes an object of a particular class.
@ -107,10 +107,10 @@ class SC_SYSTEM_CORE_API Journaling : public PublicObject {
//! Index access
//! @return The object at index i
JournalEntry* journalEntry(size_t i) const;
JournalEntry *journalEntry(size_t i) const;
//! Find an object by its unique attribute(s)
JournalEntry* findJournalEntry(JournalEntry* journalEntry) const;
JournalEntry *findJournalEntry(JournalEntry *journalEntry) const;
//! Implement Object interface
bool assign(Object *other) override;

42
include/seiscomp/datamodel/magnitude.h
View File

@ -69,28 +69,28 @@ class SC_SYSTEM_CORE_API Magnitude : public PublicObject {
public:
//! Copy constructor
Magnitude(const Magnitude& other);
Magnitude(const Magnitude &other);
//! Constructor with publicID
Magnitude(const std::string& publicID);
//! Destructor
~Magnitude() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static Magnitude* Create();
static Magnitude* Create(const std::string& publicID);
static Magnitude *Create();
static Magnitude *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static Magnitude* Find(const std::string& publicID);
static Magnitude *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -99,14 +99,14 @@ class SC_SYSTEM_CORE_API Magnitude : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
Magnitude& operator=(const Magnitude& other);
Magnitude &operator=(const Magnitude &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Magnitude& other) const;
bool operator!=(const Magnitude& other) const;
bool operator==(const Magnitude &other) const;
bool operator!=(const Magnitude &other) const;
//! Wrapper that calls operator==
bool equal(const Magnitude& other) const;
bool equal(const Magnitude &other) const;
// ------------------------------------------------------------------
@ -162,7 +162,7 @@ class SC_SYSTEM_CORE_API Magnitude : public PublicObject {
CreationInfo& creationInfo();
const CreationInfo& creationInfo() const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -175,8 +175,8 @@ class SC_SYSTEM_CORE_API Magnitude : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(Comment* obj);
bool add(StationMagnitudeContribution* obj);
bool add(Comment *obj);
bool add(StationMagnitudeContribution *obj);
/**
* Removes an object.
@ -185,8 +185,8 @@ class SC_SYSTEM_CORE_API Magnitude : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(Comment* obj);
bool remove(StationMagnitudeContribution* obj);
bool remove(Comment *obj);
bool remove(StationMagnitudeContribution *obj);
/**
* Removes an object of a particular class.
@ -195,9 +195,9 @@ class SC_SYSTEM_CORE_API Magnitude : public PublicObject {
* @return false The index is out of bounds
*/
bool removeComment(size_t i);
bool removeComment(const CommentIndex& i);
bool removeComment(const CommentIndex &i);
bool removeStationMagnitudeContribution(size_t i);
bool removeStationMagnitudeContribution(const StationMagnitudeContributionIndex& i);
bool removeStationMagnitudeContribution(const StationMagnitudeContributionIndex &i);
//! Retrieve the number of objects of a particular class
size_t commentCount() const;
@ -205,15 +205,15 @@ class SC_SYSTEM_CORE_API Magnitude : public PublicObject {
//! Index access
//! @return The object at index i
Comment* comment(size_t i) const;
Comment* comment(const CommentIndex& i) const;
Comment *comment(size_t i) const;
Comment *comment(const CommentIndex &i) const;
StationMagnitudeContribution* stationMagnitudeContribution(size_t i) const;
StationMagnitudeContribution* stationMagnitudeContribution(const StationMagnitudeContributionIndex& i) const;
StationMagnitudeContribution *stationMagnitudeContribution(size_t i) const;
StationMagnitudeContribution *stationMagnitudeContribution(const StationMagnitudeContributionIndex &i) const;
//! Find an object by its unique attribute(s)
Origin* origin() const;
Origin *origin() const;
//! Implement Object interface
bool assign(Object *other) override;

14
include/seiscomp/datamodel/messages.h
View File

@ -51,7 +51,7 @@ class SC_SYSTEM_CORE_API ConfigSyncMessage : public Seiscomp::Core::Message {
// Message interface
// ------------------------------------------------------------------
public:
bool empty() const;
bool empty() const override;
// ------------------------------------------------------------------
@ -101,7 +101,7 @@ class SC_SYSTEM_CORE_API InventorySyncMessage : public Seiscomp::Core::Message {
// Message interface
// ------------------------------------------------------------------
public:
bool empty() const;
bool empty() const override;
// ------------------------------------------------------------------
@ -130,22 +130,22 @@ class SC_SYSTEM_CORE_API ArtificialOriginMessage : public Seiscomp::Core::Messag
public:
ArtificialOriginMessage(DataModel::Origin *origin);
// ------------------------------------------------------------------
// Message interface
// ------------------------------------------------------------------
public:
DataModel::Origin *origin() const;
void setOrigin(DataModel::Origin *origin);
virtual bool empty() const;
virtual bool empty() const override;
// ------------------------------------------------------------------
// Implementation
// ------------------------------------------------------------------
private:
DataModel::OriginPtr _origin;
DECLARE_SC_CLASSFACTORY_FRIEND(ArtificialOriginMessage);
};
@ -173,7 +173,7 @@ class SC_SYSTEM_CORE_API ArtificialEventParametersMessage : public Seiscomp::Cor
DataModel::EventParameters *eventParameters() const;
void setEventParameters(DataModel::EventParameters *eventParameters);
virtual bool empty() const;
virtual bool empty() const override;
// ------------------------------------------------------------------
// Implementation

46
include/seiscomp/datamodel/metadata.h
View File

@ -42,7 +42,7 @@ class EnumPropertyBase<T, U, F1, F2, 0> : public Core::MetaProperty {
EnumPropertyBase(F1 setter, F2 getter)
: _setter(setter), _getter(getter) {}
bool write(Core::BaseObject *object, Core::MetaValue value) const {
bool write(Core::BaseObject *object, Core::MetaValue value) const override {
T *target = T::Cast(object);
if ( !target ) return false;
U tmp;
@ -53,7 +53,7 @@ class EnumPropertyBase<T, U, F1, F2, 0> : public Core::MetaProperty {
return true;
}
bool writeString(Core::BaseObject *object, const std::string &value) const {
bool writeString(Core::BaseObject *object, const std::string &value) const override {
T *target = T::Cast(object);
if ( !target ) return false;
typename Core::Generic::remove_optional<U>::type tmp;
@ -64,13 +64,13 @@ class EnumPropertyBase<T, U, F1, F2, 0> : public Core::MetaProperty {
return true;
}
Core::MetaValue read(const Core::BaseObject *object) const {
Core::MetaValue read(const Core::BaseObject *object) const override {
const T *target = T::ConstCast(object);
if ( !target ) throw Core::GeneralException("invalid object");
return (target->*_getter)().toInt();
}
std::string readString(const Core::BaseObject *object) const {
std::string readString(const Core::BaseObject *object) const override {
const T *target = T::ConstCast(object);
if ( !target ) throw Core::GeneralException("invalid object");
return (target->*_getter)().toString();
@ -89,7 +89,7 @@ class EnumPropertyBase<T, U, F1, F2, 1> : public Core::MetaProperty {
EnumPropertyBase(F1 setter, F2 getter)
: _setter(setter), _getter(getter) {}
bool write(Core::BaseObject *object, Core::MetaValue value) const {
bool write(Core::BaseObject *object, Core::MetaValue value) const override {
T *target = T::Cast(object);
if ( !target ) return false;
@ -106,7 +106,7 @@ class EnumPropertyBase<T, U, F1, F2, 1> : public Core::MetaProperty {
return true;
}
bool writeString(Core::BaseObject *object, const std::string &value) const {
bool writeString(Core::BaseObject *object, const std::string &value) const override {
T *target = T::Cast(object);
if ( !target ) return false;
@ -123,13 +123,13 @@ class EnumPropertyBase<T, U, F1, F2, 1> : public Core::MetaProperty {
return true;
}
Core::MetaValue read(const Core::BaseObject *object) const {
Core::MetaValue read(const Core::BaseObject *object) const override {
const T *target = T::ConstCast(object);
if ( !target ) throw Core::GeneralException("invalid object");
return (target->*_getter)().toInt();
}
std::string readString(const Core::BaseObject *object) const {
std::string readString(const Core::BaseObject *object) const override {
const T *target = T::ConstCast(object);
if ( !target ) throw Core::GeneralException("invalid object");
return (target->*_getter)().toString();
@ -153,7 +153,7 @@ class BaseObjectPropertyBase<A, T, U, F1, F2, 0> : public Core::MetaClassPropert
BaseObjectPropertyBase(F1 setter, F2 getter)
: _setter(setter), _getter(getter) {}
bool write(Core::BaseObject *object, Core::MetaValue value) const {
bool write(Core::BaseObject *object, Core::MetaValue value) const override {
T *target = T::Cast(object);
if ( !target ) return false;
@ -186,7 +186,7 @@ class BaseObjectPropertyBase<A, T, U, F1, F2, 0> : public Core::MetaClassPropert
return true;
}
Core::MetaValue read(const Core::BaseObject *object) const {
Core::MetaValue read(const Core::BaseObject *object) const override {
const T *target = T::ConstCast(object);
if ( !target ) throw Core::GeneralException("invalid object");
return static_cast<Core::BaseObject*>(&(const_cast<T*>(target)->*_getter)());
@ -205,7 +205,7 @@ class BaseObjectPropertyBase<A, T, U, F1, F2, 1> : public Core::MetaClassPropert
BaseObjectPropertyBase(F1 setter, F2 getter)
: _setter(setter), _getter(getter) {}
bool write(Core::BaseObject *object, Core::MetaValue value) const {
bool write(Core::BaseObject *object, Core::MetaValue value) const override {
T *target = T::Cast(object);
if ( !target ) return false;
@ -244,7 +244,7 @@ class BaseObjectPropertyBase<A, T, U, F1, F2, 1> : public Core::MetaClassPropert
return true;
}
Core::MetaValue read(const Core::BaseObject *object) const {
Core::MetaValue read(const Core::BaseObject *object) const override {
const T *target = T::ConstCast(object);
if ( !target ) throw Core::GeneralException("invalid object");
return static_cast<Core::BaseObject*>(&(const_cast<T*>(target)->*_getter)());
@ -267,21 +267,21 @@ class ArrayProperty : public Core::MetaProperty {
_eraseObjIndex(eraseObjIndex),
_eraseObjPointer(eraseObjPointer) {}
size_t arrayElementCount(const Core::BaseObject *object) const {
size_t arrayElementCount(const Core::BaseObject *object) const override {
const T *target = T::ConstCast(object);
if ( !target ) throw Core::GeneralException("invalid object");
return static_cast<size_t>((target->*_countObjects)());
}
Core::BaseObject *arrayObject(Core::BaseObject *object, int i) const {
Core::BaseObject *arrayObject(Core::BaseObject *object, int i) const override {
T *target = T::Cast(object);
if ( !target ) throw Core::GeneralException("invalid object");
return (target->*_getObj)(i);
}
bool arrayAddObject(Core::BaseObject *object, Core::BaseObject *ch) const {
bool arrayAddObject(Core::BaseObject *object, Core::BaseObject *ch) const override {
T *target = T::Cast(object);
if ( !target ) throw Core::GeneralException("invalid object");
@ -291,14 +291,14 @@ class ArrayProperty : public Core::MetaProperty {
return (target->*_addObj)(child);
}
bool arrayRemoveObject(Core::BaseObject *object, int i) const {
bool arrayRemoveObject(Core::BaseObject *object, int i) const override {
T *target = T::Cast(object);
if ( !target ) throw Core::GeneralException("invalid object");
return (target->*_eraseObjIndex)(i);
}
bool arrayRemoveObject(Core::BaseObject *object, Core::BaseObject *ch) const {
bool arrayRemoveObject(Core::BaseObject *object, Core::BaseObject *ch) const override {
T *target = T::Cast(object);
if ( !target ) throw Core::GeneralException("invalid object");
@ -308,7 +308,7 @@ class ArrayProperty : public Core::MetaProperty {
return (target->*_eraseObjPointer)(child);
}
Core::BaseObject *createClass() const {
Core::BaseObject *createClass() const override {
return U::Create();
}
@ -331,21 +331,21 @@ class ArrayClassProperty : public Core::MetaClassProperty<A> {
_eraseObjIndex(eraseObjIndex),
_eraseObjPointer(eraseObjPointer) {}
size_t arrayElementCount(const Core::BaseObject *object) const {
size_t arrayElementCount(const Core::BaseObject *object) const override {
const T *target = T::ConstCast(object);
if ( !target ) throw Core::GeneralException("invalid object");
return static_cast<size_t>((target->*_countObjects)());
}
Core::BaseObject *arrayObject(Core::BaseObject *object, int i) const {
Core::BaseObject *arrayObject(Core::BaseObject *object, int i) const override {
T *target = T::Cast(object);
if ( !target ) throw Core::GeneralException("invalid object");
return (target->*_getObj)(i);
}
bool arrayAddObject(Core::BaseObject *object, Core::BaseObject *ch) const {
bool arrayAddObject(Core::BaseObject *object, Core::BaseObject *ch) const override {
T *target = T::Cast(object);
if ( !target ) throw Core::GeneralException("invalid object");
@ -355,14 +355,14 @@ class ArrayClassProperty : public Core::MetaClassProperty<A> {
return (target->*_addObj)(child);
}
bool arrayRemoveObject(Core::BaseObject *object, int i) const {
bool arrayRemoveObject(Core::BaseObject *object, int i) const override {
T *target = T::Cast(object);
if ( !target ) throw Core::GeneralException("invalid object");
return (target->*_eraseObjIndex)(i);
}
bool arrayRemoveObject(Core::BaseObject *object, Core::BaseObject *ch) const {
bool arrayRemoveObject(Core::BaseObject *object, Core::BaseObject *ch) const override {
T *target = T::Cast(object);
if ( !target ) throw Core::GeneralException("invalid object");

58
include/seiscomp/datamodel/momenttensor.h
View File

@ -68,28 +68,28 @@ class SC_SYSTEM_CORE_API MomentTensor : public PublicObject {
public:
//! Copy constructor
MomentTensor(const MomentTensor& other);
MomentTensor(const MomentTensor &other);
//! Constructor with publicID
MomentTensor(const std::string& publicID);
//! Destructor
~MomentTensor() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static MomentTensor* Create();
static MomentTensor* Create(const std::string& publicID);
static MomentTensor *Create();
static MomentTensor *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static MomentTensor* Find(const std::string& publicID);
static MomentTensor *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -98,14 +98,14 @@ class SC_SYSTEM_CORE_API MomentTensor : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
MomentTensor& operator=(const MomentTensor& other);
MomentTensor &operator=(const MomentTensor &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const MomentTensor& other) const;
bool operator!=(const MomentTensor& other) const;
bool operator==(const MomentTensor &other) const;
bool operator!=(const MomentTensor &other) const;
//! Wrapper that calls operator==
bool equal(const MomentTensor& other) const;
bool equal(const MomentTensor &other) const;
// ------------------------------------------------------------------
@ -199,7 +199,7 @@ class SC_SYSTEM_CORE_API MomentTensor : public PublicObject {
CreationInfo& creationInfo();
const CreationInfo& creationInfo() const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -212,10 +212,10 @@ class SC_SYSTEM_CORE_API MomentTensor : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(Comment* obj);
bool add(DataUsed* obj);
bool add(MomentTensorPhaseSetting* obj);
bool add(MomentTensorStationContribution* obj);
bool add(Comment *obj);
bool add(DataUsed *obj);
bool add(MomentTensorPhaseSetting *obj);
bool add(MomentTensorStationContribution *obj);
/**
* Removes an object.
@ -224,10 +224,10 @@ class SC_SYSTEM_CORE_API MomentTensor : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(Comment* obj);
bool remove(DataUsed* obj);
bool remove(MomentTensorPhaseSetting* obj);
bool remove(MomentTensorStationContribution* obj);
bool remove(Comment *obj);
bool remove(DataUsed *obj);
bool remove(MomentTensorPhaseSetting *obj);
bool remove(MomentTensorStationContribution *obj);
/**
* Removes an object of a particular class.
@ -236,10 +236,10 @@ class SC_SYSTEM_CORE_API MomentTensor : public PublicObject {
* @return false The index is out of bounds
*/
bool removeComment(size_t i);
bool removeComment(const CommentIndex& i);
bool removeComment(const CommentIndex &i);
bool removeDataUsed(size_t i);
bool removeMomentTensorPhaseSetting(size_t i);
bool removeMomentTensorPhaseSetting(const MomentTensorPhaseSettingIndex& i);
bool removeMomentTensorPhaseSetting(const MomentTensorPhaseSettingIndex &i);
bool removeMomentTensorStationContribution(size_t i);
//! Retrieve the number of objects of a particular class
@ -250,19 +250,19 @@ class SC_SYSTEM_CORE_API MomentTensor : public PublicObject {
//! Index access
//! @return The object at index i
Comment* comment(size_t i) const;
Comment* comment(const CommentIndex& i) const;
DataUsed* dataUsed(size_t i) const;
Comment *comment(size_t i) const;
Comment *comment(const CommentIndex &i) const;
DataUsed *dataUsed(size_t i) const;
MomentTensorPhaseSetting* momentTensorPhaseSetting(size_t i) const;
MomentTensorPhaseSetting* momentTensorPhaseSetting(const MomentTensorPhaseSettingIndex& i) const;
MomentTensorStationContribution* momentTensorStationContribution(size_t i) const;
MomentTensorPhaseSetting *momentTensorPhaseSetting(size_t i) const;
MomentTensorPhaseSetting *momentTensorPhaseSetting(const MomentTensorPhaseSettingIndex &i) const;
MomentTensorStationContribution *momentTensorStationContribution(size_t i) const;
//! Find an object by its unique attribute(s)
DataUsed* findDataUsed(DataUsed* dataUsed) const;
MomentTensorStationContribution* findMomentTensorStationContribution(const std::string& publicID) const;
DataUsed *findDataUsed(DataUsed *dataUsed) const;
MomentTensorStationContribution *findMomentTensorStationContribution(const std::string& publicID) const;
FocalMechanism* focalMechanism() const;
FocalMechanism *focalMechanism() const;
//! Implement Object interface
bool assign(Object *other) override;

24
include/seiscomp/datamodel/momenttensorcomponentcontribution.h
View File

@ -81,7 +81,7 @@ class SC_SYSTEM_CORE_API MomentTensorComponentContribution : public Object {
MomentTensorComponentContribution();
//! Copy constructor
MomentTensorComponentContribution(const MomentTensorComponentContribution& other);
MomentTensorComponentContribution(const MomentTensorComponentContribution &other);
//! Custom constructor
MomentTensorComponentContribution(const std::string& phaseCode);
@ -96,21 +96,21 @@ class SC_SYSTEM_CORE_API MomentTensorComponentContribution : public Object {
//! Destructor
~MomentTensorComponentContribution() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
MomentTensorComponentContribution& operator=(const MomentTensorComponentContribution& other);
MomentTensorComponentContribution &operator=(const MomentTensorComponentContribution &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const MomentTensorComponentContribution& other) const;
bool operator!=(const MomentTensorComponentContribution& other) const;
bool operator==(const MomentTensorComponentContribution &other) const;
bool operator!=(const MomentTensorComponentContribution &other) const;
//! Wrapper that calls operator==
bool equal(const MomentTensorComponentContribution& other) const;
bool equal(const MomentTensorComponentContribution &other) const;
// ------------------------------------------------------------------
@ -133,8 +133,8 @@ class SC_SYSTEM_CORE_API MomentTensorComponentContribution : public Object {
double timeShift() const;
void setDataTimeWindow(const std::vector< double >&);
const std::vector< double >& dataTimeWindow() const;
std::vector< double >& dataTimeWindow();
const std::vector< double > &dataTimeWindow() const;
std::vector< double > &dataTimeWindow();
void setMisfit(const OPT(double)& misfit);
double misfit() const;
@ -148,17 +148,17 @@ class SC_SYSTEM_CORE_API MomentTensorComponentContribution : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const MomentTensorComponentContributionIndex& index() const;
const MomentTensorComponentContributionIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const MomentTensorComponentContribution* lhs) const;
bool equalIndex(const MomentTensorComponentContribution *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
MomentTensorStationContribution* momentTensorStationContribution() const;
MomentTensorStationContribution *momentTensorStationContribution() const;
//! Implement Object interface
bool assign(Object *other) override;

20
include/seiscomp/datamodel/momenttensorphasesetting.h
View File

@ -78,7 +78,7 @@ class SC_SYSTEM_CORE_API MomentTensorPhaseSetting : public Object {
MomentTensorPhaseSetting();
//! Copy constructor
MomentTensorPhaseSetting(const MomentTensorPhaseSetting& other);
MomentTensorPhaseSetting(const MomentTensorPhaseSetting &other);
//! Custom constructor
MomentTensorPhaseSetting(const std::string& code);
@ -90,21 +90,21 @@ class SC_SYSTEM_CORE_API MomentTensorPhaseSetting : public Object {
//! Destructor
~MomentTensorPhaseSetting() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
MomentTensorPhaseSetting& operator=(const MomentTensorPhaseSetting& other);
MomentTensorPhaseSetting &operator=(const MomentTensorPhaseSetting &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const MomentTensorPhaseSetting& other) const;
bool operator!=(const MomentTensorPhaseSetting& other) const;
bool operator==(const MomentTensorPhaseSetting &other) const;
bool operator!=(const MomentTensorPhaseSetting &other) const;
//! Wrapper that calls operator==
bool equal(const MomentTensorPhaseSetting& other) const;
bool equal(const MomentTensorPhaseSetting &other) const;
// ------------------------------------------------------------------
@ -132,17 +132,17 @@ class SC_SYSTEM_CORE_API MomentTensorPhaseSetting : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const MomentTensorPhaseSettingIndex& index() const;
const MomentTensorPhaseSettingIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const MomentTensorPhaseSetting* lhs) const;
bool equalIndex(const MomentTensorPhaseSetting *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
MomentTensor* momentTensor() const;
MomentTensor *momentTensor() const;
//! Implement Object interface
bool assign(Object *other) override;

32
include/seiscomp/datamodel/momenttensorstationcontribution.h
View File

@ -54,28 +54,28 @@ class SC_SYSTEM_CORE_API MomentTensorStationContribution : public PublicObject {
public:
//! Copy constructor
MomentTensorStationContribution(const MomentTensorStationContribution& other);
MomentTensorStationContribution(const MomentTensorStationContribution &other);
//! Constructor with publicID
MomentTensorStationContribution(const std::string& publicID);
//! Destructor
~MomentTensorStationContribution() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static MomentTensorStationContribution* Create();
static MomentTensorStationContribution* Create(const std::string& publicID);
static MomentTensorStationContribution *Create();
static MomentTensorStationContribution *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static MomentTensorStationContribution* Find(const std::string& publicID);
static MomentTensorStationContribution *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -84,14 +84,14 @@ class SC_SYSTEM_CORE_API MomentTensorStationContribution : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
MomentTensorStationContribution& operator=(const MomentTensorStationContribution& other);
MomentTensorStationContribution &operator=(const MomentTensorStationContribution &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const MomentTensorStationContribution& other) const;
bool operator!=(const MomentTensorStationContribution& other) const;
bool operator==(const MomentTensorStationContribution &other) const;
bool operator!=(const MomentTensorStationContribution &other) const;
//! Wrapper that calls operator==
bool equal(const MomentTensorStationContribution& other) const;
bool equal(const MomentTensorStationContribution &other) const;
// ------------------------------------------------------------------
@ -111,7 +111,7 @@ class SC_SYSTEM_CORE_API MomentTensorStationContribution : public PublicObject {
void setTimeShift(const OPT(double)& timeShift);
double timeShift() const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -124,7 +124,7 @@ class SC_SYSTEM_CORE_API MomentTensorStationContribution : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(MomentTensorComponentContribution* obj);
bool add(MomentTensorComponentContribution *obj);
/**
* Removes an object.
@ -133,7 +133,7 @@ class SC_SYSTEM_CORE_API MomentTensorStationContribution : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(MomentTensorComponentContribution* obj);
bool remove(MomentTensorComponentContribution *obj);
/**
* Removes an object of a particular class.
@ -142,19 +142,19 @@ class SC_SYSTEM_CORE_API MomentTensorStationContribution : public PublicObject {
* @return false The index is out of bounds
*/
bool removeMomentTensorComponentContribution(size_t i);
bool removeMomentTensorComponentContribution(const MomentTensorComponentContributionIndex& i);
bool removeMomentTensorComponentContribution(const MomentTensorComponentContributionIndex &i);
//! Retrieve the number of objects of a particular class
size_t momentTensorComponentContributionCount() const;
//! Index access
//! @return The object at index i
MomentTensorComponentContribution* momentTensorComponentContribution(size_t i) const;
MomentTensorComponentContribution* momentTensorComponentContribution(const MomentTensorComponentContributionIndex& i) const;
MomentTensorComponentContribution *momentTensorComponentContribution(size_t i) const;
MomentTensorComponentContribution *momentTensorComponentContribution(const MomentTensorComponentContributionIndex &i) const;
//! Find an object by its unique attribute(s)
MomentTensor* momentTensor() const;
MomentTensor *momentTensor() const;
//! Implement Object interface
bool assign(Object *other) override;

48
include/seiscomp/datamodel/network.h
View File

@ -92,28 +92,28 @@ class SC_SYSTEM_CORE_API Network : public PublicObject {
public:
//! Copy constructor
Network(const Network& other);
Network(const Network &other);
//! Constructor with publicID
Network(const std::string& publicID);
//! Destructor
~Network() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static Network* Create();
static Network* Create(const std::string& publicID);
static Network *Create();
static Network *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static Network* Find(const std::string& publicID);
static Network *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -122,14 +122,14 @@ class SC_SYSTEM_CORE_API Network : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
Network& operator=(const Network& other);
Network &operator=(const Network &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Network& other) const;
bool operator!=(const Network& other) const;
bool operator==(const Network &other) const;
bool operator!=(const Network &other) const;
//! Wrapper that calls operator==
bool equal(const Network& other) const;
bool equal(const Network &other) const;
// ------------------------------------------------------------------
@ -193,12 +193,12 @@ class SC_SYSTEM_CORE_API Network : public PublicObject {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const NetworkIndex& index() const;
const NetworkIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const Network* lhs) const;
bool equalIndex(const Network *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -211,8 +211,8 @@ class SC_SYSTEM_CORE_API Network : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(Comment* obj);
bool add(Station* obj);
bool add(Comment *obj);
bool add(Station *obj);
/**
* Removes an object.
@ -221,8 +221,8 @@ class SC_SYSTEM_CORE_API Network : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(Comment* obj);
bool remove(Station* obj);
bool remove(Comment *obj);
bool remove(Station *obj);
/**
* Removes an object of a particular class.
@ -231,9 +231,9 @@ class SC_SYSTEM_CORE_API Network : public PublicObject {
* @return false The index is out of bounds
*/
bool removeComment(size_t i);
bool removeComment(const CommentIndex& i);
bool removeComment(const CommentIndex &i);
bool removeStation(size_t i);
bool removeStation(const StationIndex& i);
bool removeStation(const StationIndex &i);
//! Retrieve the number of objects of a particular class
size_t commentCount() const;
@ -241,16 +241,16 @@ class SC_SYSTEM_CORE_API Network : public PublicObject {
//! Index access
//! @return The object at index i
Comment* comment(size_t i) const;
Comment* comment(const CommentIndex& i) const;
Comment *comment(size_t i) const;
Comment *comment(const CommentIndex &i) const;
Station* station(size_t i) const;
Station* station(const StationIndex& i) const;
Station *station(size_t i) const;
Station *station(const StationIndex &i) const;
//! Find an object by its unique attribute(s)
Station* findStation(const std::string& publicID) const;
Station *findStation(const std::string& publicID) const;
Inventory* inventory() const;
Inventory *inventory() const;
//! Implement Object interface
bool assign(Object *other) override;

12
include/seiscomp/datamodel/nodalplane.h
View File

@ -54,25 +54,25 @@ class SC_SYSTEM_CORE_API NodalPlane : public Core::BaseObject {
NodalPlane();
//! Copy constructor
NodalPlane(const NodalPlane& other);
NodalPlane(const NodalPlane &other);
//! Destructor
~NodalPlane() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
NodalPlane& operator=(const NodalPlane& other);
NodalPlane &operator=(const NodalPlane &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const NodalPlane& other) const;
bool operator!=(const NodalPlane& other) const;
bool operator==(const NodalPlane &other) const;
bool operator!=(const NodalPlane &other) const;
//! Wrapper that calls operator==
bool equal(const NodalPlane& other) const;
bool equal(const NodalPlane &other) const;
// ------------------------------------------------------------------

12
include/seiscomp/datamodel/nodalplanes.h
View File

@ -53,25 +53,25 @@ class SC_SYSTEM_CORE_API NodalPlanes : public Core::BaseObject {
NodalPlanes();
//! Copy constructor
NodalPlanes(const NodalPlanes& other);
NodalPlanes(const NodalPlanes &other);
//! Destructor
~NodalPlanes() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
NodalPlanes& operator=(const NodalPlanes& other);
NodalPlanes &operator=(const NodalPlanes &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const NodalPlanes& other) const;
bool operator!=(const NodalPlanes& other) const;
bool operator==(const NodalPlanes &other) const;
bool operator!=(const NodalPlanes &other) const;
//! Wrapper that calls operator==
bool equal(const NodalPlanes& other) const;
bool equal(const NodalPlanes &other) const;
// ------------------------------------------------------------------

12
include/seiscomp/datamodel/notifier.h
View File

@ -234,8 +234,8 @@ class NotifierCreator : public Visitor {
// Interface
// ----------------------------------------------------------------------
public:
bool visit(PublicObject*);
void visit(Object*);
bool visit(PublicObject*) override;
void visit(Object*) override;
private:
Operation _operation;
@ -262,7 +262,7 @@ class NotifierStoreAppender : public Visitor {
// Interface
// ----------------------------------------------------------------------
public:
bool visit(PublicObject *po) {
bool visit(PublicObject *po) override {
if ( po->parent() == nullptr ) {
if ( _parentID.empty() )
return false;
@ -273,7 +273,7 @@ class NotifierStoreAppender : public Visitor {
return true;
}
void visit(Object *o) {
void visit(Object *o) override {
if ( o->parent() == nullptr ) {
if ( _parentID.empty() )
return;
@ -294,11 +294,11 @@ template <class T>
void AppendNotifier(T &store, Operation op, Object *o, const std::string parentID = "") {
// Remember the size of the store before any modifications
size_t endPos = store.size();
// Create a store appender and visit all child objects
NotifierStoreAppender<T> nsa(store, op, parentID);
o->accept(&nsa);
// If a parent id was specified and elements have been added to the
// store, override the parent id of the first object (o). Note: The
// position of the Notifier of o depends on the operation

8
include/seiscomp/datamodel/object.h
View File

@ -88,7 +88,7 @@ class SC_SYSTEM_CORE_API Visitor {
TM_BOTTOMUP,
TM_QUANTITY
};
// ------------------------------------------------------------------
// Xstruction
// ------------------------------------------------------------------
@ -185,7 +185,7 @@ class SC_SYSTEM_CORE_API Object : public Core::BaseObject {
//! Sets the parent element
bool setParent(PublicObject* parent);
static bool RegisterObserver(Observer*);
static bool UnregisterObserver(Observer*);
@ -211,7 +211,7 @@ class SC_SYSTEM_CORE_API Object : public Core::BaseObject {
//! it does not become registered in the global instance
//! pool but receives exactly the same publicID like
//! 'this'.
virtual Object* clone() const = 0;
virtual Object* clone() const override = 0;
//! Adds the object to a parent. If it has already
//! a parent, the method returns false.
@ -244,7 +244,7 @@ class SC_SYSTEM_CORE_API Object : public Core::BaseObject {
private:
PublicObject *_parent{nullptr};
Core::Time _lastModifiedInArchive;
typedef std::vector<Observer*> ObserverList;
static ObserverList _observers;
};

66
include/seiscomp/datamodel/origin.h
View File

@ -73,28 +73,28 @@ class SC_SYSTEM_CORE_API Origin : public PublicObject {
public:
//! Copy constructor
Origin(const Origin& other);
Origin(const Origin &other);
//! Constructor with publicID
Origin(const std::string& publicID);
//! Destructor
~Origin() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static Origin* Create();
static Origin* Create(const std::string& publicID);
static Origin *Create();
static Origin *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static Origin* Find(const std::string& publicID);
static Origin *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -103,14 +103,14 @@ class SC_SYSTEM_CORE_API Origin : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
Origin& operator=(const Origin& other);
Origin &operator=(const Origin &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Origin& other) const;
bool operator!=(const Origin& other) const;
bool operator==(const Origin &other) const;
bool operator!=(const Origin &other) const;
//! Wrapper that calls operator==
bool equal(const Origin& other) const;
bool equal(const Origin &other) const;
// ------------------------------------------------------------------
@ -212,7 +212,7 @@ class SC_SYSTEM_CORE_API Origin : public PublicObject {
CreationInfo& creationInfo();
const CreationInfo& creationInfo() const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -225,11 +225,11 @@ class SC_SYSTEM_CORE_API Origin : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(Comment* obj);
bool add(CompositeTime* obj);
bool add(Arrival* obj);
bool add(StationMagnitude* obj);
bool add(Magnitude* obj);
bool add(Comment *obj);
bool add(CompositeTime *obj);
bool add(Arrival *obj);
bool add(StationMagnitude *obj);
bool add(Magnitude *obj);
/**
* Removes an object.
@ -238,11 +238,11 @@ class SC_SYSTEM_CORE_API Origin : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(Comment* obj);
bool remove(CompositeTime* obj);
bool remove(Arrival* obj);
bool remove(StationMagnitude* obj);
bool remove(Magnitude* obj);
bool remove(Comment *obj);
bool remove(CompositeTime *obj);
bool remove(Arrival *obj);
bool remove(StationMagnitude *obj);
bool remove(Magnitude *obj);
/**
* Removes an object of a particular class.
@ -251,10 +251,10 @@ class SC_SYSTEM_CORE_API Origin : public PublicObject {
* @return false The index is out of bounds
*/
bool removeComment(size_t i);
bool removeComment(const CommentIndex& i);
bool removeComment(const CommentIndex &i);
bool removeCompositeTime(size_t i);
bool removeArrival(size_t i);
bool removeArrival(const ArrivalIndex& i);
bool removeArrival(const ArrivalIndex &i);
bool removeStationMagnitude(size_t i);
bool removeMagnitude(size_t i);
@ -267,21 +267,21 @@ class SC_SYSTEM_CORE_API Origin : public PublicObject {
//! Index access
//! @return The object at index i
Comment* comment(size_t i) const;
Comment* comment(const CommentIndex& i) const;
CompositeTime* compositeTime(size_t i) const;
Comment *comment(size_t i) const;
Comment *comment(const CommentIndex &i) const;
CompositeTime *compositeTime(size_t i) const;
Arrival* arrival(size_t i) const;
Arrival* arrival(const ArrivalIndex& i) const;
StationMagnitude* stationMagnitude(size_t i) const;
Magnitude* magnitude(size_t i) const;
Arrival *arrival(size_t i) const;
Arrival *arrival(const ArrivalIndex &i) const;
StationMagnitude *stationMagnitude(size_t i) const;
Magnitude *magnitude(size_t i) const;
//! Find an object by its unique attribute(s)
CompositeTime* findCompositeTime(CompositeTime* compositeTime) const;
StationMagnitude* findStationMagnitude(const std::string& publicID) const;
Magnitude* findMagnitude(const std::string& publicID) const;
CompositeTime *findCompositeTime(CompositeTime *compositeTime) const;
StationMagnitude *findStationMagnitude(const std::string& publicID) const;
Magnitude *findMagnitude(const std::string& publicID) const;
EventParameters* eventParameters() const;
EventParameters *eventParameters() const;
//! Implement Object interface
bool assign(Object *other) override;

12
include/seiscomp/datamodel/originquality.h
View File

@ -54,25 +54,25 @@ class SC_SYSTEM_CORE_API OriginQuality : public Core::BaseObject {
OriginQuality();
//! Copy constructor
OriginQuality(const OriginQuality& other);
OriginQuality(const OriginQuality &other);
//! Destructor
~OriginQuality() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
OriginQuality& operator=(const OriginQuality& other);
OriginQuality &operator=(const OriginQuality &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const OriginQuality& other) const;
bool operator!=(const OriginQuality& other) const;
bool operator==(const OriginQuality &other) const;
bool operator!=(const OriginQuality &other) const;
//! Wrapper that calls operator==
bool equal(const OriginQuality& other) const;
bool equal(const OriginQuality &other) const;
// ------------------------------------------------------------------

20
include/seiscomp/datamodel/originreference.h
View File

@ -78,28 +78,28 @@ class SC_SYSTEM_CORE_API OriginReference : public Object {
OriginReference();
//! Copy constructor
OriginReference(const OriginReference& other);
OriginReference(const OriginReference &other);
//! Custom constructor
OriginReference(const std::string& originID);
//! Destructor
~OriginReference() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
OriginReference& operator=(const OriginReference& other);
OriginReference &operator=(const OriginReference &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const OriginReference& other) const;
bool operator!=(const OriginReference& other) const;
bool operator==(const OriginReference &other) const;
bool operator!=(const OriginReference &other) const;
//! Wrapper that calls operator==
bool equal(const OriginReference& other) const;
bool equal(const OriginReference &other) const;
// ------------------------------------------------------------------
@ -115,17 +115,17 @@ class SC_SYSTEM_CORE_API OriginReference : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const OriginReferenceIndex& index() const;
const OriginReferenceIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const OriginReference* lhs) const;
bool equalIndex(const OriginReference *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Event* event() const;
Event *event() const;
//! Implement Object interface
bool assign(Object *other) override;

12
include/seiscomp/datamodel/originuncertainty.h
View File

@ -60,25 +60,25 @@ class SC_SYSTEM_CORE_API OriginUncertainty : public Core::BaseObject {
OriginUncertainty();
//! Copy constructor
OriginUncertainty(const OriginUncertainty& other);
OriginUncertainty(const OriginUncertainty &other);
//! Destructor
~OriginUncertainty() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
OriginUncertainty& operator=(const OriginUncertainty& other);
OriginUncertainty &operator=(const OriginUncertainty &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const OriginUncertainty& other) const;
bool operator!=(const OriginUncertainty& other) const;
bool operator==(const OriginUncertainty &other) const;
bool operator!=(const OriginUncertainty &other) const;
//! Wrapper that calls operator==
bool equal(const OriginUncertainty& other) const;
bool equal(const OriginUncertainty &other) const;
// ------------------------------------------------------------------

20
include/seiscomp/datamodel/outage.h
View File

@ -82,25 +82,25 @@ class SC_SYSTEM_CORE_API Outage : public Object {
Outage();
//! Copy constructor
Outage(const Outage& other);
Outage(const Outage &other);
//! Destructor
~Outage() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
Outage& operator=(const Outage& other);
Outage &operator=(const Outage &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Outage& other) const;
bool operator!=(const Outage& other) const;
bool operator==(const Outage &other) const;
bool operator!=(const Outage &other) const;
//! Wrapper that calls operator==
bool equal(const Outage& other) const;
bool equal(const Outage &other) const;
// ------------------------------------------------------------------
@ -129,17 +129,17 @@ class SC_SYSTEM_CORE_API Outage : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const OutageIndex& index() const;
const OutageIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const Outage* lhs) const;
bool equalIndex(const Outage *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
QualityControl* qualityControl() const;
QualityControl *qualityControl() const;
//! Implement Object interface
bool assign(Object *other) override;

32
include/seiscomp/datamodel/parameter.h
View File

@ -54,28 +54,28 @@ class SC_SYSTEM_CORE_API Parameter : public PublicObject {
public:
//! Copy constructor
Parameter(const Parameter& other);
Parameter(const Parameter &other);
//! Constructor with publicID
Parameter(const std::string& publicID);
//! Destructor
~Parameter() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static Parameter* Create();
static Parameter* Create(const std::string& publicID);
static Parameter *Create();
static Parameter *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static Parameter* Find(const std::string& publicID);
static Parameter *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -84,14 +84,14 @@ class SC_SYSTEM_CORE_API Parameter : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
Parameter& operator=(const Parameter& other);
Parameter &operator=(const Parameter &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Parameter& other) const;
bool operator!=(const Parameter& other) const;
bool operator==(const Parameter &other) const;
bool operator!=(const Parameter &other) const;
//! Wrapper that calls operator==
bool equal(const Parameter& other) const;
bool equal(const Parameter &other) const;
// ------------------------------------------------------------------
@ -104,7 +104,7 @@ class SC_SYSTEM_CORE_API Parameter : public PublicObject {
void setValue(const std::string& value);
const std::string& value() const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -117,7 +117,7 @@ class SC_SYSTEM_CORE_API Parameter : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(Comment* obj);
bool add(Comment *obj);
/**
* Removes an object.
@ -126,7 +126,7 @@ class SC_SYSTEM_CORE_API Parameter : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(Comment* obj);
bool remove(Comment *obj);
/**
* Removes an object of a particular class.
@ -135,19 +135,19 @@ class SC_SYSTEM_CORE_API Parameter : public PublicObject {
* @return false The index is out of bounds
*/
bool removeComment(size_t i);
bool removeComment(const CommentIndex& i);
bool removeComment(const CommentIndex &i);
//! Retrieve the number of objects of a particular class
size_t commentCount() const;
//! Index access
//! @return The object at index i
Comment* comment(size_t i) const;
Comment* comment(const CommentIndex& i) const;
Comment *comment(size_t i) const;
Comment *comment(const CommentIndex &i) const;
//! Find an object by its unique attribute(s)
ParameterSet* parameterSet() const;
ParameterSet *parameterSet() const;
//! Implement Object interface
bool assign(Object *other) override;

40
include/seiscomp/datamodel/parameterset.h
View File

@ -56,28 +56,28 @@ class SC_SYSTEM_CORE_API ParameterSet : public PublicObject {
public:
//! Copy constructor
ParameterSet(const ParameterSet& other);
ParameterSet(const ParameterSet &other);
//! Constructor with publicID
ParameterSet(const std::string& publicID);
//! Destructor
~ParameterSet() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static ParameterSet* Create();
static ParameterSet* Create(const std::string& publicID);
static ParameterSet *Create();
static ParameterSet *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static ParameterSet* Find(const std::string& publicID);
static ParameterSet *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -86,14 +86,14 @@ class SC_SYSTEM_CORE_API ParameterSet : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
ParameterSet& operator=(const ParameterSet& other);
ParameterSet &operator=(const ParameterSet &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const ParameterSet& other) const;
bool operator!=(const ParameterSet& other) const;
bool operator==(const ParameterSet &other) const;
bool operator!=(const ParameterSet &other) const;
//! Wrapper that calls operator==
bool equal(const ParameterSet& other) const;
bool equal(const ParameterSet &other) const;
// ------------------------------------------------------------------
@ -109,7 +109,7 @@ class SC_SYSTEM_CORE_API ParameterSet : public PublicObject {
void setCreated(const OPT(Seiscomp::Core::Time)& created);
Seiscomp::Core::Time created() const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -122,8 +122,8 @@ class SC_SYSTEM_CORE_API ParameterSet : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(Parameter* obj);
bool add(Comment* obj);
bool add(Parameter *obj);
bool add(Comment *obj);
/**
* Removes an object.
@ -132,8 +132,8 @@ class SC_SYSTEM_CORE_API ParameterSet : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(Parameter* obj);
bool remove(Comment* obj);
bool remove(Parameter *obj);
bool remove(Comment *obj);
/**
* Removes an object of a particular class.
@ -143,7 +143,7 @@ class SC_SYSTEM_CORE_API ParameterSet : public PublicObject {
*/
bool removeParameter(size_t i);
bool removeComment(size_t i);
bool removeComment(const CommentIndex& i);
bool removeComment(const CommentIndex &i);
//! Retrieve the number of objects of a particular class
size_t parameterCount() const;
@ -151,15 +151,15 @@ class SC_SYSTEM_CORE_API ParameterSet : public PublicObject {
//! Index access
//! @return The object at index i
Parameter* parameter(size_t i) const;
Parameter *parameter(size_t i) const;
Comment* comment(size_t i) const;
Comment* comment(const CommentIndex& i) const;
Comment *comment(size_t i) const;
Comment *comment(const CommentIndex &i) const;
//! Find an object by its unique attribute(s)
Parameter* findParameter(const std::string& publicID) const;
Parameter *findParameter(const std::string& publicID) const;
Config* config() const;
Config *config() const;
//! Implement Object interface
bool assign(Object *other) override;

12
include/seiscomp/datamodel/phase.h
View File

@ -52,14 +52,14 @@ class SC_SYSTEM_CORE_API Phase : public Core::BaseObject {
Phase();
//! Copy constructor
Phase(const Phase& other);
Phase(const Phase &other);
//! Custom constructor
Phase(const std::string& code);
//! Destructor
~Phase() override;
// ------------------------------------------------------------------
// Operators
@ -69,14 +69,14 @@ class SC_SYSTEM_CORE_API Phase : public Core::BaseObject {
operator const std::string&() const;
//! Copies the metadata of other to this
Phase& operator=(const Phase& other);
Phase &operator=(const Phase &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Phase& other) const;
bool operator!=(const Phase& other) const;
bool operator==(const Phase &other) const;
bool operator!=(const Phase &other) const;
//! Wrapper that calls operator==
bool equal(const Phase& other) const;
bool equal(const Phase &other) const;
// ------------------------------------------------------------------

32
include/seiscomp/datamodel/pick.h
View File

@ -66,28 +66,28 @@ class SC_SYSTEM_CORE_API Pick : public PublicObject {
public:
//! Copy constructor
Pick(const Pick& other);
Pick(const Pick &other);
//! Constructor with publicID
Pick(const std::string& publicID);
//! Destructor
~Pick() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static Pick* Create();
static Pick* Create(const std::string& publicID);
static Pick *Create();
static Pick *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static Pick* Find(const std::string& publicID);
static Pick *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -96,14 +96,14 @@ class SC_SYSTEM_CORE_API Pick : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
Pick& operator=(const Pick& other);
Pick &operator=(const Pick &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Pick& other) const;
bool operator!=(const Pick& other) const;
bool operator==(const Pick &other) const;
bool operator!=(const Pick &other) const;
//! Wrapper that calls operator==
bool equal(const Pick& other) const;
bool equal(const Pick &other) const;
// ------------------------------------------------------------------
@ -178,7 +178,7 @@ class SC_SYSTEM_CORE_API Pick : public PublicObject {
CreationInfo& creationInfo();
const CreationInfo& creationInfo() const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -191,7 +191,7 @@ class SC_SYSTEM_CORE_API Pick : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(Comment* obj);
bool add(Comment *obj);
/**
* Removes an object.
@ -200,7 +200,7 @@ class SC_SYSTEM_CORE_API Pick : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(Comment* obj);
bool remove(Comment *obj);
/**
* Removes an object of a particular class.
@ -209,19 +209,19 @@ class SC_SYSTEM_CORE_API Pick : public PublicObject {
* @return false The index is out of bounds
*/
bool removeComment(size_t i);
bool removeComment(const CommentIndex& i);
bool removeComment(const CommentIndex &i);
//! Retrieve the number of objects of a particular class
size_t commentCount() const;
//! Index access
//! @return The object at index i
Comment* comment(size_t i) const;
Comment* comment(const CommentIndex& i) const;
Comment *comment(size_t i) const;
Comment *comment(const CommentIndex &i) const;
//! Find an object by its unique attribute(s)
EventParameters* eventParameters() const;
EventParameters *eventParameters() const;
//! Implement Object interface
bool assign(Object *other) override;

20
include/seiscomp/datamodel/pickreference.h
View File

@ -78,28 +78,28 @@ class SC_SYSTEM_CORE_API PickReference : public Object {
PickReference();
//! Copy constructor
PickReference(const PickReference& other);
PickReference(const PickReference &other);
//! Custom constructor
PickReference(const std::string& pickID);
//! Destructor
~PickReference() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
PickReference& operator=(const PickReference& other);
PickReference &operator=(const PickReference &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const PickReference& other) const;
bool operator!=(const PickReference& other) const;
bool operator==(const PickReference &other) const;
bool operator!=(const PickReference &other) const;
//! Wrapper that calls operator==
bool equal(const PickReference& other) const;
bool equal(const PickReference &other) const;
// ------------------------------------------------------------------
@ -115,17 +115,17 @@ class SC_SYSTEM_CORE_API PickReference : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const PickReferenceIndex& index() const;
const PickReferenceIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const PickReference* lhs) const;
bool equalIndex(const PickReference *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Reading* reading() const;
Reading *reading() const;
//! Implement Object interface
bool assign(Object *other) override;

12
include/seiscomp/datamodel/principalaxes.h
View File

@ -53,25 +53,25 @@ class SC_SYSTEM_CORE_API PrincipalAxes : public Core::BaseObject {
PrincipalAxes();
//! Copy constructor
PrincipalAxes(const PrincipalAxes& other);
PrincipalAxes(const PrincipalAxes &other);
//! Destructor
~PrincipalAxes() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
PrincipalAxes& operator=(const PrincipalAxes& other);
PrincipalAxes &operator=(const PrincipalAxes &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const PrincipalAxes& other) const;
bool operator!=(const PrincipalAxes& other) const;
bool operator==(const PrincipalAxes &other) const;
bool operator!=(const PrincipalAxes &other) const;
//! Wrapper that calls operator==
bool equal(const PrincipalAxes& other) const;
bool equal(const PrincipalAxes &other) const;
// ------------------------------------------------------------------

2
include/seiscomp/datamodel/publicobject.h
View File

@ -227,7 +227,7 @@ class SC_SYSTEM_CORE_API PublicObject : public Object {
virtual bool updateChild(Object*) = 0;
//! Visitor interface
virtual void accept(Visitor*) = 0;
virtual void accept(Visitor*) override = 0;
// ------------------------------------------------------------------

3
include/seiscomp/datamodel/publicobjectcache.h
View File

@ -246,8 +246,7 @@ class SC_SYSTEM_CORE_API PublicObjectCache : public Core::BaseObject {
Core::TimeWindow timeWindow() const;
template <typename T>
typename Core::SmartPointer<T>::Impl
get(const std::string &publicID) {
Core::SmartPointer<T> get(const std::string &publicID) {
return static_cast<T*>(find(T::TypeInfo(), publicID));
}

71
include/seiscomp/datamodel/qclog.h
View File

@ -38,37 +38,6 @@ DEFINE_SMARTPOINTER(QCLog);
class QualityControl;
class SC_SYSTEM_CORE_API QCLogIndex {
// ------------------------------------------------------------------
// Xstruction
// ------------------------------------------------------------------
public:
//! Constructor
QCLogIndex();
QCLogIndex(Seiscomp::Core::Time start,
const WaveformStreamID& waveformID);
//! Copy constructor
QCLogIndex(const QCLogIndex&);
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
bool operator==(const QCLogIndex&) const;
bool operator!=(const QCLogIndex&) const;
// ------------------------------------------------------------------
// Attributes
// ------------------------------------------------------------------
public:
Seiscomp::Core::Time start;
WaveformStreamID waveformID;
};
class SC_SYSTEM_CORE_API QCLog : public PublicObject {
DECLARE_SC_CLASS(QCLog)
DECLARE_SERIALIZATION;
@ -83,28 +52,28 @@ class SC_SYSTEM_CORE_API QCLog : public PublicObject {
public:
//! Copy constructor
QCLog(const QCLog& other);
QCLog(const QCLog &other);
//! Constructor with publicID
QCLog(const std::string& publicID);
//! Destructor
~QCLog() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static QCLog* Create();
static QCLog* Create(const std::string& publicID);
static QCLog *Create();
static QCLog *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static QCLog* Find(const std::string& publicID);
static QCLog *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -113,20 +82,24 @@ class SC_SYSTEM_CORE_API QCLog : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
QCLog& operator=(const QCLog& other);
QCLog &operator=(const QCLog &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const QCLog& other) const;
bool operator!=(const QCLog& other) const;
bool operator==(const QCLog &other) const;
bool operator!=(const QCLog &other) const;
//! Wrapper that calls operator==
bool equal(const QCLog& other) const;
bool equal(const QCLog &other) const;
// ------------------------------------------------------------------
// Setters/Getters
// ------------------------------------------------------------------
public:
//! The waveform identifier for which the annotation is valid.
//! Each component
//! can contain wildcards (asterisk or question mark) but no
//! regular expressions.
void setWaveformID(const WaveformStreamID& waveformID);
WaveformStreamID& waveformID();
const WaveformStreamID& waveformID() const;
@ -147,22 +120,11 @@ class SC_SYSTEM_CORE_API QCLog : public PublicObject {
const std::string& message() const;
// ------------------------------------------------------------------
// Index management
// ------------------------------------------------------------------
public:
//! Returns the object's index
const QCLogIndex& index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const QCLog* lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
QualityControl* qualityControl() const;
QualityControl *qualityControl() const;
//! Implement Object interface
bool assign(Object *other) override;
@ -183,12 +145,11 @@ class SC_SYSTEM_CORE_API QCLog : public PublicObject {
// Implementation
// ------------------------------------------------------------------
private:
// Index
QCLogIndex _index;
// Attributes
WaveformStreamID _waveformID;
std::string _creatorID;
Seiscomp::Core::Time _created;
Seiscomp::Core::Time _start;
Seiscomp::Core::Time _end;
std::string _message;

45
include/seiscomp/datamodel/qualitycontrol.h
View File

@ -23,7 +23,6 @@
#include <vector>
#include <seiscomp/datamodel/qclog.h>
#include <seiscomp/datamodel/waveformquality.h>
#include <seiscomp/datamodel/outage.h>
#include <seiscomp/datamodel/notifier.h>
@ -54,11 +53,11 @@ class SC_SYSTEM_CORE_API QualityControl : public PublicObject {
QualityControl();
//! Copy constructor
QualityControl(const QualityControl& other);
QualityControl(const QualityControl &other);
//! Destructor
~QualityControl() override;
// ------------------------------------------------------------------
// Operators
@ -66,16 +65,16 @@ class SC_SYSTEM_CORE_API QualityControl : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
QualityControl& operator=(const QualityControl& other);
QualityControl &operator=(const QualityControl &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const QualityControl& other) const;
bool operator!=(const QualityControl& other) const;
bool operator==(const QualityControl &other) const;
bool operator!=(const QualityControl &other) const;
//! Wrapper that calls operator==
bool equal(const QualityControl& other) const;
bool equal(const QualityControl &other) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -88,9 +87,9 @@ class SC_SYSTEM_CORE_API QualityControl : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(QCLog* obj);
bool add(WaveformQuality* obj);
bool add(Outage* obj);
bool add(QCLog *obj);
bool add(WaveformQuality *obj);
bool add(Outage *obj);
/**
* Removes an object.
@ -99,9 +98,9 @@ class SC_SYSTEM_CORE_API QualityControl : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(QCLog* obj);
bool remove(WaveformQuality* obj);
bool remove(Outage* obj);
bool remove(QCLog *obj);
bool remove(WaveformQuality *obj);
bool remove(Outage *obj);
/**
* Removes an object of a particular class.
@ -110,11 +109,10 @@ class SC_SYSTEM_CORE_API QualityControl : public PublicObject {
* @return false The index is out of bounds
*/
bool removeQCLog(size_t i);
bool removeQCLog(const QCLogIndex& i);
bool removeWaveformQuality(size_t i);
bool removeWaveformQuality(const WaveformQualityIndex& i);
bool removeWaveformQuality(const WaveformQualityIndex &i);
bool removeOutage(size_t i);
bool removeOutage(const OutageIndex& i);
bool removeOutage(const OutageIndex &i);
//! Retrieve the number of objects of a particular class
size_t qCLogCount() const;
@ -123,17 +121,16 @@ class SC_SYSTEM_CORE_API QualityControl : public PublicObject {
//! Index access
//! @return The object at index i
QCLog* qCLog(size_t i) const;
QCLog* qCLog(const QCLogIndex& i) const;
QCLog *qCLog(size_t i) const;
WaveformQuality* waveformQuality(size_t i) const;
WaveformQuality* waveformQuality(const WaveformQualityIndex& i) const;
WaveformQuality *waveformQuality(size_t i) const;
WaveformQuality *waveformQuality(const WaveformQualityIndex &i) const;
Outage* outage(size_t i) const;
Outage* outage(const OutageIndex& i) const;
Outage *outage(size_t i) const;
Outage *outage(const OutageIndex &i) const;
//! Find an object by its unique attribute(s)
QCLog* findQCLog(const std::string& publicID) const;
QCLog *findQCLog(const std::string& publicID) const;
//! Implement Object interface
bool assign(Object *other) override;

42
include/seiscomp/datamodel/reading.h
View File

@ -61,28 +61,28 @@ class SC_SYSTEM_CORE_API Reading : public PublicObject {
public:
//! Copy constructor
Reading(const Reading& other);
Reading(const Reading &other);
//! Constructor with publicID
Reading(const std::string& publicID);
//! Destructor
~Reading() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static Reading* Create();
static Reading* Create(const std::string& publicID);
static Reading *Create();
static Reading *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static Reading* Find(const std::string& publicID);
static Reading *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -91,16 +91,16 @@ class SC_SYSTEM_CORE_API Reading : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
Reading& operator=(const Reading& other);
Reading &operator=(const Reading &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Reading& other) const;
bool operator!=(const Reading& other) const;
bool operator==(const Reading &other) const;
bool operator!=(const Reading &other) const;
//! Wrapper that calls operator==
bool equal(const Reading& other) const;
bool equal(const Reading &other) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -113,8 +113,8 @@ class SC_SYSTEM_CORE_API Reading : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(PickReference* obj);
bool add(AmplitudeReference* obj);
bool add(PickReference *obj);
bool add(AmplitudeReference *obj);
/**
* Removes an object.
@ -123,8 +123,8 @@ class SC_SYSTEM_CORE_API Reading : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(PickReference* obj);
bool remove(AmplitudeReference* obj);
bool remove(PickReference *obj);
bool remove(AmplitudeReference *obj);
/**
* Removes an object of a particular class.
@ -133,9 +133,9 @@ class SC_SYSTEM_CORE_API Reading : public PublicObject {
* @return false The index is out of bounds
*/
bool removePickReference(size_t i);
bool removePickReference(const PickReferenceIndex& i);
bool removePickReference(const PickReferenceIndex &i);
bool removeAmplitudeReference(size_t i);
bool removeAmplitudeReference(const AmplitudeReferenceIndex& i);
bool removeAmplitudeReference(const AmplitudeReferenceIndex &i);
//! Retrieve the number of objects of a particular class
size_t pickReferenceCount() const;
@ -143,15 +143,15 @@ class SC_SYSTEM_CORE_API Reading : public PublicObject {
//! Index access
//! @return The object at index i
PickReference* pickReference(size_t i) const;
PickReference* pickReference(const PickReferenceIndex& i) const;
PickReference *pickReference(size_t i) const;
PickReference *pickReference(const PickReferenceIndex &i) const;
AmplitudeReference* amplitudeReference(size_t i) const;
AmplitudeReference* amplitudeReference(const AmplitudeReferenceIndex& i) const;
AmplitudeReference *amplitudeReference(size_t i) const;
AmplitudeReference *amplitudeReference(const AmplitudeReferenceIndex &i) const;
//! Find an object by its unique attribute(s)
EventParameters* eventParameters() const;
EventParameters *eventParameters() const;
//! Implement Object interface
bool assign(Object *other) override;

16
include/seiscomp/datamodel/realarray.h
View File

@ -48,25 +48,25 @@ class SC_SYSTEM_CORE_API RealArray : public Core::BaseObject {
RealArray();
//! Copy constructor
RealArray(const RealArray& other);
RealArray(const RealArray &other);
//! Destructor
~RealArray() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
RealArray& operator=(const RealArray& other);
RealArray &operator=(const RealArray &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const RealArray& other) const;
bool operator!=(const RealArray& other) const;
bool operator==(const RealArray &other) const;
bool operator!=(const RealArray &other) const;
//! Wrapper that calls operator==
bool equal(const RealArray& other) const;
bool equal(const RealArray &other) const;
// ------------------------------------------------------------------
@ -74,8 +74,8 @@ class SC_SYSTEM_CORE_API RealArray : public Core::BaseObject {
// ------------------------------------------------------------------
public:
void setContent(const std::vector< double >&);
const std::vector< double >& content() const;
std::vector< double >& content();
const std::vector< double > &content() const;
std::vector< double > &content();
// ------------------------------------------------------------------

12
include/seiscomp/datamodel/realpdf1d.h
View File

@ -73,25 +73,25 @@ class SC_SYSTEM_CORE_API RealPDF1D : public Core::BaseObject {
RealPDF1D();
//! Copy constructor
RealPDF1D(const RealPDF1D& other);
RealPDF1D(const RealPDF1D &other);
//! Destructor
~RealPDF1D() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
RealPDF1D& operator=(const RealPDF1D& other);
RealPDF1D &operator=(const RealPDF1D &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const RealPDF1D& other) const;
bool operator!=(const RealPDF1D& other) const;
bool operator==(const RealPDF1D &other) const;
bool operator!=(const RealPDF1D &other) const;
//! Wrapper that calls operator==
bool equal(const RealPDF1D& other) const;
bool equal(const RealPDF1D &other) const;
// ------------------------------------------------------------------

12
include/seiscomp/datamodel/realquantity.h
View File

@ -67,7 +67,7 @@ class SC_SYSTEM_CORE_API RealQuantity : public Core::BaseObject {
RealQuantity();
//! Copy constructor
RealQuantity(const RealQuantity& other);
RealQuantity(const RealQuantity &other);
//! Custom constructor
RealQuantity(double value,
@ -79,7 +79,7 @@ class SC_SYSTEM_CORE_API RealQuantity : public Core::BaseObject {
//! Destructor
~RealQuantity() override;
// ------------------------------------------------------------------
// Operators
@ -89,14 +89,14 @@ class SC_SYSTEM_CORE_API RealQuantity : public Core::BaseObject {
operator double() const;
//! Copies the metadata of other to this
RealQuantity& operator=(const RealQuantity& other);
RealQuantity &operator=(const RealQuantity &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const RealQuantity& other) const;
bool operator!=(const RealQuantity& other) const;
bool operator==(const RealQuantity &other) const;
bool operator!=(const RealQuantity &other) const;
//! Wrapper that calls operator==
bool equal(const RealQuantity& other) const;
bool equal(const RealQuantity &other) const;
// ------------------------------------------------------------------

26
include/seiscomp/datamodel/responsefap.h
View File

@ -87,28 +87,28 @@ class SC_SYSTEM_CORE_API ResponseFAP : public PublicObject {
public:
//! Copy constructor
ResponseFAP(const ResponseFAP& other);
ResponseFAP(const ResponseFAP &other);
//! Constructor with publicID
ResponseFAP(const std::string& publicID);
//! Destructor
~ResponseFAP() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static ResponseFAP* Create();
static ResponseFAP* Create(const std::string& publicID);
static ResponseFAP *Create();
static ResponseFAP *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static ResponseFAP* Find(const std::string& publicID);
static ResponseFAP *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -117,14 +117,14 @@ class SC_SYSTEM_CORE_API ResponseFAP : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
ResponseFAP& operator=(const ResponseFAP& other);
ResponseFAP &operator=(const ResponseFAP &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const ResponseFAP& other) const;
bool operator!=(const ResponseFAP& other) const;
bool operator==(const ResponseFAP &other) const;
bool operator!=(const ResponseFAP &other) const;
//! Wrapper that calls operator==
bool equal(const ResponseFAP& other) const;
bool equal(const ResponseFAP &other) const;
// ------------------------------------------------------------------
@ -165,17 +165,17 @@ class SC_SYSTEM_CORE_API ResponseFAP : public PublicObject {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const ResponseFAPIndex& index() const;
const ResponseFAPIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const ResponseFAP* lhs) const;
bool equalIndex(const ResponseFAP *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Inventory* inventory() const;
Inventory *inventory() const;
//! Implement Object interface
bool assign(Object *other) override;

26
include/seiscomp/datamodel/responsefir.h
View File

@ -84,28 +84,28 @@ class SC_SYSTEM_CORE_API ResponseFIR : public PublicObject {
public:
//! Copy constructor
ResponseFIR(const ResponseFIR& other);
ResponseFIR(const ResponseFIR &other);
//! Constructor with publicID
ResponseFIR(const std::string& publicID);
//! Destructor
~ResponseFIR() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static ResponseFIR* Create();
static ResponseFIR* Create(const std::string& publicID);
static ResponseFIR *Create();
static ResponseFIR *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static ResponseFIR* Find(const std::string& publicID);
static ResponseFIR *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -114,14 +114,14 @@ class SC_SYSTEM_CORE_API ResponseFIR : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
ResponseFIR& operator=(const ResponseFIR& other);
ResponseFIR &operator=(const ResponseFIR &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const ResponseFIR& other) const;
bool operator!=(const ResponseFIR& other) const;
bool operator==(const ResponseFIR &other) const;
bool operator!=(const ResponseFIR &other) const;
//! Wrapper that calls operator==
bool equal(const ResponseFIR& other) const;
bool equal(const ResponseFIR &other) const;
// ------------------------------------------------------------------
@ -175,17 +175,17 @@ class SC_SYSTEM_CORE_API ResponseFIR : public PublicObject {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const ResponseFIRIndex& index() const;
const ResponseFIRIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const ResponseFIR* lhs) const;
bool equalIndex(const ResponseFIR *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Inventory* inventory() const;
Inventory *inventory() const;
//! Implement Object interface
bool assign(Object *other) override;

26
include/seiscomp/datamodel/responseiir.h
View File

@ -84,28 +84,28 @@ class SC_SYSTEM_CORE_API ResponseIIR : public PublicObject {
public:
//! Copy constructor
ResponseIIR(const ResponseIIR& other);
ResponseIIR(const ResponseIIR &other);
//! Constructor with publicID
ResponseIIR(const std::string& publicID);
//! Destructor
~ResponseIIR() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static ResponseIIR* Create();
static ResponseIIR* Create(const std::string& publicID);
static ResponseIIR *Create();
static ResponseIIR *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static ResponseIIR* Find(const std::string& publicID);
static ResponseIIR *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -114,14 +114,14 @@ class SC_SYSTEM_CORE_API ResponseIIR : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
ResponseIIR& operator=(const ResponseIIR& other);
ResponseIIR &operator=(const ResponseIIR &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const ResponseIIR& other) const;
bool operator!=(const ResponseIIR& other) const;
bool operator==(const ResponseIIR &other) const;
bool operator!=(const ResponseIIR &other) const;
//! Wrapper that calls operator==
bool equal(const ResponseIIR& other) const;
bool equal(const ResponseIIR &other) const;
// ------------------------------------------------------------------
@ -186,17 +186,17 @@ class SC_SYSTEM_CORE_API ResponseIIR : public PublicObject {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const ResponseIIRIndex& index() const;
const ResponseIIRIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const ResponseIIR* lhs) const;
bool equalIndex(const ResponseIIR *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Inventory* inventory() const;
Inventory *inventory() const;
//! Implement Object interface
bool assign(Object *other) override;

26
include/seiscomp/datamodel/responsepaz.h
View File

@ -84,28 +84,28 @@ class SC_SYSTEM_CORE_API ResponsePAZ : public PublicObject {
public:
//! Copy constructor
ResponsePAZ(const ResponsePAZ& other);
ResponsePAZ(const ResponsePAZ &other);
//! Constructor with publicID
ResponsePAZ(const std::string& publicID);
//! Destructor
~ResponsePAZ() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static ResponsePAZ* Create();
static ResponsePAZ* Create(const std::string& publicID);
static ResponsePAZ *Create();
static ResponsePAZ *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static ResponsePAZ* Find(const std::string& publicID);
static ResponsePAZ *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -114,14 +114,14 @@ class SC_SYSTEM_CORE_API ResponsePAZ : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
ResponsePAZ& operator=(const ResponsePAZ& other);
ResponsePAZ &operator=(const ResponsePAZ &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const ResponsePAZ& other) const;
bool operator!=(const ResponsePAZ& other) const;
bool operator==(const ResponsePAZ &other) const;
bool operator!=(const ResponsePAZ &other) const;
//! Wrapper that calls operator==
bool equal(const ResponsePAZ& other) const;
bool equal(const ResponsePAZ &other) const;
// ------------------------------------------------------------------
@ -194,17 +194,17 @@ class SC_SYSTEM_CORE_API ResponsePAZ : public PublicObject {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const ResponsePAZIndex& index() const;
const ResponsePAZIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const ResponsePAZ* lhs) const;
bool equalIndex(const ResponsePAZ *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Inventory* inventory() const;
Inventory *inventory() const;
//! Implement Object interface
bool assign(Object *other) override;

26
include/seiscomp/datamodel/responsepolynomial.h
View File

@ -84,28 +84,28 @@ class SC_SYSTEM_CORE_API ResponsePolynomial : public PublicObject {
public:
//! Copy constructor
ResponsePolynomial(const ResponsePolynomial& other);
ResponsePolynomial(const ResponsePolynomial &other);
//! Constructor with publicID
ResponsePolynomial(const std::string& publicID);
//! Destructor
~ResponsePolynomial() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static ResponsePolynomial* Create();
static ResponsePolynomial* Create(const std::string& publicID);
static ResponsePolynomial *Create();
static ResponsePolynomial *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static ResponsePolynomial* Find(const std::string& publicID);
static ResponsePolynomial *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -114,14 +114,14 @@ class SC_SYSTEM_CORE_API ResponsePolynomial : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
ResponsePolynomial& operator=(const ResponsePolynomial& other);
ResponsePolynomial &operator=(const ResponsePolynomial &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const ResponsePolynomial& other) const;
bool operator!=(const ResponsePolynomial& other) const;
bool operator==(const ResponsePolynomial &other) const;
bool operator!=(const ResponsePolynomial &other) const;
//! Wrapper that calls operator==
bool equal(const ResponsePolynomial& other) const;
bool equal(const ResponsePolynomial &other) const;
// ------------------------------------------------------------------
@ -185,17 +185,17 @@ class SC_SYSTEM_CORE_API ResponsePolynomial : public PublicObject {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const ResponsePolynomialIndex& index() const;
const ResponsePolynomialIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const ResponsePolynomial* lhs) const;
bool equalIndex(const ResponsePolynomial *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Inventory* inventory() const;
Inventory *inventory() const;
//! Implement Object interface
bool assign(Object *other) override;

46
include/seiscomp/datamodel/route.h
View File

@ -95,28 +95,28 @@ class SC_SYSTEM_CORE_API Route : public PublicObject {
public:
//! Copy constructor
Route(const Route& other);
Route(const Route &other);
//! Constructor with publicID
Route(const std::string& publicID);
//! Destructor
~Route() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static Route* Create();
static Route* Create(const std::string& publicID);
static Route *Create();
static Route *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static Route* Find(const std::string& publicID);
static Route *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -125,14 +125,14 @@ class SC_SYSTEM_CORE_API Route : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
Route& operator=(const Route& other);
Route &operator=(const Route &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Route& other) const;
bool operator!=(const Route& other) const;
bool operator==(const Route &other) const;
bool operator!=(const Route &other) const;
//! Wrapper that calls operator==
bool equal(const Route& other) const;
bool equal(const Route &other) const;
// ------------------------------------------------------------------
@ -161,12 +161,12 @@ class SC_SYSTEM_CORE_API Route : public PublicObject {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const RouteIndex& index() const;
const RouteIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const Route* lhs) const;
bool equalIndex(const Route *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -179,8 +179,8 @@ class SC_SYSTEM_CORE_API Route : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(RouteArclink* obj);
bool add(RouteSeedlink* obj);
bool add(RouteArclink *obj);
bool add(RouteSeedlink *obj);
/**
* Removes an object.
@ -189,8 +189,8 @@ class SC_SYSTEM_CORE_API Route : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(RouteArclink* obj);
bool remove(RouteSeedlink* obj);
bool remove(RouteArclink *obj);
bool remove(RouteSeedlink *obj);
/**
* Removes an object of a particular class.
@ -199,9 +199,9 @@ class SC_SYSTEM_CORE_API Route : public PublicObject {
* @return false The index is out of bounds
*/
bool removeRouteArclink(size_t i);
bool removeRouteArclink(const RouteArclinkIndex& i);
bool removeRouteArclink(const RouteArclinkIndex &i);
bool removeRouteSeedlink(size_t i);
bool removeRouteSeedlink(const RouteSeedlinkIndex& i);
bool removeRouteSeedlink(const RouteSeedlinkIndex &i);
//! Retrieve the number of objects of a particular class
size_t routeArclinkCount() const;
@ -209,15 +209,15 @@ class SC_SYSTEM_CORE_API Route : public PublicObject {
//! Index access
//! @return The object at index i
RouteArclink* routeArclink(size_t i) const;
RouteArclink* routeArclink(const RouteArclinkIndex& i) const;
RouteArclink *routeArclink(size_t i) const;
RouteArclink *routeArclink(const RouteArclinkIndex &i) const;
RouteSeedlink* routeSeedlink(size_t i) const;
RouteSeedlink* routeSeedlink(const RouteSeedlinkIndex& i) const;
RouteSeedlink *routeSeedlink(size_t i) const;
RouteSeedlink *routeSeedlink(const RouteSeedlinkIndex &i) const;
//! Find an object by its unique attribute(s)
Routing* routing() const;
Routing *routing() const;
//! Implement Object interface
bool assign(Object *other) override;

20
include/seiscomp/datamodel/routearclink.h
View File

@ -84,25 +84,25 @@ class SC_SYSTEM_CORE_API RouteArclink : public Object {
RouteArclink();
//! Copy constructor
RouteArclink(const RouteArclink& other);
RouteArclink(const RouteArclink &other);
//! Destructor
~RouteArclink() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
RouteArclink& operator=(const RouteArclink& other);
RouteArclink &operator=(const RouteArclink &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const RouteArclink& other) const;
bool operator!=(const RouteArclink& other) const;
bool operator==(const RouteArclink &other) const;
bool operator!=(const RouteArclink &other) const;
//! Wrapper that calls operator==
bool equal(const RouteArclink& other) const;
bool equal(const RouteArclink &other) const;
// ------------------------------------------------------------------
@ -131,17 +131,17 @@ class SC_SYSTEM_CORE_API RouteArclink : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const RouteArclinkIndex& index() const;
const RouteArclinkIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const RouteArclink* lhs) const;
bool equalIndex(const RouteArclink *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Route* route() const;
Route *route() const;
//! Implement Object interface
bool assign(Object *other) override;

20
include/seiscomp/datamodel/routeseedlink.h
View File

@ -81,25 +81,25 @@ class SC_SYSTEM_CORE_API RouteSeedlink : public Object {
RouteSeedlink();
//! Copy constructor
RouteSeedlink(const RouteSeedlink& other);
RouteSeedlink(const RouteSeedlink &other);
//! Destructor
~RouteSeedlink() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
RouteSeedlink& operator=(const RouteSeedlink& other);
RouteSeedlink &operator=(const RouteSeedlink &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const RouteSeedlink& other) const;
bool operator!=(const RouteSeedlink& other) const;
bool operator==(const RouteSeedlink &other) const;
bool operator!=(const RouteSeedlink &other) const;
//! Wrapper that calls operator==
bool equal(const RouteSeedlink& other) const;
bool equal(const RouteSeedlink &other) const;
// ------------------------------------------------------------------
@ -120,17 +120,17 @@ class SC_SYSTEM_CORE_API RouteSeedlink : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const RouteSeedlinkIndex& index() const;
const RouteSeedlinkIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const RouteSeedlink* lhs) const;
bool equalIndex(const RouteSeedlink *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Route* route() const;
Route *route() const;
//! Implement Object interface
bool assign(Object *other) override;

36
include/seiscomp/datamodel/routing.h
View File

@ -52,11 +52,11 @@ class SC_SYSTEM_CORE_API Routing : public PublicObject {
Routing();
//! Copy constructor
Routing(const Routing& other);
Routing(const Routing &other);
//! Destructor
~Routing() override;
// ------------------------------------------------------------------
// Operators
@ -64,16 +64,16 @@ class SC_SYSTEM_CORE_API Routing : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
Routing& operator=(const Routing& other);
Routing &operator=(const Routing &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Routing& other) const;
bool operator!=(const Routing& other) const;
bool operator==(const Routing &other) const;
bool operator!=(const Routing &other) const;
//! Wrapper that calls operator==
bool equal(const Routing& other) const;
bool equal(const Routing &other) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -86,8 +86,8 @@ class SC_SYSTEM_CORE_API Routing : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(Route* obj);
bool add(Access* obj);
bool add(Route *obj);
bool add(Access *obj);
/**
* Removes an object.
@ -96,8 +96,8 @@ class SC_SYSTEM_CORE_API Routing : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(Route* obj);
bool remove(Access* obj);
bool remove(Route *obj);
bool remove(Access *obj);
/**
* Removes an object of a particular class.
@ -106,9 +106,9 @@ class SC_SYSTEM_CORE_API Routing : public PublicObject {
* @return false The index is out of bounds
*/
bool removeRoute(size_t i);
bool removeRoute(const RouteIndex& i);
bool removeRoute(const RouteIndex &i);
bool removeAccess(size_t i);
bool removeAccess(const AccessIndex& i);
bool removeAccess(const AccessIndex &i);
//! Retrieve the number of objects of a particular class
size_t routeCount() const;
@ -116,14 +116,14 @@ class SC_SYSTEM_CORE_API Routing : public PublicObject {
//! Index access
//! @return The object at index i
Route* route(size_t i) const;
Route* route(const RouteIndex& i) const;
Route *route(size_t i) const;
Route *route(const RouteIndex &i) const;
Access* access(size_t i) const;
Access* access(const AccessIndex& i) const;
Access *access(size_t i) const;
Access *access(const AccessIndex &i) const;
//! Find an object by its unique attribute(s)
Route* findRoute(const std::string& publicID) const;
Route *findRoute(const std::string& publicID) const;
//! Implement Object interface
bool assign(Object *other) override;

36
include/seiscomp/datamodel/sensor.h
View File

@ -87,28 +87,28 @@ class SC_SYSTEM_CORE_API Sensor : public PublicObject {
public:
//! Copy constructor
Sensor(const Sensor& other);
Sensor(const Sensor &other);
//! Constructor with publicID
Sensor(const std::string& publicID);
//! Destructor
~Sensor() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static Sensor* Create();
static Sensor* Create(const std::string& publicID);
static Sensor *Create();
static Sensor *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static Sensor* Find(const std::string& publicID);
static Sensor *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -117,14 +117,14 @@ class SC_SYSTEM_CORE_API Sensor : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
Sensor& operator=(const Sensor& other);
Sensor &operator=(const Sensor &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Sensor& other) const;
bool operator!=(const Sensor& other) const;
bool operator==(const Sensor &other) const;
bool operator!=(const Sensor &other) const;
//! Wrapper that calls operator==
bool equal(const Sensor& other) const;
bool equal(const Sensor &other) const;
// ------------------------------------------------------------------
@ -178,12 +178,12 @@ class SC_SYSTEM_CORE_API Sensor : public PublicObject {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const SensorIndex& index() const;
const SensorIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const Sensor* lhs) const;
bool equalIndex(const Sensor *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -196,7 +196,7 @@ class SC_SYSTEM_CORE_API Sensor : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(SensorCalibration* obj);
bool add(SensorCalibration *obj);
/**
* Removes an object.
@ -205,7 +205,7 @@ class SC_SYSTEM_CORE_API Sensor : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(SensorCalibration* obj);
bool remove(SensorCalibration *obj);
/**
* Removes an object of a particular class.
@ -214,19 +214,19 @@ class SC_SYSTEM_CORE_API Sensor : public PublicObject {
* @return false The index is out of bounds
*/
bool removeSensorCalibration(size_t i);
bool removeSensorCalibration(const SensorCalibrationIndex& i);
bool removeSensorCalibration(const SensorCalibrationIndex &i);
//! Retrieve the number of objects of a particular class
size_t sensorCalibrationCount() const;
//! Index access
//! @return The object at index i
SensorCalibration* sensorCalibration(size_t i) const;
SensorCalibration* sensorCalibration(const SensorCalibrationIndex& i) const;
SensorCalibration *sensorCalibration(size_t i) const;
SensorCalibration *sensorCalibration(const SensorCalibrationIndex &i) const;
//! Find an object by its unique attribute(s)
Inventory* inventory() const;
Inventory *inventory() const;
//! Implement Object interface
bool assign(Object *other) override;

20
include/seiscomp/datamodel/sensorcalibration.h
View File

@ -87,25 +87,25 @@ class SC_SYSTEM_CORE_API SensorCalibration : public Object {
SensorCalibration();
//! Copy constructor
SensorCalibration(const SensorCalibration& other);
SensorCalibration(const SensorCalibration &other);
//! Destructor
~SensorCalibration() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
SensorCalibration& operator=(const SensorCalibration& other);
SensorCalibration &operator=(const SensorCalibration &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const SensorCalibration& other) const;
bool operator!=(const SensorCalibration& other) const;
bool operator==(const SensorCalibration &other) const;
bool operator!=(const SensorCalibration &other) const;
//! Wrapper that calls operator==
bool equal(const SensorCalibration& other) const;
bool equal(const SensorCalibration &other) const;
// ------------------------------------------------------------------
@ -146,17 +146,17 @@ class SC_SYSTEM_CORE_API SensorCalibration : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const SensorCalibrationIndex& index() const;
const SensorCalibrationIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const SensorCalibration* lhs) const;
bool equalIndex(const SensorCalibration *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
Sensor* sensor() const;
Sensor *sensor() const;
//! Implement Object interface
bool assign(Object *other) override;

58
include/seiscomp/datamodel/sensorlocation.h
View File

@ -93,28 +93,28 @@ class SC_SYSTEM_CORE_API SensorLocation : public PublicObject {
public:
//! Copy constructor
SensorLocation(const SensorLocation& other);
SensorLocation(const SensorLocation &other);
//! Constructor with publicID
SensorLocation(const std::string& publicID);
//! Destructor
~SensorLocation() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static SensorLocation* Create();
static SensorLocation* Create(const std::string& publicID);
static SensorLocation *Create();
static SensorLocation *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static SensorLocation* Find(const std::string& publicID);
static SensorLocation *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -123,14 +123,14 @@ class SC_SYSTEM_CORE_API SensorLocation : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
SensorLocation& operator=(const SensorLocation& other);
SensorLocation &operator=(const SensorLocation &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const SensorLocation& other) const;
bool operator!=(const SensorLocation& other) const;
bool operator==(const SensorLocation &other) const;
bool operator!=(const SensorLocation &other) const;
//! Wrapper that calls operator==
bool equal(const SensorLocation& other) const;
bool equal(const SensorLocation &other) const;
// ------------------------------------------------------------------
@ -179,12 +179,12 @@ class SC_SYSTEM_CORE_API SensorLocation : public PublicObject {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const SensorLocationIndex& index() const;
const SensorLocationIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const SensorLocation* lhs) const;
bool equalIndex(const SensorLocation *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -197,9 +197,9 @@ class SC_SYSTEM_CORE_API SensorLocation : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(Comment* obj);
bool add(AuxStream* obj);
bool add(Stream* obj);
bool add(Comment *obj);
bool add(AuxStream *obj);
bool add(Stream *obj);
/**
* Removes an object.
@ -208,9 +208,9 @@ class SC_SYSTEM_CORE_API SensorLocation : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(Comment* obj);
bool remove(AuxStream* obj);
bool remove(Stream* obj);
bool remove(Comment *obj);
bool remove(AuxStream *obj);
bool remove(Stream *obj);
/**
* Removes an object of a particular class.
@ -219,11 +219,11 @@ class SC_SYSTEM_CORE_API SensorLocation : public PublicObject {
* @return false The index is out of bounds
*/
bool removeComment(size_t i);
bool removeComment(const CommentIndex& i);
bool removeComment(const CommentIndex &i);
bool removeAuxStream(size_t i);
bool removeAuxStream(const AuxStreamIndex& i);
bool removeAuxStream(const AuxStreamIndex &i);
bool removeStream(size_t i);
bool removeStream(const StreamIndex& i);
bool removeStream(const StreamIndex &i);
//! Retrieve the number of objects of a particular class
size_t commentCount() const;
@ -232,19 +232,19 @@ class SC_SYSTEM_CORE_API SensorLocation : public PublicObject {
//! Index access
//! @return The object at index i
Comment* comment(size_t i) const;
Comment* comment(const CommentIndex& i) const;
Comment *comment(size_t i) const;
Comment *comment(const CommentIndex &i) const;
AuxStream* auxStream(size_t i) const;
AuxStream* auxStream(const AuxStreamIndex& i) const;
AuxStream *auxStream(size_t i) const;
AuxStream *auxStream(const AuxStreamIndex &i) const;
Stream* stream(size_t i) const;
Stream* stream(const StreamIndex& i) const;
Stream *stream(size_t i) const;
Stream *stream(const StreamIndex &i) const;
//! Find an object by its unique attribute(s)
Stream* findStream(const std::string& publicID) const;
Stream *findStream(const std::string& publicID) const;
Station* station() const;
Station *station() const;
//! Implement Object interface
bool assign(Object *other) override;

20
include/seiscomp/datamodel/setup.h
View File

@ -78,25 +78,25 @@ class SC_SYSTEM_CORE_API Setup : public Object {
Setup();
//! Copy constructor
Setup(const Setup& other);
Setup(const Setup &other);
//! Destructor
~Setup() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
Setup& operator=(const Setup& other);
Setup &operator=(const Setup &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Setup& other) const;
bool operator!=(const Setup& other) const;
bool operator==(const Setup &other) const;
bool operator!=(const Setup &other) const;
//! Wrapper that calls operator==
bool equal(const Setup& other) const;
bool equal(const Setup &other) const;
// ------------------------------------------------------------------
@ -118,17 +118,17 @@ class SC_SYSTEM_CORE_API Setup : public Object {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const SetupIndex& index() const;
const SetupIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const Setup* lhs) const;
bool equalIndex(const Setup *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
public:
ConfigStation* configStation() const;
ConfigStation *configStation() const;
//! Implement Object interface
bool assign(Object *other) override;

12
include/seiscomp/datamodel/sourcetimefunction.h
View File

@ -51,25 +51,25 @@ class SC_SYSTEM_CORE_API SourceTimeFunction : public Core::BaseObject {
SourceTimeFunction();
//! Copy constructor
SourceTimeFunction(const SourceTimeFunction& other);
SourceTimeFunction(const SourceTimeFunction &other);
//! Destructor
~SourceTimeFunction() override;
// ------------------------------------------------------------------
// Operators
// ------------------------------------------------------------------
public:
//! Copies the metadata of other to this
SourceTimeFunction& operator=(const SourceTimeFunction& other);
SourceTimeFunction &operator=(const SourceTimeFunction &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const SourceTimeFunction& other) const;
bool operator!=(const SourceTimeFunction& other) const;
bool operator==(const SourceTimeFunction &other) const;
bool operator!=(const SourceTimeFunction &other) const;
//! Wrapper that calls operator==
bool equal(const SourceTimeFunction& other) const;
bool equal(const SourceTimeFunction &other) const;
// ------------------------------------------------------------------

48
include/seiscomp/datamodel/station.h
View File

@ -92,28 +92,28 @@ class SC_SYSTEM_CORE_API Station : public PublicObject {
public:
//! Copy constructor
Station(const Station& other);
Station(const Station &other);
//! Constructor with publicID
Station(const std::string& publicID);
//! Destructor
~Station() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static Station* Create();
static Station* Create(const std::string& publicID);
static Station *Create();
static Station *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static Station* Find(const std::string& publicID);
static Station *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -122,14 +122,14 @@ class SC_SYSTEM_CORE_API Station : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
Station& operator=(const Station& other);
Station &operator=(const Station &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const Station& other) const;
bool operator!=(const Station& other) const;
bool operator==(const Station &other) const;
bool operator!=(const Station &other) const;
//! Wrapper that calls operator==
bool equal(const Station& other) const;
bool equal(const Station &other) const;
// ------------------------------------------------------------------
@ -219,12 +219,12 @@ class SC_SYSTEM_CORE_API Station : public PublicObject {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const StationIndex& index() const;
const StationIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const Station* lhs) const;
bool equalIndex(const Station *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -237,8 +237,8 @@ class SC_SYSTEM_CORE_API Station : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(Comment* obj);
bool add(SensorLocation* obj);
bool add(Comment *obj);
bool add(SensorLocation *obj);
/**
* Removes an object.
@ -247,8 +247,8 @@ class SC_SYSTEM_CORE_API Station : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(Comment* obj);
bool remove(SensorLocation* obj);
bool remove(Comment *obj);
bool remove(SensorLocation *obj);
/**
* Removes an object of a particular class.
@ -257,9 +257,9 @@ class SC_SYSTEM_CORE_API Station : public PublicObject {
* @return false The index is out of bounds
*/
bool removeComment(size_t i);
bool removeComment(const CommentIndex& i);
bool removeComment(const CommentIndex &i);
bool removeSensorLocation(size_t i);
bool removeSensorLocation(const SensorLocationIndex& i);
bool removeSensorLocation(const SensorLocationIndex &i);
//! Retrieve the number of objects of a particular class
size_t commentCount() const;
@ -267,16 +267,16 @@ class SC_SYSTEM_CORE_API Station : public PublicObject {
//! Index access
//! @return The object at index i
Comment* comment(size_t i) const;
Comment* comment(const CommentIndex& i) const;
Comment *comment(size_t i) const;
Comment *comment(const CommentIndex &i) const;
SensorLocation* sensorLocation(size_t i) const;
SensorLocation* sensorLocation(const SensorLocationIndex& i) const;
SensorLocation *sensorLocation(size_t i) const;
SensorLocation *sensorLocation(const SensorLocationIndex &i) const;
//! Find an object by its unique attribute(s)
SensorLocation* findSensorLocation(const std::string& publicID) const;
SensorLocation *findSensorLocation(const std::string& publicID) const;
Network* network() const;
Network *network() const;
//! Implement Object interface
bool assign(Object *other) override;

36
include/seiscomp/datamodel/stationgroup.h
View File

@ -89,28 +89,28 @@ class SC_SYSTEM_CORE_API StationGroup : public PublicObject {
public:
//! Copy constructor
StationGroup(const StationGroup& other);
StationGroup(const StationGroup &other);
//! Constructor with publicID
StationGroup(const std::string& publicID);
//! Destructor
~StationGroup() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static StationGroup* Create();
static StationGroup* Create(const std::string& publicID);
static StationGroup *Create();
static StationGroup *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static StationGroup* Find(const std::string& publicID);
static StationGroup *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -119,14 +119,14 @@ class SC_SYSTEM_CORE_API StationGroup : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
StationGroup& operator=(const StationGroup& other);
StationGroup &operator=(const StationGroup &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const StationGroup& other) const;
bool operator!=(const StationGroup& other) const;
bool operator==(const StationGroup &other) const;
bool operator!=(const StationGroup &other) const;
//! Wrapper that calls operator==
bool equal(const StationGroup& other) const;
bool equal(const StationGroup &other) const;
// ------------------------------------------------------------------
@ -185,12 +185,12 @@ class SC_SYSTEM_CORE_API StationGroup : public PublicObject {
// ------------------------------------------------------------------
public:
//! Returns the object's index
const StationGroupIndex& index() const;
const StationGroupIndex &index() const;
//! Checks two objects for equality regarding their index
bool equalIndex(const StationGroup* lhs) const;
bool equalIndex(const StationGroup *lhs) const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -203,7 +203,7 @@ class SC_SYSTEM_CORE_API StationGroup : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(StationReference* obj);
bool add(StationReference *obj);
/**
* Removes an object.
@ -212,7 +212,7 @@ class SC_SYSTEM_CORE_API StationGroup : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(StationReference* obj);
bool remove(StationReference *obj);
/**
* Removes an object of a particular class.
@ -221,19 +221,19 @@ class SC_SYSTEM_CORE_API StationGroup : public PublicObject {
* @return false The index is out of bounds
*/
bool removeStationReference(size_t i);
bool removeStationReference(const StationReferenceIndex& i);
bool removeStationReference(const StationReferenceIndex &i);
//! Retrieve the number of objects of a particular class
size_t stationReferenceCount() const;
//! Index access
//! @return The object at index i
StationReference* stationReference(size_t i) const;
StationReference* stationReference(const StationReferenceIndex& i) const;
StationReference *stationReference(size_t i) const;
StationReference *stationReference(const StationReferenceIndex &i) const;
//! Find an object by its unique attribute(s)
Inventory* inventory() const;
Inventory *inventory() const;
//! Implement Object interface
bool assign(Object *other) override;

32
include/seiscomp/datamodel/stationmagnitude.h
View File

@ -61,28 +61,28 @@ class SC_SYSTEM_CORE_API StationMagnitude : public PublicObject {
public:
//! Copy constructor
StationMagnitude(const StationMagnitude& other);
StationMagnitude(const StationMagnitude &other);
//! Constructor with publicID
StationMagnitude(const std::string& publicID);
//! Destructor
~StationMagnitude() override;
// ------------------------------------------------------------------
// Creators
// ------------------------------------------------------------------
public:
static StationMagnitude* Create();
static StationMagnitude* Create(const std::string& publicID);
static StationMagnitude *Create();
static StationMagnitude *Create(const std::string& publicID);
// ------------------------------------------------------------------
// Lookup
// ------------------------------------------------------------------
public:
static StationMagnitude* Find(const std::string& publicID);
static StationMagnitude *Find(const std::string& publicID);
// ------------------------------------------------------------------
@ -91,14 +91,14 @@ class SC_SYSTEM_CORE_API StationMagnitude : public PublicObject {
public:
//! Copies the metadata of other to this
//! No changes regarding child objects are made
StationMagnitude& operator=(const StationMagnitude& other);
StationMagnitude &operator=(const StationMagnitude &other);
//! Checks for equality of two objects. Child objects
//! are not part of the check.
bool operator==(const StationMagnitude& other) const;
bool operator!=(const StationMagnitude& other) const;
bool operator==(const StationMagnitude &other) const;
bool operator!=(const StationMagnitude &other) const;
//! Wrapper that calls operator==
bool equal(const StationMagnitude& other) const;
bool equal(const StationMagnitude &other) const;
// ------------------------------------------------------------------
@ -158,7 +158,7 @@ class SC_SYSTEM_CORE_API StationMagnitude : public PublicObject {
CreationInfo& creationInfo();
const CreationInfo& creationInfo() const;
// ------------------------------------------------------------------
// Public interface
// ------------------------------------------------------------------
@ -171,7 +171,7 @@ class SC_SYSTEM_CORE_API StationMagnitude : public PublicObject {
* because it already exists in the list
* or it already has another parent
*/
bool add(Comment* obj);
bool add(Comment *obj);
/**
* Removes an object.
@ -180,7 +180,7 @@ class SC_SYSTEM_CORE_API StationMagnitude : public PublicObject {
* @return false The object has not been removed
* because it does not exist in the list
*/
bool remove(Comment* obj);
bool remove(Comment *obj);
/**
* Removes an object of a particular class.
@ -189,19 +189,19 @@ class SC_SYSTEM_CORE_API StationMagnitude : public PublicObject {
* @return false The index is out of bounds
*/
bool removeComment(size_t i);
bool removeComment(const CommentIndex& i);
bool removeComment(const CommentIndex &i);
//! Retrieve the number of objects of a particular class
size_t commentCount() const;
//! Index access
//! @return The object at index i
Comment* comment(size_t i) const;
Comment* comment(const CommentIndex& i) const;
Comment *comment(size_t i) const;
Comment *comment(const CommentIndex &i) const;
//! Find an object by its unique attribute(s)
Origin* origin() const;
Origin *origin() const;
//! Implement Object interface
bool assign(Object *other) override;

Some files were not shown because too many files have changed in this diff Show More