Changeset 12940 for fact/tools

Timestamp:

02/24/12 20:43:27 (13 years ago)

Author:

ogrimm

Message:

History handling in Edd faster, improved drag and drop functionality, version of Edd for La Palma

Location:

fact/tools

Files:

• Edd/Edd.cc (modified) (5 diffs)
• Edd/Edd.h (modified) (2 diffs)
• Edd_LP (added)
• Edd_LP/Edd.cc (added)
• Edd_LP/Edd.h (added)
• Edd_LP/Edd.pro (added)
• Edd_LP/Error.wav (added)
• Edd_LP/moc_Edd.cpp (added)
• Edd_LP/moc_GUI.cpp (added)

fact/tools/Edd/Edd.cc

@@ -65 +65 @@
 
   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 +80 @@
   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 +106 @@
   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 +244 @@
   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 +303 @@
   
   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);
-  }
 }
 

fact/tools/Edd/Edd.h

@@ -17 +17 @@
     struct ItemDetails {
           unsigned int Board, Chip, Channel;
-      QwtPlotCurve *Signal;
+      QwtPlotCurve *Curve;
           QwtPlotMarker *Trigger;
     };
@@ -45 +45 @@
   private slots:
         void PlotTraces();
-        void DeleteCurve(QwtPlotCurve *);
         void NewEventNum(int);