diff --git a/include/AVISO.h b/include/AVISO.h index 69e7ff0..ed166c8 100644 --- a/include/AVISO.h +++ b/include/AVISO.h @@ -14,6 +14,9 @@ class AVISOData: public LayeredData Type type = TYPE_UNKNOWN; + public: + AVISOData() = default; + MString DataTitle() const { switch(type) @@ -26,9 +29,6 @@ class AVISOData: public LayeredData } } - public: - AVISOData() = default; - // TODO: RetVal MString Open(const CLArgs& args) { diff --git a/include/AVISOLOCAL.h b/include/AVISOLOCAL.h index 42c0da3..31f3c5a 100644 --- a/include/AVISOLOCAL.h +++ b/include/AVISOLOCAL.h @@ -24,13 +24,13 @@ class AVISOLOCALData: public NCFuncs virtual ~Parameters() override = default; }; - static MString Title() { return "AVISO local mirror"; } - public: using Data = Simple2DData; AVISOLOCALData() = default; + static MString DataTitle() { return "AVISO local mirror"; } + MString Info() const; // TODO: RetVal MString Open(const CLArgs& args); diff --git a/include/HYCOM.h b/include/HYCOM.h index fb38499..ab6c6fe 100644 --- a/include/HYCOM.h +++ b/include/HYCOM.h @@ -13,6 +13,9 @@ class HYCOMData: public LayeredData Type type = TYPE_UNKNOWN; + public: + HYCOMData() = default; + MString DataTitle() const { switch(type) @@ -24,9 +27,6 @@ class HYCOMData: public LayeredData } } - public: - HYCOMData() = default; - // TODO: RetVal MString Open(const CLArgs& args) { diff --git a/include/NEMO.h b/include/NEMO.h index 688ae54..5f94c51 100644 --- a/include/NEMO.h +++ b/include/NEMO.h @@ -13,6 +13,9 @@ class NEMOData: public LayeredData Type type = TYPE_UNKNOWN; + public: + NEMOData() = default; + MString DataTitle() const { switch(type) @@ -24,9 +27,6 @@ class NEMOData: public LayeredData } } - public: - NEMOData() = default; - // TODO: RetVal MString Open(const CLArgs& args) { diff --git a/src/AVISOLOCAL.cpp b/src/AVISOLOCAL.cpp index 0d92a26..14b35dc 100644 --- a/src/AVISOLOCAL.cpp +++ b/src/AVISOLOCAL.cpp @@ -39,7 +39,7 @@ MString AVISOLOCALData::Info() const // clang-format off return - "Dataset: " + Title() + "\n" + + "Dataset: " + DataTitle() + "\n" + " Begin date: " + Time(0).ToString() + "\n" + " End date: " + Time(NTimes()-1).ToString() + "\n" + " Time step: " + Timestep() + " seconds\n" +