Index: fact/tools/Edd/Edd.cc
===================================================================
--- fact/tools/Edd/Edd.cc	(revision 12910)
+++ fact/tools/Edd/Edd.cc	(revision 12940)
@@ -65,5 +65,10 @@
 
   SetActive(false);
-  while (!List.isEmpty()) DeleteCurve(List.last().Signal);
+
+  for (int i=0; i<List.size(); i++) {
+	DeleteCurve(List[i].Curve);
+	delete List[i].Trigger;
+  }
+
   delete RD;
   if (Tmpfile != NULL) fclose(Tmpfile);
@@ -75,16 +80,16 @@
   struct ItemDetails N;
   
-  N.Signal = NewCurve(QString::number(Board)+","+QString::number(Chip)+","+ QString::number(Channel)+ " (" + ToPixel(0, Board, Chip, Channel) + ")");
+  N.Curve = NewCurve(QString::number(Board)+","+QString::number(Chip)+","+ QString::number(Channel)+ " (" + ToPixel(0, Board, Chip, Channel) + ")");
   N.Board = Board;
   N.Chip = Chip;
   N.Channel = Channel;
   N.Trigger = new QwtPlotMarker();
-  N.Trigger->setSymbol(QwtSymbol(QwtSymbol::Diamond, QBrush(N.Signal->pen().color()), N.Signal->pen(), QSize(10,10)));
+  N.Trigger->setSymbol(QwtSymbol(QwtSymbol::Diamond, QBrush(N.Curve->pen().color()), N.Curve->pen(), QSize(10,10)));
   N.Trigger->attach(this);
 
   if (List.isEmpty()) {
-    QPen Pen = N.Signal->pen();
+    QPen Pen = N.Curve->pen();
 	Pen.setWidth(2);
-	N.Signal->setPen(Pen);
+	N.Curve->setPen(Pen);
   }
   List.append(N);
@@ -101,5 +106,5 @@
   ClearCurve(0);
 
-  List.first().Signal->setTitle(QString::number(Board)+","+QString::number(Chip)+","+ QString::number(Channel) + " (" + ToPixel(0, Board, Chip, Channel) + ")");
+  List.first().Curve->setTitle(QString::number(Board)+","+QString::number(Chip)+","+ QString::number(Channel) + " (" + ToPixel(0, Board, Chip, Channel) + ")");
   List.first().Board = Board;
   List.first().Chip = Chip;
@@ -239,8 +244,8 @@
   for (int i=0; i<List.size(); i++) {
 
-	if (PersistanceAction->isChecked()) List[i].Signal->setStyle(QwtPlotCurve::Dots);
+	if (PersistanceAction->isChecked()) List[i].Curve->setStyle(QwtPlotCurve::Dots);
 	else {
 	  ClearCurve(i);
-	  List[i].Signal->setStyle(QwtPlotCurve::Lines);
+	  List[i].Curve->setStyle(QwtPlotCurve::Lines);
 	}
 
@@ -298,13 +303,4 @@
   
   emit(PixelData(Pixel));
-}
-
-// Remove list entry
-void EventScope::DeleteCurve(QwtPlotCurve *Curve) {
-
-  for (int i=0; i<List.size(); i++) if (List[i].Signal == Curve) {
-	delete List[i].Trigger;
-    List.removeAt(i);
-  }
 }
 
Index: fact/tools/Edd/Edd.h
===================================================================
--- fact/tools/Edd/Edd.h	(revision 12910)
+++ fact/tools/Edd/Edd.h	(revision 12940)
@@ -17,5 +17,5 @@
     struct ItemDetails {
 	  unsigned int Board, Chip, Channel;
-      QwtPlotCurve *Signal;
+      QwtPlotCurve *Curve;
 	  QwtPlotMarker *Trigger;
     };
@@ -45,5 +45,4 @@
   private slots:
 	void PlotTraces();
-	void DeleteCurve(QwtPlotCurve *);
 	void NewEventNum(int);