Changeset 12302 for trunk

Timestamp:

10/27/11 16:45:13 (13 years ago)

Author:

lyard

Message:

added clean destruction of qwt objects

Location:

trunk/FACT++/gui/RawEventsViewer

Files:

• RawEventsViewer.cc (modified) (3 diffs)
• RawEventsViewer.h (modified) (3 diffs)

trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc

@@ -23 +23 @@
 #include <QFileDialog>
 
-#include <qwt_plot_grid.h>
 #include <qwt_symbol.h>
 
@@ -1242 +1241 @@
     show();
 }
-
+UIConnector::~UIConnector()
+{
+    grid1->detach();
+    grid2->detach();
+    grid3->detach();
+    grid4->detach();
+    grid5->detach();
+    boardsTimeHistoItem.detach();
+    startCellHistoItem.detach();
+    startTimeMarkHistoItem.detach();
+    pixelValueCurveItem.detach();
+    aMeanCurveItem.detach();
+    vCorrCurveItem.detach();
+    meanCurveItem.detach();
+}
 void UIConnector::slicesPlusPlus()
 {
@@ -1893 +1906 @@
 //    QwtPlot*     boardsTimeHisto;
 //    QwtPlotHistogram boardsTimeHistoItem;
-    QwtPlotGrid* grid = new QwtPlotGrid;
-    grid->enableX(false);
-    grid->enableY(true);
-    grid->enableXMin(false);
-    grid->enableYMin(false);
-    grid->setMajPen(QPen(Qt::black, 0, Qt::DotLine));
-    grid->attach(boardsTimeHisto);
-
-    grid = new QwtPlotGrid;
-    grid->enableX(false);
-    grid->enableY(true);
-    grid->enableXMin(false);
-    grid->enableYMin(false);
-    grid->setMajPen(QPen(Qt::black, 0, Qt::DotLine));
-    grid->attach(startCellsHisto);
-
-    grid = new QwtPlotGrid;
-    grid->enableX(false);
-    grid->enableY(true);
-    grid->enableXMin(false);
-    grid->enableYMin(false);
-    grid->setMajPen(QPen(Qt::black, 0, Qt::DotLine));
-    grid->attach(startTimeMarkHisto);
-
-    grid = new QwtPlotGrid;
-    grid->enableX(false);
-    grid->enableY(true);
-    grid->enableXMin(false);
-    grid->enableYMin(false);
-    grid->setMajPen(QPen(Qt::black, 0, Qt::DotLine));
-    grid->attach(pixelValueCurve);
-
-    grid = new QwtPlotGrid;
-    grid->enableX(false);
-    grid->enableY(true);
-    grid->enableXMin(false);
-    grid->enableYMin(false);
-    grid->setMajPen(QPen(Qt::black, 0, Qt::DotLine));
-    grid->attach(triggerDelayHisto);
+    grid1 = new QwtPlotGrid;
+    grid1->enableX(false);
+    grid1->enableY(true);
+    grid1->enableXMin(false);
+    grid1->enableYMin(false);
+    grid1->setMajPen(QPen(Qt::black, 0, Qt::DotLine));
+    grid1->attach(boardsTimeHisto);
+
+    grid2 = new QwtPlotGrid;
+    grid2->enableX(false);
+    grid2->enableY(true);
+    grid2->enableXMin(false);
+    grid2->enableYMin(false);
+    grid2->setMajPen(QPen(Qt::black, 0, Qt::DotLine));
+    grid2->attach(startCellsHisto);
+
+    grid3 = new QwtPlotGrid;
+    grid3->enableX(false);
+    grid3->enableY(true);
+    grid3->enableXMin(false);
+    grid3->enableYMin(false);
+    grid3->setMajPen(QPen(Qt::black, 0, Qt::DotLine));
+    grid3->attach(startTimeMarkHisto);
+
+    grid4 = new QwtPlotGrid;
+    grid4->enableX(false);
+    grid4->enableY(true);
+    grid4->enableXMin(false);
+    grid4->enableYMin(false);
+    grid4->setMajPen(QPen(Qt::black, 0, Qt::DotLine));
+    grid4->attach(pixelValueCurve);
+
+    grid5 = new QwtPlotGrid;
+    grid5->enableX(false);
+    grid5->enableY(true);
+    grid5->enableXMin(false);
+    grid5->enableYMin(false);
+    grid5->setMajPen(QPen(Qt::black, 0, Qt::DotLine));
+    grid5->attach(triggerDelayHisto);
 
     boardsTimeHisto->setAutoReplot(true);

trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.h

@@ -38 +38 @@
 //#include "qwt_plot_histogram.h"
 #include <qwt_plot_curve.h>
-
+#include <qwt_plot_grid.h>
 #include <qwt_plot_zoomer.h>
 
@@ -210 +210 @@
 public:
     UIConnector(QWidget *parent = 0);
+    ~UIConnector();
 
 public Q_SLOTS:
@@ -292 +293 @@
     QwtPlotZoomer* startTimeMarkHistoZoom;
     QwtPlotZoomer* triggerDelayHistoZoom;
+
+    //declare the grids here, because I must have access to them to detach them properly at destruction time (bug and crash with "bad" versions of qwt)
+    QwtPlotGrid* grid1;
+    QwtPlotGrid* grid2;
+    QwtPlotGrid* grid3;
+    QwtPlotGrid* grid4;
+    QwtPlotGrid* grid5;
 };