From 263cb7c1bf3966c3292549524e716f7ce5a6c25e Mon Sep 17 00:00:00 2001
From: pixhawk <mavteam@student.ethz.ch>
Date: Mon, 16 Aug 2010 21:34:44 +0200
Subject: [PATCH] Testing data plot iew

---
 src/ui/QGCDataPlot2D.cc             | 16 +++++++++-------
 src/ui/QGCFirmwareUpdate.ui         |  6 ++----
 src/ui/linechart/IncrementalPlot.cc |  9 +++++++++
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/ui/QGCDataPlot2D.cc b/src/ui/QGCDataPlot2D.cc
index a9c614302..406ae1cf0 100644
--- a/src/ui/QGCDataPlot2D.cc
+++ b/src/ui/QGCDataPlot2D.cc
@@ -252,7 +252,6 @@ void QGCDataPlot2D::loadCsvLog(QString file, QString xAxisName, QString yAxisFil
     ui->xAxis->clear();
     ui->yAxis->clear();
 
-    ui->xAxis->addItem("*");
     int curveNameIndex = 0;
 
     int xValueIndex = curveNames.indexOf(xAxisName);
@@ -263,14 +262,17 @@ void QGCDataPlot2D::loadCsvLog(QString file, QString xAxisName, QString yAxisFil
         if (curveNameIndex != xValueIndex)
         {
             // FIXME Add check for y value filter
-            yValues.insert(curveName, new QVector<double>());
-            ui->xAxis->addItem(curveName);
-            // Add separator starting with second item
-            if (curveNameIndex > 0 && curveNameIndex < curveNames.size())
+            if ((ui->yAxis->text() == "") && yValues.contains(curveName))
             {
-                ui->yAxis->setText(ui->yAxis->text()+"|");
+                yValues.insert(curveName, new QVector<double>());
+                ui->xAxis->addItem(curveName);
+                // Add separator starting with second item
+                if (curveNameIndex > 0 && curveNameIndex < curveNames.size())
+                {
+                    ui->yAxis->setText(ui->yAxis->text()+"|");
+                }
+                ui->yAxis->setText(ui->yAxis->text()+curveName);
             }
-            ui->yAxis->setText(ui->yAxis->text()+curveName);
         }
         curveNameIndex++;
     }
diff --git a/src/ui/QGCFirmwareUpdate.ui b/src/ui/QGCFirmwareUpdate.ui
index 389514f63..0981fa633 100644
--- a/src/ui/QGCFirmwareUpdate.ui
+++ b/src/ui/QGCFirmwareUpdate.ui
@@ -1,7 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <author/>
- <comment/>
- <exportmacro/>
  <class>QGCFirmwareUpdate</class>
  <widget class="QWidget" name="QGCFirmwareUpdate">
   <property name="geometry">
@@ -16,6 +14,6 @@
    <string>Form</string>
   </property>
  </widget>
- <pixmapfunction/>
+ <resources/>
  <connections/>
 </ui>
diff --git a/src/ui/linechart/IncrementalPlot.cc b/src/ui/linechart/IncrementalPlot.cc
index b5de68da3..2711b2be4 100644
--- a/src/ui/linechart/IncrementalPlot.cc
+++ b/src/ui/linechart/IncrementalPlot.cc
@@ -270,7 +270,16 @@ QColor IncrementalPlot::getColorForCurve(QString id)
 
 void IncrementalPlot::removeData()
 {
+    foreach (QwtPlotCurve* curve, d_curve)
+    {
+        delete curve;
+    }
     d_curve.clear();
+
+    foreach (CurveData* data, d_data)
+    {
+        delete data;
+    }
     d_data.clear();
     resetScaling();
     replot();
-- 
2.22.0