Support contour channel range

CARTAvis · May 14, 2024 · acc5156 · acc5156
1 parent 590b334
commit acc5156
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/src/Session/Session.cc b/src/Session/Session.cc
@@ -1101,10 +1101,27 @@ void Session::OnSetStatsRequirements(const CARTA::SetStatsRequirements& message)
 }
 
 void Session::OnSetContourParameters(const CARTA::SetContourParameters& message, bool silent) {
-    if (_frames.count(message.file_id())) {
+    int file_id(message.file_id());
+
+    if (_frames.count(file_id)) {
+        auto frame = _frames.at(file_id);
         const int num_levels = message.levels_size();
-        if (_frames.at(message.file_id())->SetContourParameters(message) && num_levels && !silent) {
-            SendContourData(message.file_id());
+
+        if (frame->SetContourParameters(message) && num_levels && !silent) {
+            if (message.has_channel_range()) {
+                int start_channel(message.channel_range().min());
+                int end_channel(message.channel_range().max());
+                int nchan(frame->Depth());
+#pragma omp parallel for
+                for (int chan = start_channel; chan <= end_channel; ++chan) {
+                    if (chan >= nchan) {
+                        continue;
+                    }
+                    SendContourData(file_id, true, chan);
+                }
+            } else {
+                SendContourData(file_id);
+            }
         }
     }
 }
@@ -1837,18 +1854,19 @@ void Session::StopPvPreviewUpdates(int preview_id) {
     }
 }
 
-bool Session::SendContourData(int file_id, bool ignore_empty) {
+bool Session::SendContourData(int file_id, bool ignore_empty, int channel) {
     if (_frames.count(file_id)) {
         auto frame = _frames.at(file_id);
         const ContourSettings settings = frame->GetContourParameters();
         int num_levels = settings.levels.size();
+        int contour_channel = channel == CURRENT_Z ? frame->CurrentZ() : channel;
 
         if (!num_levels) {
             if (ignore_empty) {
                 return false;
             } else {
                 auto empty_response =
-                    Message::ContourImageData(file_id, settings.reference_file_id, frame->CurrentZ(), frame->CurrentStokes(), 1.0);
+                    Message::ContourImageData(file_id, settings.reference_file_id, contour_channel, frame->CurrentStokes(), 1.0);
                 SendFileEvent(file_id, CARTA::EventType::CONTOUR_IMAGE_DATA, 0, empty_response);
                 return true;
             }
@@ -1859,7 +1877,7 @@ bool Session::SendContourData(int file_id, bool ignore_empty) {
         auto callback = [&](double level, double progress, const std::vector<float>& vertices, const std::vector<int>& indices) {
             // Currently only supports identical reference file IDs
             auto partial_response =
-                Message::ContourImageData(file_id, settings.reference_file_id, frame->CurrentZ(), frame->CurrentStokes(), progress);
+                Message::ContourImageData(file_id, settings.reference_file_id, contour_channel, frame->CurrentStokes(), progress);
             std::vector<char> compression_buffer;
             const float pixel_rounding = std::max(1, std::min(32, settings.decimation));
 #if _DISABLE_CONTOUR_COMPRESSION_

diff --git a/src/Session/Session.h b/src/Session/Session.h
@@ -252,7 +252,7 @@ class Session {
     bool CalculateCubeHistogram(int file_id, CARTA::RegionHistogramData& cube_histogram_message);
 
     // Send data streams
-    bool SendContourData(int file_id, bool ignore_empty = true);
+    bool SendContourData(int file_id, bool ignore_empty = true, int channel = CURRENT_Z);
     bool SendSpatialProfileData(int file_id, int region_id);
     void SendSpatialProfileDataByFileId(int file_id);
     void SendSpatialProfileDataByRegionId(int region_id);