+
+
+
+
+
+
+
+  |
+
+
+
+ $projectname $projectnumber
+
+ $projectbrief
+ |
+
+
+
+
+ $projectbrief
+ |
+
+
+
+
+
+ $searchbox |
+
+
+
+
+
+
+ | $searchbox |
+
+
+
+
+
+
+
diff --git a/docs/static/main.md b/docs/static/main.md
index 85bfb9e7d..839317b37 100644
--- a/docs/static/main.md
+++ b/docs/static/main.md
@@ -7,6 +7,7 @@ Documentation for other CARTA components
----------------------------------------
* [CARTA user manual](https://carta.readthedocs.io) (for users)
-* %CARTA frontend (TBD)
+* [CARTA frontend](https://cartavis.org/carta-frontend/) (for developers)
+* [CARTA interface control document](https://carta-protobuf.readthedocs.io) (for developers)
* [CARTA controller](https://carta-controller.readthedocs.io) (for system administrators)
* [CARTA Python scripting wrapper](https://carta-python.readthedocs.io) (for users of the scripting interface)
diff --git a/scripts/carta b/scripts/carta
index 4764a3ac6..d37937e75 100755
--- a/scripts/carta
+++ b/scripts/carta
@@ -11,8 +11,10 @@ if [ ! -z $FIRST_IP ]; then
export SERVER_IP=$FIRST_IP
fi
-if [ -x "$(command -v casa_data_autoupdate)" ]; then
- casa_data_autoupdate
+if [[ ! " $@ " =~ ( --version | -v | --help | -h ) ]]; then
+ if [ -x "$(command -v casa_data_autoupdate)" ]; then
+ casa_data_autoupdate
+ fi
fi
carta_backend "$@"
diff --git a/scripts/style.py b/scripts/style.py
index 643ca3d9a..2e24f7446 100755
--- a/scripts/style.py
+++ b/scripts/style.py
@@ -3,6 +3,7 @@
import sys
import os
import re
+import glob
import argparse
import subprocess
@@ -11,8 +12,7 @@ class Test:
TESTS = {}
EXCLUDE_FROM_ALL = False
- EXTENSIONS = ("cc", "h", "tcc")
- FILE_REGEX = fr".*\.({'|'.join(EXTENSIONS)})$"
+ EXTENSIONS = {"cc", "h", "tcc"}
quiet = False
out = print
@@ -29,11 +29,13 @@ def get_tests(cls, testname):
return (cls.TESTS[testname],)
@classmethod
- def cpp_files(cls, directory):
+ def cpp_files(cls, directory, exclude=set()):
+ FILE_REGEX = fr".*\.({'|'.join(cls.EXTENSIONS - exclude)})$"
+
for root, dirs, files in os.walk(directory):
dirs[:] = [d for d in dirs]
for basename in files:
- if re.match(cls.FILE_REGEX, basename):
+ if re.match(FILE_REGEX, basename):
filename = os.path.join(root, basename)
yield filename
@@ -48,7 +50,7 @@ def fix(cls, directories):
class Header(Test):
HEADER = """/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
@@ -184,6 +186,96 @@ def fix(cls, directories):
return 0
+class HeaderGuards(Test):
+ IFNDEF_REGEX = re.compile("^#ifndef ([A-Z_0-9]*_(H|TCC)_*)$", flags=re.MULTILINE)
+ LAST_ENDIF_REGEX = re.compile(r"^(#endif[^\n]*?)\n$(?!.*#endif)", flags=re.MULTILINE|re.DOTALL)
+
+ @classmethod
+ def make_guard_name(cls, filename):
+ name = re.sub('[/.$]', '_', filename).upper()
+ return f"CARTA_{name}_"
+
+ @classmethod
+ def make_endif(cls, name):
+ return f"#endif // {name}"
+
+ @classmethod
+ def check(cls, directories):
+ status = 0
+
+ for directory in directories:
+ for filename in cls.cpp_files(directory, exclude={"cc"}):
+ with open(filename) as f:
+ data = f.read()
+
+ new_guard_name = cls.make_guard_name(filename)
+
+ m = cls.IFNDEF_REGEX.search(data)
+
+ if m is None:
+ cls.out("Can't find header guard in", filename)
+ status = 1
+ else:
+
+ existing_guard_name = m.group(1)
+
+ if new_guard_name != existing_guard_name:
+ cls.out("Bad header guard in", filename)
+ status = 1
+
+ last_endif = cls.LAST_ENDIF_REGEX.search(data).group(1)
+ if last_endif != cls.make_endif(existing_guard_name):
+ cls.out("Mismatched header guard #endif comment in", filename)
+ status = 1
+
+ return status
+
+ @classmethod
+ def fix(cls, directories):
+ for directory in directories:
+ for filename in cls.cpp_files(directory, exclude={"cc"}):
+ with open(filename) as f:
+ data = f.read()
+
+ new_guard_name = cls.make_guard_name(filename)
+ new_endif = cls.make_endif(new_guard_name)
+ data_changed = False
+
+ m = cls.IFNDEF_REGEX.search(data)
+
+ if m is None:
+ cls.out("Can't find header guard in", filename)
+ cls.out("Fixing...")
+
+ data = re.sub("(/\*.*?\*/\n)", rf"\1\n#ifndef {new_guard_name}\n#define {new_guard_name}\n", data, count=1, flags=re.DOTALL)
+ data = re.sub(r"\n$", rf"\n{new_endif}\n", data)
+ data_changed = True
+
+ else:
+ existing_guard_name = m.group(1)
+
+ if new_guard_name != existing_guard_name:
+ cls.out("Bad header guard in", filename)
+ cls.out("Fixing...")
+
+ data = re.sub(existing_guard_name, new_guard_name, data)
+ data_changed = True
+
+ last_endif = cls.LAST_ENDIF_REGEX.search(data).group(1)
+ if last_endif != new_endif:
+ cls.out("Mismatched header guard #endif comment in", filename)
+ cls.out("Fixing...")
+
+ data = cls.LAST_ENDIF_REGEX.sub(rf"{new_endif}\n", data)
+ data_changed = True
+
+ if data_changed:
+ with open(filename, "w") as f:
+ f.write(data)
+
+ return 0
+
+
class Style(Test):
EXCLUDE_FROM_ALL = True
diff --git a/src/Cache/LoaderCache.cc b/src/Cache/LoaderCache.cc
new file mode 100644
index 000000000..f06cd59e9
--- /dev/null
+++ b/src/Cache/LoaderCache.cc
@@ -0,0 +1,63 @@
+/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
+ SPDX-License-Identifier: GPL-3.0-or-later
+*/
+
+#include "LoaderCache.h"
+
+#include "Logger/Logger.h"
+
+using namespace carta;
+
+LoaderCache::LoaderCache(int capacity) : _capacity(capacity){};
+
+std::shared_ptr
LoaderCache::Get(const std::string& filename, const std::string& directory) {
+ std::unique_lock guard(_loader_cache_mutex);
+ auto key = GetKey(filename, directory);
+
+ // We have a cached loader, but the file has changed
+ if ((_map.find(key) != _map.end()) && _map[key] && _map[key]->ImageUpdated()) {
+ _map.erase(key);
+ _queue.remove(key);
+ }
+
+ // We don't have a cached loader
+ if (_map.find(key) == _map.end()) {
+ // Create the loader -- don't block while doing this
+ std::shared_ptr loader_ptr;
+ guard.unlock();
+ loader_ptr = std::shared_ptr(FileLoader::GetLoader(filename, directory));
+ guard.lock();
+
+ // Check if the loader was added in the meantime
+ if (_map.find(key) == _map.end()) {
+ // Evict oldest loader if necessary
+ if (_map.size() == _capacity) {
+ _map.erase(_queue.back());
+ _queue.pop_back();
+ }
+
+ // Insert the new loader
+ _map[key] = loader_ptr;
+ _queue.push_front(key);
+ }
+ } else {
+ // Touch the cache entry
+ _queue.remove(key);
+ _queue.push_front(key);
+ }
+
+ return _map[key];
+}
+
+void LoaderCache::Remove(const std::string& filename, const std::string& directory) {
+ std::unique_lock guard(_loader_cache_mutex);
+ auto key = GetKey(filename, directory);
+ _map.erase(key);
+ _queue.remove(key);
+}
+
+std::string LoaderCache::GetKey(const std::string& filename, const std::string& directory) {
+ return (directory.empty() ? filename : fmt::format("{}/{}", directory, filename));
+}
diff --git a/src/Cache/LoaderCache.h b/src/Cache/LoaderCache.h
new file mode 100644
index 000000000..63b8c723d
--- /dev/null
+++ b/src/Cache/LoaderCache.h
@@ -0,0 +1,35 @@
+/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
+ SPDX-License-Identifier: GPL-3.0-or-later
+*/
+
+#ifndef CARTA_SRC_CACHE_LOADERCACHE_H_
+#define CARTA_SRC_CACHE_LOADERCACHE_H_
+
+#include
+#include
+#include
+
+#include "ImageData/FileLoader.h"
+
+namespace carta {
+
+// Cache of loaders for reading images from disk.
+class LoaderCache {
+public:
+ LoaderCache(int capacity);
+ std::shared_ptr Get(const std::string& filename, const std::string& directory = "");
+ void Remove(const std::string& filename, const std::string& directory = "");
+
+private:
+ std::string GetKey(const std::string& filename, const std::string& directory);
+ int _capacity;
+ std::unordered_map> _map;
+ std::list _queue;
+ std::mutex _loader_cache_mutex;
+};
+
+} // namespace carta
+
+#endif // CARTA_SRC_CACHE_LOADERCACHE_H_
diff --git a/src/Cache/RequirementsCache.h b/src/Cache/RequirementsCache.h
index b72a09275..1fa771842 100644
--- a/src/Cache/RequirementsCache.h
+++ b/src/Cache/RequirementsCache.h
@@ -1,11 +1,11 @@
/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
-#ifndef CARTA_BACKEND__REQUIREMENTSCACHE_H_
-#define CARTA_BACKEND__REQUIREMENTSCACHE_H_
+#ifndef CARTA_SRC_CACHE_REQUIREMENTSCACHE_H_
+#define CARTA_SRC_CACHE_REQUIREMENTSCACHE_H_
#include "ImageStats/BasicStatsCalculator.h"
#include "ImageStats/Histogram.h"
@@ -223,4 +223,4 @@ struct StatsCache {
} // namespace carta
-#endif // CARTA_BACKEND__REQUIREMENTSCACHE_H_
+#endif // CARTA_SRC_CACHE_REQUIREMENTSCACHE_H_
diff --git a/src/Cache/TileCache.cc b/src/Cache/TileCache.cc
index cf0f942e2..60b594730 100644
--- a/src/Cache/TileCache.cc
+++ b/src/Cache/TileCache.cc
@@ -1,5 +1,5 @@
/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
diff --git a/src/Cache/TileCache.h b/src/Cache/TileCache.h
index 0f026b53c..d0f34753e 100644
--- a/src/Cache/TileCache.h
+++ b/src/Cache/TileCache.h
@@ -1,11 +1,11 @@
/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
-#ifndef CARTA_BACKEND__TILE_CACHE_H_
-#define CARTA_BACKEND__TILE_CACHE_H_
+#ifndef CARTA_SRC_CACHE_TILECACHE_H_
+#define CARTA_SRC_CACHE_TILECACHE_H_
#include
#include
@@ -115,4 +115,4 @@ class TileCache {
} // namespace carta
-#endif // CARTA_BACKEND__TILE_CACHE_H_
+#endif // CARTA_SRC_CACHE_TILECACHE_H_
diff --git a/src/Cache/TileCacheKey.h b/src/Cache/TileCacheKey.h
index f09db272f..a904eb3af 100644
--- a/src/Cache/TileCacheKey.h
+++ b/src/Cache/TileCacheKey.h
@@ -1,11 +1,11 @@
/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
-#ifndef CARTA_BACKEND_TILECACHEKEY_H
-#define CARTA_BACKEND_TILECACHEKEY_H
+#ifndef CARTA_SRC_CACHE_TILECACHEKEY_H_
+#define CARTA_SRC_CACHE_TILECACHEKEY_H_
namespace carta {
/** @brief Key for tiles used in TileCache
@@ -54,4 +54,4 @@ struct hash {
};
} // namespace std
-#endif // CARTA_BACKEND_TILECACHEKEY_H
+#endif // CARTA_SRC_CACHE_TILECACHEKEY_H_
diff --git a/src/Cache/TilePool.cc b/src/Cache/TilePool.cc
index 2cdf2f68e..c16bac39b 100644
--- a/src/Cache/TilePool.cc
+++ b/src/Cache/TilePool.cc
@@ -1,5 +1,5 @@
/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
diff --git a/src/Cache/TilePool.h b/src/Cache/TilePool.h
index 2192e085d..b1a2a33bc 100644
--- a/src/Cache/TilePool.h
+++ b/src/Cache/TilePool.h
@@ -1,11 +1,11 @@
/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
-#ifndef CARTA_BACKEND_TILEPOOL_H
-#define CARTA_BACKEND_TILEPOOL_H
+#ifndef CARTA_SRC_CACHE_TILEPOOL_H_
+#define CARTA_SRC_CACHE_TILEPOOL_H_
#include
#include
@@ -80,4 +80,4 @@ struct TilePool : std::enable_shared_from_this {
} // namespace carta
-#endif // CARTA_BACKEND_TILEPOOL_H
+#endif // CARTA_SRC_CACHE_TILEPOOL_H_
diff --git a/src/DataStream/Compression.cc b/src/DataStream/Compression.cc
index ef28794f4..45b2da924 100644
--- a/src/DataStream/Compression.cc
+++ b/src/DataStream/Compression.cc
@@ -1,5 +1,5 @@
/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
diff --git a/src/DataStream/Compression.h b/src/DataStream/Compression.h
index 15984e46f..2d3c15944 100644
--- a/src/DataStream/Compression.h
+++ b/src/DataStream/Compression.h
@@ -1,11 +1,11 @@
/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
-#ifndef CARTA_BACKEND__COMPRESSION_H_
-#define CARTA_BACKEND__COMPRESSION_H_
+#ifndef CARTA_SRC_DATASTREAM_COMPRESSION_H_
+#define CARTA_SRC_DATASTREAM_COMPRESSION_H_
#include
#include
@@ -24,4 +24,4 @@ void EncodeIntegers(std::vector& array, bool strided = false);
} // namespace carta
-#endif // CARTA_BACKEND__COMPRESSION_H_
+#endif // CARTA_SRC_DATASTREAM_COMPRESSION_H_
diff --git a/src/DataStream/Contouring.cc b/src/DataStream/Contouring.cc
index a4c72e6d6..17f262380 100644
--- a/src/DataStream/Contouring.cc
+++ b/src/DataStream/Contouring.cc
@@ -1,5 +1,5 @@
/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
diff --git a/src/DataStream/Contouring.h b/src/DataStream/Contouring.h
index e9cf4fc31..7362f4281 100644
--- a/src/DataStream/Contouring.h
+++ b/src/DataStream/Contouring.h
@@ -1,11 +1,11 @@
/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
-#ifndef CARTA_BACKEND__CONTOURING_H_
-#define CARTA_BACKEND__CONTOURING_H_
+#ifndef CARTA_SRC_DATASTREAM_CONTOURING_H_
+#define CARTA_SRC_DATASTREAM_CONTOURING_H_
#include
#include
@@ -25,4 +25,4 @@ void TraceContours(float* image, int64_t width, int64_t height, double scale, do
} // namespace carta
-#endif // CARTA_BACKEND__CONTOURING_H_
+#endif // CARTA_SRC_DATASTREAM_CONTOURING_H_
diff --git a/src/DataStream/Smoothing.cc b/src/DataStream/Smoothing.cc
index ff343e8a8..96dd69732 100644
--- a/src/DataStream/Smoothing.cc
+++ b/src/DataStream/Smoothing.cc
@@ -1,5 +1,5 @@
/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
diff --git a/src/DataStream/Smoothing.h b/src/DataStream/Smoothing.h
index 9821545c8..453c3f04c 100644
--- a/src/DataStream/Smoothing.h
+++ b/src/DataStream/Smoothing.h
@@ -1,5 +1,5 @@
/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
@@ -8,8 +8,8 @@
// Created by angus on 2019/09/23.
//
-#ifndef CARTA_BACKEND__SMOOTHING_H_
-#define CARTA_BACKEND__SMOOTHING_H_
+#ifndef CARTA_SRC_DATASTREAM_SMOOTHING_H_
+#define CARTA_SRC_DATASTREAM_SMOOTHING_H_
#include
#include
@@ -77,4 +77,4 @@ void NearestNeighbor(const float* src_data, float* dest_data, int64_t src_width,
} // namespace carta
-#endif // CARTA_BACKEND__SMOOTHING_H_
+#endif // CARTA_SRC_DATASTREAM_SMOOTHING_H_
diff --git a/src/DataStream/Tile.cc b/src/DataStream/Tile.cc
index 6e3453f6b..4c2a0b885 100644
--- a/src/DataStream/Tile.cc
+++ b/src/DataStream/Tile.cc
@@ -1,5 +1,5 @@
/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
diff --git a/src/DataStream/Tile.h b/src/DataStream/Tile.h
index dfef64aa3..6dcdca1db 100644
--- a/src/DataStream/Tile.h
+++ b/src/DataStream/Tile.h
@@ -1,11 +1,11 @@
/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
-#ifndef CARTA_BACKEND__TILE_H_
-#define CARTA_BACKEND__TILE_H_
+#ifndef CARTA_SRC_DATASTREAM_TILE_H_
+#define CARTA_SRC_DATASTREAM_TILE_H_
#include
#include
@@ -52,4 +52,4 @@ struct Tile {
} // namespace carta
-#endif // CARTA_BACKEND__TILE_H_
+#endif // CARTA_SRC_DATASTREAM_TILE_H_
diff --git a/src/DataStream/VectorField.cc b/src/DataStream/VectorField.cc
index e447130e2..953083ab0 100644
--- a/src/DataStream/VectorField.cc
+++ b/src/DataStream/VectorField.cc
@@ -1,5 +1,5 @@
/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
diff --git a/src/DataStream/VectorField.h b/src/DataStream/VectorField.h
index e49b69789..7afa2c0e0 100644
--- a/src/DataStream/VectorField.h
+++ b/src/DataStream/VectorField.h
@@ -1,11 +1,11 @@
/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
-#ifndef CARTA_BACKEND__FRAME_VECTORFIELD_H_
-#define CARTA_BACKEND__FRAME_VECTORFIELD_H_
+#ifndef CARTA_SRC_DATASTREAM_VECTORFIELD_H_
+#define CARTA_SRC_DATASTREAM_VECTORFIELD_H_
#include
#include
@@ -138,4 +138,4 @@ CARTA::ImageBounds GetImageBounds(const carta::Tile& tile, int image_width, int
} // namespace carta
-#endif // CARTA_BACKEND__FRAME_VECTORFIELD_H_
+#endif // CARTA_SRC_DATASTREAM_VECTORFIELD_H_
diff --git a/src/FileList/FileExtInfoLoader.cc b/src/FileList/FileExtInfoLoader.cc
index 4172aeddd..85c01f61b 100644
--- a/src/FileList/FileExtInfoLoader.cc
+++ b/src/FileList/FileExtInfoLoader.cc
@@ -1,5 +1,5 @@
/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
diff --git a/src/FileList/FileExtInfoLoader.h b/src/FileList/FileExtInfoLoader.h
index 1ebc3255e..9ce5d1eb0 100644
--- a/src/FileList/FileExtInfoLoader.h
+++ b/src/FileList/FileExtInfoLoader.h
@@ -1,13 +1,13 @@
/* This file is part of the CARTA Image Viewer: https://github.com/CARTAvis/carta-backend
- Copyright 2018-2022 Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
+ Copyright 2018- Academia Sinica Institute of Astronomy and Astrophysics (ASIAA),
Associated Universities, Inc. (AUI) and the Inter-University Institute for Data Intensive Astronomy (IDIA)
SPDX-License-Identifier: GPL-3.0-or-later
*/
//# FileExtInfoLoader.h: load FileInfoExtended fields for all supported file types
-#ifndef CARTA_BACKEND__FILELIST_FILEEXTINFOLOADER_H_
-#define CARTA_BACKEND__FILELIST_FILEEXTINFOLOADER_H_
+#ifndef CARTA_SRC_FILELIST_FILEEXTINFOLOADER_H_
+#define CARTA_SRC_FILELIST_FILEEXTINFOLOADER_H_
#include