Changeset 15014 for trunk/FACT++/gui


Ignore:
Timestamp:
Mar 10, 2013, 12:21:49 PM (6 years ago)
Author:
tbretz
Message:
First attempt fix complety spoiled inclusions.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.h

    r14866 r15014  
    1313#define NTMARK      160      // max. number of timeMarker signals
    1414
    15 //get rid of the ofits.h inclusion and various other messy items in DrsCalib.h
    16 //It has nothing to do here, and it creates compilation errors
    17 //the proper way would be to re-design the inclusion scheme,
    18 //but that's beyond the time I can allocate to this fix.
    19 #define MARS_ofits
    20 namespace std
    21 {
    22  class ofits
    23  {
    24      public:
    25          ofits(){};
    26          ofits(const char*){};
    27          ~ofits(){};
    28          bool operator !(){return false;}
    29          void AddColumnInt(const char* ){};
    30          void AddColumnFloat(int, const char*, const char*){};
    31          void SetInt(const char*, int, const char*){};
    32          void WriteTableHeader(const char*){};
    33          bool WriteRow(const void*, long unsigned int ){return false;};
    34  };
    35 };
    36 typedef int Int_t;
    37 
    38 //#define LOAD_RAW
     15#include <string>
     16#include <valarray>
     17#include <iostream>
    3918
    4019#include <QObject>
    41 #include <QTimer>
     20//#include <QTimer>
    4221#include <QLabel>
    4322#include <QListWidget>
    4423#include <QMainWindow>
    4524#include <QPushButton>
    46 
    47 //#include <QtOpenGL/QGLWidget>
    48 #include "../BasicGlCamera.h"
    49 
    5025#include <QMouseEvent>
    5126#include <QColorDialog>
     
    5530#include <QRadioButton>
    5631#include <QCheckBox>
    57 #include <iostream>
     32
     33#include "../BasicGlCamera.h"
     34
    5835#include <GL/gl.h>
    5936
    6037#include <qwt_plot.h>
    61 //#include "qwt_plot_histogram.h"
    6238#include <qwt_plot_curve.h>
    6339#include <qwt_plot_grid.h>
    6440#include <qwt_plot_zoomer.h>
    6541
    66 #include <valarray>
    67 
    68 #include <string>
    69 
    7042#include "../../src/DataCalib.h"
    71 
    72 
    73 namespace std
    74 {
    75     class fits;
    76 }
     43#include "../../externals/ofits.h"
    7744
    7845/*************************************************
Note: See TracChangeset for help on using the changeset viewer.