Refactor Region code to RegionState and RegionConverter

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Improve the code style in HTTP server ([#1260](https://github.com/CARTAvis/carta-backend/issues/1260)).
 * Remove program settings equality operators ([#1001](https://github.com/CARTAvis/carta-backend/issues/1001)).
 * Normalize the style of guard names in header files ([#1023](https://github.com/CARTAvis/carta-backend/issues/1023)).
+* Move Region code to RegionConverter for maintenance and performance ([#1347](https://github.com/CARTAvis/carta-backend/issues/1347)).
 
 ## [4.1.0]
 

CMakeLists.txt

@@ -233,6 +233,7 @@ set(SOURCE_FILES
         src/Region/Ds9ImportExport.cc
         src/Region/LineBoxRegions.cc
         src/Region/Region.cc
+        src/Region/RegionConverter.cc
         src/Region/RegionHandler.cc
         src/Region/RegionImportExport.cc
         src/Session/CursorSettings.cc

src/ImageGenerators/PvPreviewCube.cc

@@ -12,6 +12,7 @@
 #include <casacore/images/Images/RebinImage.h>
 
 #include "DataStream/Smoothing.h"
+#include "Logger/Logger.h"
 #include "Timer/Timer.h"
 
 #define LOAD_DATA_PROGRESS_INTERVAL 1000

src/ImageGenerators/PvPreviewCube.h

@@ -7,13 +7,13 @@
 #ifndef CARTA_SRC_IMAGEGENERATORS_PVPREVIEWCUBE_H_
 #define CARTA_SRC_IMAGEGENERATORS_PVPREVIEWCUBE_H_
 
+#include <casacore/images/Images/SubImage.h>
+
 #include "ImageGenerators/ImageGenerator.h"
 #include "Region/Region.h"
 #include "Util/File.h"
 #include "Util/Image.h"
 
-#include <casacore/images/Images/SubImage.h>
-
 namespace carta {
 
 struct PreviewCubeParameters {

src/ImageGenerators/PvPreviewCut.h

@@ -7,6 +7,8 @@
 #ifndef CARTA_SRC_IMAGEGENERATORS_PVPREVIEWCUT_H_
 #define CARTA_SRC_IMAGEGENERATORS_PVPREVIEWCUT_H_
 
+#include <carta-protobuf/pv_preview.pb.h>
+
 #include "Region/Region.h"
 #include "Util/File.h"
 

src/Region/CrtfImportExport.cc

@@ -451,7 +451,6 @@ void CrtfImportExport::ProcessFileLines(std::vector<std::string>& lines) {
         std::vector<std::string> parameters;
         std::unordered_map<std::string, std::string> properties;
         ParseRegionParameters(line, parameters, properties);
-
         // Coordinate frame for world coordinates conversion
         RegionState region_state;
         CARTA::RegionStyle region_style;
@@ -499,7 +498,13 @@ void CrtfImportExport::ProcessFileLines(std::vector<std::string>& lines) {
                     if (region == "text") {
                         // Set text label for text region
                         if (parameters.size() == 4) { // text, x, y, "text"
-                            region_style.mutable_annotation_style()->set_text_label0(parameters[3]);
+                            std::string label(parameters[3]);
+                            if (!label.empty() &&
+                                ((label.front() == '"' && label.back() == '"') || (label.front() == '\'' && label.back() == '\''))) {
+                                label.pop_back();
+                                label = label.substr(1);
+                            }
+                            region_style.mutable_annotation_style()->set_text_label0(label);
                         }
                     } else {
                         // Set text position for textbox region

src/Region/LineBoxRegions.cc

@@ -11,6 +11,7 @@
 #include <casacore/coordinates/Coordinates/DirectionCoordinate.h>
 
 #include "Logger/Logger.h"
+#include "Util/Message.h"
 
 namespace carta {