diff --git a/slsDetectorGui/include/qTabActions.h b/slsDetectorGui/include/qTabActions.h index 48c15114c..e14feea8d 100644 --- a/slsDetectorGui/include/qTabActions.h +++ b/slsDetectorGui/include/qTabActions.h @@ -8,25 +8,22 @@ #ifndef QTABACTIONS_H_ #define QTABACTIONS_H_ - -/** Form Header */ -#include "ui_form_tab_actions.h" /** Project Class Headers */ class slsDetectorUtils; class ActionsWidget; - -class QPushButton; -class QLabel; -class QScrollArea; -class QGridLayout; -class QPalette; +#include +#include +#include +#include +#include +#include /** *@short sets up the acions parameters */ -class qTabActions:public QWidget,private Ui::TabActionsObject{ +class qTabActions:public QWidget{ Q_OBJECT public: diff --git a/slsDetectorGui/slsDetectorGui.pro b/slsDetectorGui/slsDetectorGui.pro index 242c91771..fdd4d6b91 100644 --- a/slsDetectorGui/slsDetectorGui.pro +++ b/slsDetectorGui/slsDetectorGui.pro @@ -86,7 +86,7 @@ FORMS = \ forms/form_tab_measurement.ui\ forms/form_tab_dataoutput.ui\ forms/form_tab_plot.ui\ - forms/form_tab_actions.ui\ +# forms/form_tab_actions.ui\ forms/form_tab_advanced.ui\ forms/form_tab_settings.ui\ forms/form_tab_debugging.ui\ diff --git a/slsDetectorGui/src/qActionsWidget.cpp b/slsDetectorGui/src/qActionsWidget.cpp index b1c7ea074..7b3e0514a 100644 --- a/slsDetectorGui/src/qActionsWidget.cpp +++ b/slsDetectorGui/src/qActionsWidget.cpp @@ -185,9 +185,11 @@ void ActionsWidget::SetupWidgetWindow(int scanType){ void ActionsWidget::Initialization(){ connect(comboScript,SIGNAL(currentIndexChanged(int)),this,SLOT(SetScript(int))); - connect(radioConstant,SIGNAL(toggled(bool)),this,SLOT(EnableSizeWidgets())); - connect(radioSpecific,SIGNAL(toggled(bool)),this,SLOT(EnableSizeWidgets())); - connect(radioValue,SIGNAL(toggled(bool)),this,SLOT(EnableSizeWidgets())); + if(comboScript->count()>2){ + connect(radioConstant,SIGNAL(toggled(bool)),this,SLOT(EnableSizeWidgets())); + connect(radioSpecific,SIGNAL(toggled(bool)),this,SLOT(EnableSizeWidgets())); + connect(radioValue,SIGNAL(toggled(bool)),this,SLOT(EnableSizeWidgets())); + } } diff --git a/slsDetectorGui/src/qTabActions.cpp b/slsDetectorGui/src/qTabActions.cpp index bc7318f65..10fd7ea2f 100644 --- a/slsDetectorGui/src/qTabActions.cpp +++ b/slsDetectorGui/src/qTabActions.cpp @@ -12,13 +12,7 @@ #include "slsDetector.h" #include "multiSlsDetector.h" /** Qt Include Headers */ - -#include -#include -#include -#include -#include -#include +#include /** C++ Include Headers */ #include using namespace std; @@ -29,7 +23,6 @@ using namespace std; qTabActions::qTabActions(QWidget *parent,slsDetectorUtils*& detector):QWidget(parent),myDet(detector){ - //setupUi(this); if(myDet) { SetupWidgetWindow(); @@ -48,7 +41,6 @@ qTabActions::~qTabActions(){ void qTabActions::SetupWidgetWindow(){ - setupUi(this); /** Window Settings*/ setFixedSize(705,350); setContentsMargins(0,0,0,0);