Remove unused methods, update test CMakeLists

src/Region/Region.cc

@@ -156,6 +156,7 @@ void Region::SetReferenceRegion() {
     casacore::IPosition pixel_axes(2, 0, 1);
     casacore::Vector<casacore::Int> abs_rel;
     auto type(region_state.type);
+
     try {
         switch (type) {
             case CARTA::POINT:
@@ -212,7 +213,7 @@ void Region::SetReferenceRegion() {
             }
             case CARTA::ELLIPSE:
             case CARTA::ANNELLIPSE:   // [(cx, cy), (bmaj, bmin)]
-            case CARTA::ANNCOMPASS: { // [(cx, cy), (length, length)}
+            case CARTA::ANNCOMPASS: { // [(cx, cy), (length, length)]
                 float ellipse_rotation;
                 if (EllipsePointsToWorld(pixel_points, _wcs_control_points, ellipse_rotation)) {
                     // control points are in order: xcenter, ycenter, major axis, minor axis
@@ -822,7 +823,7 @@ casacore::TableRecord Region::GetImageRegionRecord(
     }
 
     if (record.empty()) {
-        // LCRegion failed, is outside the image or a rotated rectangle.
+        // LCRegion failed: is outside the image or a rotated rectangle.
         // Manually convert control points and put in Record.
         record = GetRegionPointsRecord(file_id, output_csys, output_shape);
     }

src/Region/Region.h

@@ -48,15 +48,10 @@ struct RegionState {
     RegionState(int ref_file_id_, CARTA::RegionType type_, const std::vector<CARTA::Point>& control_points_, float rotation_)
         : reference_file_id(ref_file_id_), type(type_), control_points(control_points_), rotation(rotation_) {}
 
-    void operator=(const RegionState& other) {
-        reference_file_id = other.reference_file_id;
-        type = other.type;
-        control_points = other.control_points;
-        rotation = other.rotation;
-    }
     bool operator==(const RegionState& rhs) {
         return (reference_file_id == rhs.reference_file_id) && (type == rhs.type) && !RegionChanged(rhs);
     }
+
     bool operator!=(const RegionState& rhs) {
         return (reference_file_id != rhs.reference_file_id) || (type != rhs.type) || RegionChanged(rhs);
     }
@@ -103,10 +98,6 @@ class Region {
         return region_state;
     }
 
-    inline int GetReferenceFileId() {
-        return GetRegionState().reference_file_id;
-    }
-
     inline bool RegionChanged() { // reference image, type, points, or rotation changed
         return _region_changed;
     }
@@ -152,8 +143,6 @@ class Region {
     std::shared_mutex& GetActiveTaskMutex();
 
 private:
-    bool SetPoints(const std::vector<CARTA::Point>& points);
-
     // check points: number required for region type, and values are finite
     bool CheckPoints(const std::vector<CARTA::Point>& points, CARTA::RegionType type);
     bool PointsFinite(const std::vector<CARTA::Point>& points);

src/Region/RegionHandler.cc

@@ -96,14 +96,6 @@ bool RegionHandler::SetRegion(int& region_id, RegionState& region_state, std::sh
     return valid_region;
 }
 
-bool RegionHandler::RegionChanged(int region_id) {
-    // Used to trigger sending profiles etc., so not for annotation regions
-    if (!RegionSet(region_id, true)) {
-        return false;
-    }
-    return GetRegion(region_id)->RegionChanged();
-}
-
 void RegionHandler::RemoveRegion(int region_id) {
     // Call destructor and erase from map
     if (!RegionSet(region_id)) {

src/Region/RegionHandler.h

@@ -35,7 +35,6 @@ class RegionHandler {
 
     // Regions
     bool SetRegion(int& region_id, RegionState& region_state, std::shared_ptr<casacore::CoordinateSystem> csys);
-    bool RegionChanged(int region_id);
     void RemoveRegion(int region_id);
     std::shared_ptr<Region> GetRegion(int region_id);
 

test/CMakeLists.txt

@@ -39,6 +39,7 @@ set(TEST_SOURCES
         CommonTestUtilities.cc
         TestBlockSmooth.cc
         TestContour.cc
+        TestCursorSpatialProfiles.cc
         TestExprImage.cc
         TestFileInfo.cc
         TestFileList.cc
@@ -48,14 +49,13 @@ set(TEST_SOURCES
         TestHdf5Image.cc
         TestHistogram.cc
         TestImageFitting.cc
-		TestLineSpatialProfiles.cc
         TestMain.cc
         TestMoment.cc
         TestNormalizedUnits.cc
         TestProgramSettings.cc
         TestPvGenerator.cc
+        TestRegionSpatialProfiles.cc
         TestRestApi.cc
-        TestSpatialProfiles.cc
         TestTileEncoding.cc
         TestUtil.cc
         TestVoTable.cc)