Changeset 11740 for trunk/FACT++

Timestamp:

08/02/11 15:43:03 (13 years ago)

Author:

lyard

Message:

improved zooming and bug fix of raw events viewer

Location:

trunk/FACT++/gui/RawEventsViewer

Files:

• RawEventsViewer.cc (modified) (8 diffs)
• RawEventsViewer.h (modified) (2 diffs)
• viewer.ui (modified) (1 diff)

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

@@ -20 +20 @@
 #include <QtGui/QFileDialog>
 
-#include <qwt_plot_grid.h>
-#include <qwt_symbol.h>
+#include <qwt-qt4/qwt_plot_grid.h>
+#include <qwt-qt4/qwt_symbol.h>
 
 #include "src/Configuration.h"
@@ -1022 +1022 @@
     if (whichSlice >= nRoi)
     {
+        whichSlice = 0;
         if (!loopCurrentEvent)
         {
@@ -1029 +1030 @@
             eventStep = backupStep;
         }
-        whichSlice=0;
     }
     emit signalCurrentSlice(whichSlice);
@@ -1039 +1039 @@
     if (whichSlice < 0)
     {
+        whichSlice = nRoi-1;
         if (!loopCurrentEvent)
         {
@@ -1046 +1047 @@
             eventStep = backupStep;
         }
-        whichSlice = nRoi-1;
     }
     emit signalCurrentSlice(whichSlice);
@@ -1641 +1641 @@
 //    startCellHistoZoom->setZoomBase(startCellHistoItem.boundingRect());
     QStack< QRectF > stack;
-    stack.push(boardsTimeHistoItem.boundingRect());
+//    QRectF cRectangle = boardsTimeHistoItem.boundingRect();
+    stack.push(scaleBoundingRectangle(boardsTimeHistoItem.boundingRect(), 1.05f));//cRectangle);//boardsTimeHistoItem.boundingRect());
     boardsTimeHistoZoom->setZoomStack(stack);
     stack.pop();
-    stack.push(startCellHistoItem.boundingRect());
+    stack.push(scaleBoundingRectangle(startCellHistoItem.boundingRect(), 1.05f));
     startCellHistoZoom->setZoomStack(stack);
     stack.pop();
-    stack.push(startTimeMarkHistoItem.boundingRect());
+    stack.push(scaleBoundingRectangle(startTimeMarkHistoItem.boundingRect(), 1.05f));
     startTimeMarkHistoZoom->setZoomStack(stack);
     stack.pop();
-    stack.push(triggerDelayHistoItem.boundingRect());
+    stack.push(scaleBoundingRectangle(triggerDelayHistoItem.boundingRect(), 1.05f));
     triggerDelayHistoZoom->setZoomStack(stack);
     stack.pop();
     pixelChanged(viewer->selectedPixel);
-
-
-
-}
-
+}
+//can't use a ref to rectangle, as the type must be converted first
+QRectF UIConnector::scaleBoundingRectangle(QRectF rectangle, float scale)
+{
+    QPointF bottomRight = rectangle.bottomRight();
+    QPointF topLeft = rectangle.topLeft();
+    QPointF center = rectangle.center();
+    return QRectF(topLeft + (topLeft-center)*(scale-1.0f), //top left
+                  bottomRight + (bottomRight-center)*(scale-1.0f)); //bottom right
+}
 void UIConnector::initHistograms()
 {
@@ -1776 +1782 @@
     }
 #if QWT_VERSION < 0x060000
-       pixelValueCurveItem.setRawData(xval, yval, viewer->nRoi);
+       pixelValueCurveItem.setData(xval, yval, viewer->nRoi);
 #else
-       pixelValueCurveItem.setRawSamples(xval, yval, viewer->nRoi);
+       pixelValueCurveItem.setSamples(xval, yval, viewer->nRoi);
 #endif
 
     QStack< QRectF > stack;
-    stack.push(pixelValueCurveItem.boundingRect());
+    stack.push(scaleBoundingRectangle(pixelValueCurveItem.boundingRect(), 1.05f));
     curveZoom->setZoomStack(stack);
     stack.pop();
@@ -1969 +1975 @@
         ("color.range", vars<double>(), "Range of the display colours")
         ("color.red", vars<double>(), "Range of red values")
-        ("color.rreen", vars<double>(), "Range of green values")
+        ("color.green", vars<double>(), "Range of green values")
         ("color.blue", vars<double>(), "Range of blue values")
         ("file,f", var<string>(), "File to be loaded at startup")

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

@@ -30 +30 @@
 #include <GL/gl.h>
 
-#include "qwt_plot.h"
+#include <qwt-qt4/qwt_plot.h>
 //#include "qwt_plot_histogram.h"
-#include "qwt_plot_curve.h"
-
-#include <qwt_plot_zoomer.h>
+#include <qwt-qt4/qwt_plot_curve.h>
+
+#include <qwt-qt4/qwt_plot_zoomer.h>
 
 
@@ -253 +253 @@
     int swID;
     bool rescaleWholeCamera;
+    QRectF scaleBoundingRectangle(QRectF rectangle, float scale);
 public:
     QListWidget *boardsTimeList;

trunk/FACT++/gui/RawEventsViewer/viewer.ui

@@ -857 +857 @@
    <class>QwtPlot</class>
    <extends>QFrame</extends>
-   <header>qwt_plot.h</header>
+   <header>qwt-qt4/qwt_plot.h</header>
    <container>1</container>
   </customwidget>