diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h index fdda79d66..5b371aa4b 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h @@ -2,12 +2,16 @@ /** * @author Ian Johnson * @version 1.0 + * Dhanya-05.12.2012- included an additional header */ #ifndef SLSQT2DZOOMER_H #define SLSQT2DZOOMER_H +/**included by Dhanya on 05.12.2012 to avoid compile time errors with the latest gcc*/ +#include +/**end of Change by Dhanya*/ #include #include diff --git a/slsDetectorGui/src/qTabActions.cpp b/slsDetectorGui/src/qTabActions.cpp index edcc12346..63c305619 100644 --- a/slsDetectorGui/src/qTabActions.cpp +++ b/slsDetectorGui/src/qTabActions.cpp @@ -84,7 +84,7 @@ void qTabActions::SetupWidgetWindow(){ - int hIndent=0, vIndent=0, colspan=6; + int hIndent=0, vIndent=0, colspan=6, posVal=0; QLabel *lblReal; // For each level of Actions for(int i=0;iaddWidget(scanWidget[qScanWidget::NUM_SCAN_WIDGETS-1],vIndent+1,hIndent+1,1,colspan); - scanWidget[qScanWidget::NUM_SCAN_WIDGETS-1]->hide(); + posVal = qScanWidget::NUM_SCAN_WIDGETS; + scanWidget[posVal] = new qScanWidget(this,myDet); + gridLayout->addWidget(scanWidget[posVal],vIndent+1,hIndent+1,1,colspan); + scanWidget[posVal]->hide(); break; default: - actionWidget[qActionsWidget::NUM_ACTION_WIDGETS] = new qActionsWidget(this,myDet); - gridLayout->addWidget(actionWidget[qActionsWidget::NUM_ACTION_WIDGETS-1],vIndent+1,hIndent+1,1,colspan); - actionWidget[qActionsWidget::NUM_ACTION_WIDGETS-1]->hide(); + posVal = qActionsWidget::NUM_ACTION_WIDGETS; + actionWidget[posVal] = new qActionsWidget(this,myDet); + gridLayout->addWidget(actionWidget[posVal],vIndent+1,hIndent+1,1,colspan); + actionWidget[posVal]->hide(); break; }