From 0b05f67f9d5b2b7fdb1ece5f9817918daec19573 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Fri, 11 Jan 2013 09:59:29 +0000 Subject: [PATCH] included sls defs in every file so that int is 32 bit git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@132 af1100a4-978c-4157-bff7-07162d2ba061 --- slsDetectorGui/include/qActionsWidget.h | 2 ++ slsDetectorGui/include/qCloneWidget.h | 3 +++ slsDetectorGui/include/qDebugStream.h | 3 +++ slsDetectorGui/include/qDefs.h | 1 + slsDetectorGui/include/qDetectorMain.h | 3 ++- slsDetectorGui/include/qDrawPlot.h | 3 ++- slsDetectorGui/include/qScanWidget.h | 2 ++ slsDetectorGui/include/qTabActions.h | 3 ++- slsDetectorGui/include/qTabAdvanced.h | 4 +++- slsDetectorGui/include/qTabDataOutput.h | 4 +++- slsDetectorGui/include/qTabDebugging.h | 4 +++- slsDetectorGui/include/qTabDeveloper.h | 4 +++- slsDetectorGui/include/qTabMeasurement.h | 3 +++ slsDetectorGui/include/qTabMessages.h | 3 +++ slsDetectorGui/include/qTabPlot.h | 4 +++- slsDetectorGui/include/qTabSettings.h | 4 +++- slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h | 7 +++++++ .../slsDetectorPlotting/include/SlsQt1DZoomer.h | 8 ++++++++ slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h | 7 +++++++ slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h | 7 +++++++ .../slsDetectorPlotting/include/SlsQt2DPlotLayout.h | 7 +++++++ .../slsDetectorPlotting/include/SlsQt2DZoomer.h | 7 +++++++ .../slsDetectorPlotting/include/SlsQtNumberEntry.h | 7 +++++++ .../slsDetectorPlotting/include/SlsQtValidators.h | 6 ++++++ slsDetectorGui/src/qActionsWidget.cpp | 1 - slsDetectorGui/src/qCloneWidget.cpp | 1 - slsDetectorGui/src/qDetectorMain.cpp | 3 +-- slsDetectorGui/src/qScanWidget.cpp | 1 - slsDetectorGui/src/qTabActions.cpp | 1 - slsDetectorGui/src/qTabAdvanced.cpp | 1 - slsDetectorGui/src/qTabDataOutput.cpp | 1 - slsDetectorGui/src/qTabDebugging.cpp | 1 - slsDetectorGui/src/qTabDeveloper.cpp | 1 - slsDetectorGui/src/qTabMeasurement.cpp | 1 - slsDetectorGui/src/qTabMessages.cpp | 1 - slsDetectorGui/src/qTabPlot.cpp | 1 - slsDetectorGui/src/qTabSettings.cpp | 1 - 37 files changed, 98 insertions(+), 23 deletions(-) diff --git a/slsDetectorGui/include/qActionsWidget.h b/slsDetectorGui/include/qActionsWidget.h index f10d02abf..2e024c8a1 100644 --- a/slsDetectorGui/include/qActionsWidget.h +++ b/slsDetectorGui/include/qActionsWidget.h @@ -8,6 +8,8 @@ #ifndef QACTIONSWIDGET_H_ #define QACTIONSWIDGET_H_ +#include "qDefs.h" + /** Form Header */ #include "ui_form_action.h" /** Project Class Headers */ diff --git a/slsDetectorGui/include/qCloneWidget.h b/slsDetectorGui/include/qCloneWidget.h index 081d5e682..d83f38e0f 100644 --- a/slsDetectorGui/include/qCloneWidget.h +++ b/slsDetectorGui/include/qCloneWidget.h @@ -8,6 +8,9 @@ #ifndef QCLONEWIDGET_H_ #define QCLONEWIDGET_H_ +#include "qDefs.h" + + /** Qt Project Class Headers */ class SlsQtH1D; #include "SlsQt1DPlot.h" diff --git a/slsDetectorGui/include/qDebugStream.h b/slsDetectorGui/include/qDebugStream.h index 6f21c683e..f04072d0f 100644 --- a/slsDetectorGui/include/qDebugStream.h +++ b/slsDetectorGui/include/qDebugStream.h @@ -9,6 +9,9 @@ #define QDEBUGSTREAM_H_ +#include "qDefs.h" + + #include #include #include diff --git a/slsDetectorGui/include/qDefs.h b/slsDetectorGui/include/qDefs.h index 600e01e2b..500c42bc3 100644 --- a/slsDetectorGui/include/qDefs.h +++ b/slsDetectorGui/include/qDefs.h @@ -8,6 +8,7 @@ #ifndef QDEFS_H #define QDEFS_H +#include "sls_detector_defs.h" #include #include using namespace std; diff --git a/slsDetectorGui/include/qDetectorMain.h b/slsDetectorGui/include/qDetectorMain.h index b4ec2cdb6..cd0060775 100644 --- a/slsDetectorGui/include/qDetectorMain.h +++ b/slsDetectorGui/include/qDetectorMain.h @@ -7,6 +7,8 @@ #ifndef QDETECTORMAIN_H #define QDETECTORMAIN_H +#include "qDefs.h" + /** Form Header */ #include "ui_form_detectormain.h" /** Qt Project Class Headers */ @@ -22,7 +24,6 @@ class qTabDeveloper; class qTabMessages; /** Project Class Headers */ class multiSlsDetector; -#include "sls_detector_defs.h" /** Qt Include Headers */ #include #include diff --git a/slsDetectorGui/include/qDrawPlot.h b/slsDetectorGui/include/qDrawPlot.h index a6a225cdc..c0dd76368 100644 --- a/slsDetectorGui/include/qDrawPlot.h +++ b/slsDetectorGui/include/qDrawPlot.h @@ -8,13 +8,14 @@ #define QDRAWPLOT_H +#include "qDefs.h" + /** Project Class Headers */ class multiSlsDetector; #include "detectorData.h" /** Qt Project Class Headers */ #include "SlsQt1DPlot.h" #include "SlsQt2DPlotLayout.h" -#include "qDefs.h" class qCloneWidget; /** Qt Include Headers */ #include diff --git a/slsDetectorGui/include/qScanWidget.h b/slsDetectorGui/include/qScanWidget.h index bcbaba50e..329a211da 100644 --- a/slsDetectorGui/include/qScanWidget.h +++ b/slsDetectorGui/include/qScanWidget.h @@ -8,6 +8,8 @@ #ifndef QSCANWIDGET_H_ #define QSCANWIDGET_H_ +#include "qDefs.h" + /** Form Header */ #include "ui_form_scan.h" /** Project Class Headers */ diff --git a/slsDetectorGui/include/qTabActions.h b/slsDetectorGui/include/qTabActions.h index bd5a073cd..d5d497fde 100644 --- a/slsDetectorGui/include/qTabActions.h +++ b/slsDetectorGui/include/qTabActions.h @@ -8,13 +8,14 @@ #ifndef QTABACTIONS_H_ #define QTABACTIONS_H_ +#include "qDefs.h" + /* Qt Project Class Headers */ #include "qActionsWidget.h" #include "qScanWidget.h" /** C++ Project Class Headers */ class multiSlsDetector; -#include "sls_detector_defs.h" /** Qt Include Headers */ #include #include diff --git a/slsDetectorGui/include/qTabAdvanced.h b/slsDetectorGui/include/qTabAdvanced.h index 30462698f..2d9705640 100644 --- a/slsDetectorGui/include/qTabAdvanced.h +++ b/slsDetectorGui/include/qTabAdvanced.h @@ -8,11 +8,13 @@ #ifndef QTABADVANCED_H_ #define QTABADVANCED_H_ +#include "qDefs.h" + + /** Form Header */ #include "ui_form_tab_advanced.h" /** Project Class Headers */ class multiSlsDetector; -#include "sls_detector_defs.h" /** Qt Project Class Headers */ class qDrawPlot; /** Qt Include Header */ diff --git a/slsDetectorGui/include/qTabDataOutput.h b/slsDetectorGui/include/qTabDataOutput.h index 8c65edb0a..437afce4f 100644 --- a/slsDetectorGui/include/qTabDataOutput.h +++ b/slsDetectorGui/include/qTabDataOutput.h @@ -8,11 +8,13 @@ #ifndef QTABDATAOUTPUT_H_ #define QTABDATAOUTPUT_H_ +#include "qDefs.h" + + /** Form Header */ #include "ui_form_tab_dataoutput.h" /** Project Class Headers */ class multiSlsDetector; -#include "sls_detector_defs.h" /** Qt Include Headers */ #include diff --git a/slsDetectorGui/include/qTabDebugging.h b/slsDetectorGui/include/qTabDebugging.h index 875b37e0f..484dfa87d 100644 --- a/slsDetectorGui/include/qTabDebugging.h +++ b/slsDetectorGui/include/qTabDebugging.h @@ -8,12 +8,14 @@ #ifndef QTABDEBUGGING_H_ #define QTABDEBUGGING_H_ +#include "qDefs.h" + + /** Form Header */ #include "ui_form_tab_debugging.h" /** Project Class Headers */ class multiSlsDetector; class slsDetector; -#include "sls_detector_defs.h" /** Qt Include Headers */ #include diff --git a/slsDetectorGui/include/qTabDeveloper.h b/slsDetectorGui/include/qTabDeveloper.h index 525e372d1..8acf84a78 100644 --- a/slsDetectorGui/include/qTabDeveloper.h +++ b/slsDetectorGui/include/qTabDeveloper.h @@ -8,9 +8,11 @@ #ifndef QTABDEVELOPER_H_ #define QTABDEVELOPER_H_ +#include "qDefs.h" + + /** Project Class Headers */ class multiSlsDetector; -#include "sls_detector_defs.h" /** Qt Include Headers */ #include #include diff --git a/slsDetectorGui/include/qTabMeasurement.h b/slsDetectorGui/include/qTabMeasurement.h index f4d9ca1e6..bd55b9baf 100644 --- a/slsDetectorGui/include/qTabMeasurement.h +++ b/slsDetectorGui/include/qTabMeasurement.h @@ -7,6 +7,9 @@ #ifndef QTABMEASUREMENT #define QTABMEASUREMENT +#include "qDefs.h" + + /** Form Header */ #include "ui_form_tab_measurement.h" /** Project Class Headers */ diff --git a/slsDetectorGui/include/qTabMessages.h b/slsDetectorGui/include/qTabMessages.h index 2decadc3c..146fde006 100644 --- a/slsDetectorGui/include/qTabMessages.h +++ b/slsDetectorGui/include/qTabMessages.h @@ -9,6 +9,9 @@ #define QTABMESSAGES_H_ +#include "qDefs.h" + + /** Project Class Headers */ class multiSlsDetector; diff --git a/slsDetectorGui/include/qTabPlot.h b/slsDetectorGui/include/qTabPlot.h index 2e18513e6..0705d0ec4 100644 --- a/slsDetectorGui/include/qTabPlot.h +++ b/slsDetectorGui/include/qTabPlot.h @@ -8,11 +8,13 @@ #ifndef QTABPLOT_H_ #define QTABPLOT_H_ +#include "qDefs.h" + + /** Form Header */ #include "ui_form_tab_plot.h" /** Project Class Headers */ class multiSlsDetector; -#include "sls_detector_defs.h" /** Qt Project Class Headers */ class qDrawPlot; /** Qt Include Headers */ diff --git a/slsDetectorGui/include/qTabSettings.h b/slsDetectorGui/include/qTabSettings.h index 822052404..90c901910 100644 --- a/slsDetectorGui/include/qTabSettings.h +++ b/slsDetectorGui/include/qTabSettings.h @@ -8,11 +8,13 @@ #ifndef QTABSETTINGS_H_ #define QTABSETTINGS_H_ +#include "qDefs.h" + + /** Form Header */ #include "ui_form_tab_settings.h" /** Project Class Headers */ class multiSlsDetector; -#include "sls_detector_defs.h" /** Qt Include Headers */ #include diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h index 1125df904..0e9de4649 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h @@ -13,6 +13,13 @@ #ifndef SLSQT1DPLOT_H #define SLSQT1DPLOT_H +#ifndef IAN +typedef double double32_t; +typedef float float32_t; +typedef int int32_t; +#endif + + #include #include #include diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DZoomer.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DZoomer.h index 730516a60..378b6f787 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DZoomer.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DZoomer.h @@ -6,6 +6,14 @@ #ifndef SLSQT1DZOOMER_H #define SLSQT1DZOOMER_H + +#ifndef IAN +typedef double double32_t; +typedef float float32_t; +typedef int int32_t; +#endif + + #include #include #include diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h index fbca86864..a71a32676 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h @@ -9,6 +9,13 @@ #define SLSQT2DHIST_H +#ifndef IAN +typedef double double32_t; +typedef float float32_t; +typedef int int32_t; +#endif + + #if QT_VERSION >= 0x040000 #include diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h index 23daeb338..c1a80c395 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h @@ -14,6 +14,13 @@ #ifndef SLSQT2DPLOT_H #define SLSQT2DPLOT_H +#ifndef IAN +typedef double double32_t; +typedef float float32_t; +typedef int int32_t; +#endif + + #include #include diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlotLayout.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlotLayout.h index 47c82bdae..5948b2fb3 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlotLayout.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlotLayout.h @@ -11,6 +11,13 @@ #ifndef SLSQT2DPLOTLAYOUT_H #define SLSQT2DPLOTLAYOUT_H +#ifndef IAN +typedef double double32_t; +typedef float float32_t; +typedef int int32_t; +#endif + + #include #include diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h index 5b371aa4b..2acd34dc6 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h @@ -9,6 +9,13 @@ #ifndef SLSQT2DZOOMER_H #define SLSQT2DZOOMER_H +#ifndef IAN +typedef double double32_t; +typedef float float32_t; +typedef int int32_t; +#endif + + /**included by Dhanya on 05.12.2012 to avoid compile time errors with the latest gcc*/ #include /**end of Change by Dhanya*/ diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQtNumberEntry.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQtNumberEntry.h index 1bcd9e937..dbeb0a31e 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQtNumberEntry.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQtNumberEntry.h @@ -7,6 +7,13 @@ #ifndef SLSQTNUMBERENTRY_H #define SLSQTNUMBERENTRY_H +#ifndef IAN +typedef double double32_t; +typedef float float32_t; +typedef int int32_t; +#endif + + #include #include diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQtValidators.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQtValidators.h index 197b162a2..bd2d70efd 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQtValidators.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQtValidators.h @@ -7,6 +7,12 @@ #ifndef SLSQTVALIDATORS_H #define SLSQTVALIDATORS_H +#ifndef IAN +typedef double double32_t; +typedef float float32_t; +typedef int int32_t; +#endif + #include #include diff --git a/slsDetectorGui/src/qActionsWidget.cpp b/slsDetectorGui/src/qActionsWidget.cpp index 74005766e..465fed646 100644 --- a/slsDetectorGui/src/qActionsWidget.cpp +++ b/slsDetectorGui/src/qActionsWidget.cpp @@ -9,7 +9,6 @@ #include "multiSlsDetector.h" // Qt Project Class Headers #include "qActionsWidget.h" -#include "qDefs.h" // Qt Include Headers #include // C++ Include Headers diff --git a/slsDetectorGui/src/qCloneWidget.cpp b/slsDetectorGui/src/qCloneWidget.cpp index bf99a2032..0b4110168 100644 --- a/slsDetectorGui/src/qCloneWidget.cpp +++ b/slsDetectorGui/src/qCloneWidget.cpp @@ -7,7 +7,6 @@ /** Qt Project Class Headers */ #include "qCloneWidget.h" -#include "qDefs.h" /** Qt Include Headers */ #include #include diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index 7ef9e3953..3b547adec 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -4,7 +4,6 @@ * ********************************************************************/ // Qt Project Class Headers #include "qDetectorMain.h" -#include "qDefs.h" #include "qDrawPlot.h" #include "qTabMeasurement.h" #include "qTabDataOutput.h" @@ -36,7 +35,7 @@ using namespace std; int main (int argc, char **argv) { QApplication *theApp = new QApplication(argc, argv); - theApp->setStyle(new QPlastiqueStyle); + theApp->setStyle(new QPlastiqueStyle);//not default when desktop is windows theApp->setWindowIcon(QIcon( ":/icons/images/mountain.png" )); qDetectorMain *det=new qDetectorMain(argc, argv, theApp,0); det->show(); diff --git a/slsDetectorGui/src/qScanWidget.cpp b/slsDetectorGui/src/qScanWidget.cpp index 666f2a23d..cff11affd 100644 --- a/slsDetectorGui/src/qScanWidget.cpp +++ b/slsDetectorGui/src/qScanWidget.cpp @@ -9,7 +9,6 @@ #include "multiSlsDetector.h" // Qt Project Class Headers #include "qScanWidget.h" -#include "qDefs.h" // Qt Include Headers #include #include diff --git a/slsDetectorGui/src/qTabActions.cpp b/slsDetectorGui/src/qTabActions.cpp index 63c305619..85e8665a3 100644 --- a/slsDetectorGui/src/qTabActions.cpp +++ b/slsDetectorGui/src/qTabActions.cpp @@ -6,7 +6,6 @@ */ // Qt Project Class Headers #include "qTabActions.h" -#include "qDefs.h" // Project Class Headers #include "slsDetector.h" #include "multiSlsDetector.h" diff --git a/slsDetectorGui/src/qTabAdvanced.cpp b/slsDetectorGui/src/qTabAdvanced.cpp index 05da30fe2..7f6e9f5a2 100644 --- a/slsDetectorGui/src/qTabAdvanced.cpp +++ b/slsDetectorGui/src/qTabAdvanced.cpp @@ -5,7 +5,6 @@ * Author: l_maliakal_d */ #include "qTabAdvanced.h" -#include "qDefs.h" #include "qDrawPlot.h" /** Project Class Headers */ #include "slsDetector.h" diff --git a/slsDetectorGui/src/qTabDataOutput.cpp b/slsDetectorGui/src/qTabDataOutput.cpp index a58ba931e..3a47be74c 100644 --- a/slsDetectorGui/src/qTabDataOutput.cpp +++ b/slsDetectorGui/src/qTabDataOutput.cpp @@ -10,7 +10,6 @@ * ********************************************************************/ #include "qTabDataOutput.h" -#include "qDefs.h" // Project Class Headers #include "slsDetector.h" #include "multiSlsDetector.h" diff --git a/slsDetectorGui/src/qTabDebugging.cpp b/slsDetectorGui/src/qTabDebugging.cpp index d7806ed67..2aec64dc1 100644 --- a/slsDetectorGui/src/qTabDebugging.cpp +++ b/slsDetectorGui/src/qTabDebugging.cpp @@ -5,7 +5,6 @@ * Author: l_maliakal_d */ #include "qTabDebugging.h" -#include "qDefs.h" // Project Class Headers #include "slsDetector.h" #include "multiSlsDetector.h" diff --git a/slsDetectorGui/src/qTabDeveloper.cpp b/slsDetectorGui/src/qTabDeveloper.cpp index 3b7692ab2..a80b9383b 100644 --- a/slsDetectorGui/src/qTabDeveloper.cpp +++ b/slsDetectorGui/src/qTabDeveloper.cpp @@ -5,7 +5,6 @@ * Author: l_maliakal_d */ #include "qTabDeveloper.h" -#include "qDefs.h" //Project Class Headers #include "slsDetector.h" #include "multiSlsDetector.h" diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp index ccd3927df..fcb07e505 100644 --- a/slsDetectorGui/src/qTabMeasurement.cpp +++ b/slsDetectorGui/src/qTabMeasurement.cpp @@ -7,7 +7,6 @@ //Qt Project Class Headers #include "qTabMeasurement.h" -#include "qDefs.h" #include "qDrawPlot.h" //Project Class Headers #include "slsDetector.h" diff --git a/slsDetectorGui/src/qTabMessages.cpp b/slsDetectorGui/src/qTabMessages.cpp index ff9bf1593..d7fc43473 100644 --- a/slsDetectorGui/src/qTabMessages.cpp +++ b/slsDetectorGui/src/qTabMessages.cpp @@ -7,7 +7,6 @@ /** Qt Project Class Headers */ #include "qTabMessages.h" -#include "qDefs.h" /** Project Class Headers */ #include "slsDetector.h" #include "multiSlsDetector.h" diff --git a/slsDetectorGui/src/qTabPlot.cpp b/slsDetectorGui/src/qTabPlot.cpp index 9b60d38a6..f6e050747 100644 --- a/slsDetectorGui/src/qTabPlot.cpp +++ b/slsDetectorGui/src/qTabPlot.cpp @@ -6,7 +6,6 @@ */ #include "qTabPlot.h" -#include "qDefs.h" #include "qDrawPlot.h" // Project Class Headers #include "slsDetector.h" diff --git a/slsDetectorGui/src/qTabSettings.cpp b/slsDetectorGui/src/qTabSettings.cpp index 038c2ab86..1ce307e04 100644 --- a/slsDetectorGui/src/qTabSettings.cpp +++ b/slsDetectorGui/src/qTabSettings.cpp @@ -6,7 +6,6 @@ */ #include "qTabSettings.h" -#include "qDefs.h" // Project Class Headers #include "slsDetector.h" #include "multiSlsDetector.h"