DisplayTrace: make all members private

Author: ChrisHal

QtPMbrowser/DisplayTrace.cpp

@@ -120,6 +120,16 @@ void DisplayTrace::render(QPainter& painter, RenderArea* display)
 	}
 }
 
+const std::vector<double>& DisplayTrace::x_data() const
+{
+	if (p_xdata) {
+		return *p_xdata;
+	}
+	else {
+		throw std::runtime_error("trying to acces non-existing x-data");
+	}
+}
+
 std::tuple<double, double> DisplayTrace::getDataMinMax(int pLeft, int pRight) const
 {
 	double min_val, max_val;

QtPMbrowser/DisplayTrace.h

@@ -54,6 +54,7 @@ class DisplayTrace
 	void render(QPainter& painter, RenderArea* display);
 	bool isValid() const { return !m_data.empty(); }
     bool has_x_trace() const { return !!p_xdata; }
+    const std::vector<double>& x_data() const;
 
     /// <summary>
     /// Converts a x-y-trace to an y-only trace (the default)
@@ -95,7 +96,7 @@ class DisplayTrace
     {
         return { y_min, y_max };
     };
-    void getDataMinMax(double& ymin, double& ymax) {
+    void getDataMinMax(double& ymin, double& ymax) const {
         ymin = y_min;
         ymax = y_max;
     };
@@ -104,8 +105,6 @@ class DisplayTrace
     double m_x0{}, m_deltax{}, y_min{}, y_max{};
     QString x_unit, y_unit;
 	std::vector<double> m_data;
-public:
     std::unique_ptr<std::vector<double> > p_xdata;
-
 };
 

QtPMbrowser/renderarea.cpp

@@ -572,7 +572,7 @@ void RenderArea::autoScale()
         find_min_max(xTrace.data().cbegin(), xTrace.data().cend(), g_x_min, g_x_max);
     }
     else if (yTrace.has_x_trace()) {
-        find_min_max(yTrace.p_xdata->cbegin(), yTrace.p_xdata->cend(), g_x_min, g_x_max);
+        find_min_max(yTrace.x_data().cbegin(), yTrace.x_data().cend(), g_x_min, g_x_max);
     }
     else
     {
@@ -583,7 +583,7 @@ void RenderArea::autoScale()
         for(const auto* t: tracebuffer){
             if(t->has_x_trace()){
                 double minx, maxx;
-                find_min_max(t->p_xdata->cbegin(), t->p_xdata->cend(), minx, maxx);
+                find_min_max(t->x_data().cbegin(), t->x_data().cend(), minx, maxx);
                 g_x_min=std::min(g_x_min,minx);
                 g_x_max=std::max(g_x_max, maxx);
             }