Changeset 12053 for trunk/FACT++/gui/RawEventsViewer

Timestamp:

09/09/11 10:09:58 (13 years ago)

Author:

tbretz

Message:

Removed the errornous subdirectory form the include of the Qwt classes; moved include of fits to the source file; removed a global namespace definition from the header

Location:

trunk/FACT++/gui/RawEventsViewer

Files:

• RawEventsViewer.cc (modified) (1 diff)
• RawEventsViewer.h (modified) (6 diffs)

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

@@ -19 +19 @@
 #define VALUES_SPAN 4096
 
-#include <QtGui/QFileDialog>
-
-#include <qwt-qt4/qwt_plot_grid.h>
-#include <qwt-qt4/qwt_symbol.h>
+#include <QFileDialog>
+
+#include <qwt_plot_grid.h>
+#include <qwt_symbol.h>
 
 #include "src/Configuration.h"
+#include "externals/fits.h"
+
+using namespace std;
 
 #undef ACTUAL_NUM_PIXELS

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

@@ -15 +15 @@
 //#define LOAD_RAW
 
-#include <QtCore/QObject>
-#include <QtCore/QTimer>
-#include <QtGui/QLabel>
-#include <QtGui/QListWidget>
-#include <QtGui/QMainWindow>
-#include <QtGui/QPushButton>
+#include <QObject>
+#include <QTimer>
+#include <QLabel>
+#include <QListWidget>
+#include <QMainWindow>
+#include <QPushButton>
 
 //#include <QtOpenGL/QGLWidget>
 #include "../BasicGlCamera.h"
 
-#include <QtGui/QMouseEvent>
-#include <QtGui/QColorDialog>
-#include <QtGui/QApplication>
-#include <QtGui/QSpinBox>
-#include <QtGui/QDoubleSpinBox>
-#include <QtGui/QRadioButton>
-#include <QtGui/QCheckBox>
+#include <QMouseEvent>
+#include <QColorDialog>
+#include <QApplication>
+#include <QSpinBox>
+#include <QDoubleSpinBox>
+#include <QRadioButton>
+#include <QCheckBox>
 #include <iostream>
 #include <GL/gl.h>
 
-#include <qwt-qt4/qwt_plot.h>
+#include <qwt_plot.h>
 //#include "qwt_plot_histogram.h"
-#include <qwt-qt4/qwt_plot_curve.h>
-
-#include <qwt-qt4/qwt_plot_zoomer.h>
+#include <qwt_plot_curve.h>
+
+#include <qwt_plot_zoomer.h>
 
 #include <valarray>
@@ -45 +45 @@
 #include <string>
 
-#include "externals/fits.h"
+namespace std
+{
+    class fits;
+}
 
 /*************************************************
@@ -58 +61 @@
     RawDataViewer(QWidget *parent = 0);
     ~RawDataViewer();
-    void openFile(string& file);
-    void openCalibFile(string& file);
+    void openFile(std::string& file);
+    void openCalibFile(std::string& file);
 
 
@@ -132 +135 @@
     int nBoards;
     int nPixels;
-    string timeSystem;
-    string creationDate;
+    std::string timeSystem;
+    std::string creationDate;
     int nightInt;
-    string camera;
-    string daq;
+    std::string camera;
+    std::string daq;
     float adcCount;
     int nbOk;
@@ -149 +152 @@
     GLfloat patchesColor[160][3];
 //    vector<edge> patchesIndices[160];
-    fits* inputFile;
-    fits* calibInputFile;
+    std::fits* inputFile;
+    std::fits* calibInputFile;
     float baseLineMean[1440*1024];
     float gainMean[1440*1024];
@@ -249 +252 @@
     RawDataViewer* viewer;
     QTimer timer;
-    string currentFile;
-    string currentCalibFile;
+    std::string currentFile;
+    std::string currentCalibFile;
     int crateID;
     int boardID;