Changeset 11705 for trunk/FACT++

Timestamp:

07/29/11 18:06:37 (13 years ago)

Author:

tbretz

Message:

Added some ifdef to make it compile with Qwt 5.2; little change to the program options (so they are easier to be used in a file; made --file the first positional argument; fixed the include path to Coonfiguration.h

File:

• trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc (modified) (12 diffs)

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

@@ -23 +23 @@
 #include <qwt_symbol.h>
 
-#include "../../src/Configuration.h"
+#include "src/Configuration.h"
 
 //Coordinates of an hexagon of radius 1 and center 0
@@ -1520 +1520 @@
     nsamples++;
  //   if (nsamples > 5)
-        boardsTimeHistoItem.setSamples(xval, yval, nsamples);
+#if QWT_VERSION < 0x060000
+       boardsTimeHistoItem.setData(xval, yval, nsamples);
+#else
+       boardsTimeHistoItem.setSamples(xval, yval, nsamples);
+#endif
 
     it = pixelHistoMap.begin();
@@ -1555 +1559 @@
     nsamples++;
 //    if (nsamples > 5)
-        startCellHistoItem.setSamples(xval, yval, nsamples);
+#if QWT_VERSION < 0x060000
+       startCellHistoItem.setData(xval, yval, nsamples);
+#else
+       startCellHistoItem.setSamples(xval, yval, nsamples);
+#endif
 
     it = timeMarksMap.begin();
@@ -1590 +1598 @@
     nsamples++;
  //   if (nsamples > 5)
-        startTimeMarkHistoItem.setSamples(xval, yval, nsamples);
+#if QWT_VERSION < 0x060000
+       startTimeMarkHistoItem.setData(xval, yval, nsamples);
+#else
+       startTimeMarkHistoItem.setSamples(xval, yval, nsamples);
+#endif
 
     it = delayMap.begin();
@@ -1625 +1637 @@
     nsamples++;
   //  if (nsamples > 5)
-        triggerDelayHistoItem.setSamples(xval, yval, nsamples);
+#if QWT_VERSION < 0x060000
+       triggerDelayHistoItem.setData(xval, yval, nsamples);
+#else
+       triggerDelayHistoItem.setSamples(xval, yval, nsamples);
+#endif
 
 
@@ -1764 +1780 @@
 #endif
     }
-    pixelValueCurveItem.setRawSamples(xval, yval, viewer->nRoi);
+#if QWT_VERSION < 0x060000
+       pixelValueCurveItem.setRawData(xval, yval, viewer->nRoi);
+#else
+       pixelValueCurveItem.setRawSamples(xval, yval, viewer->nRoi);
+#endif
 
     QStack< QRectF > stack;
@@ -1952 +1972 @@
     po::options_description configs("Raw Events Viewer Options");
     configs.add_options()
-        ("colorRange", vars<double>(), "Range of the display colours")
-        ("colorRed", vars<double>(), "Range of red values")
-        ("colorGreen", vars<double>(), "Range of green values")
-        ("colorBlue", vars<double>(), "Range of blue values")
+        ("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.blue", vars<double>(), "Range of blue values")
         ("file,f", var<string>(), "File to be loaded at startup")
         ;
     conf.AddOptions(configs);
+
+    po::positional_options_description p;
+    p.add("file", 1); // The first positional options
+    conf.SetArgumentPositions(p);
+
 }
 /************************************************************
@@ -1971 +1996 @@
         return -1;
 
-    if (conf.Has("colorRange"))
-    {
-        vector<double> value = conf.Vec<double>("colorRange");
+    if (conf.Has("color.range"))
+    {
+        vector<double> value = conf.Vec<double>("color.range");
         if (value.size() != 5)
         {
@@ -1983 +2008 @@
     }
 
-    if (conf.Has("colorRed"))
-    {
-        vector<double> value = conf.Vec<double>("colorRed");
+    if (conf.Has("color.red"))
+    {
+        vector<double> value = conf.Vec<double>("color.red");
         if (value.size() != 5)
         {
@@ -1995 +2020 @@
     }
 
-    if (conf.Has("colorGreen"))
-    {
-        vector<double> value = conf.Vec<double>("colorGreen");
+    if (conf.Has("color.green"))
+    {
+        vector<double> value = conf.Vec<double>("color.green");
         if (value.size() != 5)
         {
@@ -2007 +2032 @@
     }
 
-    if (conf.Has("colorBlue"))
-    {
-        vector<double> value = conf.Vec<double>("colorBlue");
+    if (conf.Has("color.blue"))
+    {
+        vector<double> value = conf.Vec<double>("color.blue");
         if (value.size() != 5)
         {
@@ -2022 +2047 @@
 
     if (!QGLFormat::hasOpenGL()) {
-        std::cout << "This system has no OpenGL support" << std::endl;
+        std::cerr << "This system has no OpenGL support" << std::endl;
         return 1;
     }