From b41b3e218e77548e4fd2dcf9dc1c2122fecff162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20K=C3=A4berich?= <j.kaeberich@gmx.de>
Date: Thu, 22 Dec 2022 22:15:03 +0100
Subject: [PATCH] provide de-embedding data for rData() if available

---
 .../PC_Application/LibreVNA-GUI/Traces/Math/tracemath.h  | 2 +-
 Software/PC_Application/LibreVNA-GUI/Traces/trace.cpp    | 9 +++++++++
 Software/PC_Application/LibreVNA-GUI/Traces/trace.h      | 1 +
 .../LibreVNA-GUI/usersjanappdatalocaltemptmpdkjetq       | 0
 .../LibreVNA-GUI/usersjanappdatalocaltemptmpguhrdw       | 0
 .../LibreVNA-GUI/usersjanappdatalocaltemptmpojxrxr       | 0
 .../LibreVNA-GUI/usersjanappdatalocaltemptmpsgzefn       | 0
 7 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 Software/PC_Application/LibreVNA-GUI/usersjanappdatalocaltemptmpdkjetq
 create mode 100644 Software/PC_Application/LibreVNA-GUI/usersjanappdatalocaltemptmpguhrdw
 create mode 100644 Software/PC_Application/LibreVNA-GUI/usersjanappdatalocaltemptmpojxrxr
 create mode 100644 Software/PC_Application/LibreVNA-GUI/usersjanappdatalocaltemptmpsgzefn

diff --git a/Software/PC_Application/LibreVNA-GUI/Traces/Math/tracemath.h b/Software/PC_Application/LibreVNA-GUI/Traces/Math/tracemath.h
index 3a043b9..08d06dc 100644
--- a/Software/PC_Application/LibreVNA-GUI/Traces/Math/tracemath.h
+++ b/Software/PC_Application/LibreVNA-GUI/Traces/Math/tracemath.h
@@ -110,7 +110,7 @@ public:
     void assignInput(TraceMath *input);
 
     DataType getDataType() const;
-    std::vector<Data>& rData() { return data;}
+    virtual std::vector<Data>& rData() { return data;}
     Status getStatus() const;
     QString getStatusDescription() const;
     virtual Type getType() = 0;
diff --git a/Software/PC_Application/LibreVNA-GUI/Traces/trace.cpp b/Software/PC_Application/LibreVNA-GUI/Traces/trace.cpp
index 02810a2..4157970 100644
--- a/Software/PC_Application/LibreVNA-GUI/Traces/trace.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/Traces/trace.cpp
@@ -1484,6 +1484,15 @@ unsigned int Trace::numSamples()
     }
 }
 
+std::vector<Trace::Data> &Trace::rData()
+{
+    if(deembeddingActive && deembeddingAvailable()) {
+        return deembeddingData;
+    } else {
+        return TraceMath::rData();
+    }
+}
+
 double Trace::getUnwrappedPhase(unsigned int index)
 {
     if(index >= size()) {
diff --git a/Software/PC_Application/LibreVNA-GUI/Traces/trace.h b/Software/PC_Application/LibreVNA-GUI/Traces/trace.h
index 1b50b22..45b21dc 100644
--- a/Software/PC_Application/LibreVNA-GUI/Traces/trace.h
+++ b/Software/PC_Application/LibreVNA-GUI/Traces/trace.h
@@ -93,6 +93,7 @@ public:
     virtual Data getSample(unsigned int index) override;
     virtual Data getInterpolatedSample(double x) override;
     virtual unsigned int numSamples() override;
+    virtual std::vector<Data>& rData() override;
 
     double getUnwrappedPhase(unsigned int index);
     // returns a (possibly interpolated sample) at a specified frequency/time/power
diff --git a/Software/PC_Application/LibreVNA-GUI/usersjanappdatalocaltemptmpdkjetq b/Software/PC_Application/LibreVNA-GUI/usersjanappdatalocaltemptmpdkjetq
new file mode 100644
index 0000000..e69de29
diff --git a/Software/PC_Application/LibreVNA-GUI/usersjanappdatalocaltemptmpguhrdw b/Software/PC_Application/LibreVNA-GUI/usersjanappdatalocaltemptmpguhrdw
new file mode 100644
index 0000000..e69de29
diff --git a/Software/PC_Application/LibreVNA-GUI/usersjanappdatalocaltemptmpojxrxr b/Software/PC_Application/LibreVNA-GUI/usersjanappdatalocaltemptmpojxrxr
new file mode 100644
index 0000000..e69de29
diff --git a/Software/PC_Application/LibreVNA-GUI/usersjanappdatalocaltemptmpsgzefn b/Software/PC_Application/LibreVNA-GUI/usersjanappdatalocaltemptmpsgzefn
new file mode 100644
index 0000000..e69de29