From 096f8caad4764b7c2f144c66dafff9393973e2a8 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de> Date: Thu, 19 May 2022 07:26:14 +0200 Subject: [PATCH] rename -> Device/Coords/Tags.h <- Axes.h --- Device/Coord/AxisNames.h | 2 +- Device/Coord/ICoordSystem.h | 2 +- Device/Coord/{Axes.h => Tags.h} | 8 ++++---- Device/Detector/IDetector.h | 2 +- GUI/Support/IO/ImportDataInfo.h | 2 +- Wrap/Swig/libBornAgainDevice.i | 2 +- auto/Wrap/doxygenDevice.i | 10 +++++----- 7 files changed, 14 insertions(+), 14 deletions(-) rename Device/Coord/{Axes.h => Tags.h} (81%) diff --git a/Device/Coord/AxisNames.h b/Device/Coord/AxisNames.h index fc1b3a27773..8d5228a89c8 100644 --- a/Device/Coord/AxisNames.h +++ b/Device/Coord/AxisNames.h @@ -20,7 +20,7 @@ #ifndef BORNAGAIN_DEVICE_COORD_AXISNAMES_H #define BORNAGAIN_DEVICE_COORD_AXISNAMES_H -#include "Device/Coord/Axes.h" +#include "Device/Coord/Tags.h" #include "Wrap/WinDllMacros.h" #include <map> #include <string> diff --git a/Device/Coord/ICoordSystem.h b/Device/Coord/ICoordSystem.h index 593e6472526..2f2d0633c49 100644 --- a/Device/Coord/ICoordSystem.h +++ b/Device/Coord/ICoordSystem.h @@ -21,7 +21,7 @@ #define BORNAGAIN_DEVICE_COORD_ICOORDSYSTEM_H #include "Base/Types/ICloneable.h" -#include "Device/Coord/Axes.h" +#include "Device/Coord/Tags.h" #include <map> #include <memory> #include <string> diff --git a/Device/Coord/Axes.h b/Device/Coord/Tags.h similarity index 81% rename from Device/Coord/Axes.h rename to Device/Coord/Tags.h index 30f618afddb..b7fec9bc6f8 100644 --- a/Device/Coord/Axes.h +++ b/Device/Coord/Tags.h @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file Device/Coord/Axes.h +//! @file Device/Coord/Tags.h //! @brief Defines enum Axis::Units. //! //! @homepage http://www.bornagainproject.org @@ -12,11 +12,11 @@ // // ************************************************************************************************ -#ifndef BORNAGAIN_DEVICE_COORD_AXES_H -#define BORNAGAIN_DEVICE_COORD_AXES_H +#ifndef BORNAGAIN_DEVICE_COORD_TAGS_H +#define BORNAGAIN_DEVICE_COORD_TAGS_H //! @ingroup detector enum class Coords { UNDEFINED, NBINS, RADIANS, DEGREES, MM, QSPACE, QXQY, RQ4 }; -#endif // BORNAGAIN_DEVICE_COORD_AXES_H +#endif // BORNAGAIN_DEVICE_COORD_TAGS_H diff --git a/Device/Detector/IDetector.h b/Device/Detector/IDetector.h index c12e4decd22..9565553376f 100644 --- a/Device/Detector/IDetector.h +++ b/Device/Detector/IDetector.h @@ -17,7 +17,7 @@ #include "Base/Types/ICloneable.h" #include "Base/Types/OwningVector.h" -#include "Device/Coord/Axes.h" // enum Coords +#include "Device/Coord/Tags.h" // enum Coords #include "Device/Detector/SimulationAreaIterator.h" #include "Device/Pol/PolFilter.h" #include <functional> diff --git a/GUI/Support/IO/ImportDataInfo.h b/GUI/Support/IO/ImportDataInfo.h index f472a3a3869..d1c3908f373 100644 --- a/GUI/Support/IO/ImportDataInfo.h +++ b/GUI/Support/IO/ImportDataInfo.h @@ -15,7 +15,7 @@ #ifndef BORNAGAIN_GUI_SUPPORT_IO_IMPORTDATAINFO_H #define BORNAGAIN_GUI_SUPPORT_IO_IMPORTDATAINFO_H -#include "Device/Coord/Axes.h" +#include "Device/Coord/Tags.h" #include <QString> #include <memory> diff --git a/Wrap/Swig/libBornAgainDevice.i b/Wrap/Swig/libBornAgainDevice.i index 710e4f1fa03..e9ded4b6c11 100644 --- a/Wrap/Swig/libBornAgainDevice.i +++ b/Wrap/Swig/libBornAgainDevice.i @@ -80,7 +80,7 @@ %include "Device/Resolution/IResolutionFunction2D.h" %include "Device/Resolution/ResolutionFunction2DGaussian.h" -%include "Device/Coord/Axes.h" +%include "Device/Coord/Tags.h" %include "Device/Mask/DetectorMask.h" %include "Device/Detector/IDetector.h" diff --git a/auto/Wrap/doxygenDevice.i b/auto/Wrap/doxygenDevice.i index e37b43d50a3..0374b0eda57 100644 --- a/auto/Wrap/doxygenDevice.i +++ b/auto/Wrap/doxygenDevice.i @@ -2763,10 +2763,10 @@ Returns default units to convert to. // File: namespace_0d0.xml -// File: namespace_0d11.xml +// File: namespace_0d10.xml -// File: namespace_0d13.xml +// File: namespace_0d12.xml // File: namespace_0d21.xml @@ -2991,9 +2991,6 @@ Returns true if data in both files agree. // File: IFootprintFactor_8h.xml -// File: Axes_8h.xml - - // File: AxisNames_8cpp.xml @@ -3018,6 +3015,9 @@ Returns true if data in both files agree. // File: ICoordSystem_8h.xml +// File: Tags_8h.xml + + // File: ArrayUtils_8cpp.xml -- GitLab