detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 03:40:04 +02:00
Code Issues Actions Packages Releases Activity

Got rid of tabAction form

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@7 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d 2012-06-06 15:44:33 +00:00
parent 7a218418d1
commit 06ec6558a1
4 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorGui/include/qTabActions.h
View File

@ -8,25 +8,22 @@
#ifndef QTABACTIONS_H_ #ifndef QTABACTIONS_H_
#define QTABACTIONS_H_ #define QTABACTIONS_H_
/** Form Header */
#include "ui_form_tab_actions.h"
/** Project Class Headers */ /** Project Class Headers */
class slsDetectorUtils; class slsDetectorUtils;
class ActionsWidget; class ActionsWidget;
#include <QWidget>
class QPushButton; #include <QPushButton>
class QLabel; #include <QLabel>
class QScrollArea; #include <QScrollArea>
class QGridLayout; #include <QGridLayout>
class QPalette; #include <QPalette>
/** /**
*@short sets up the acions parameters *@short sets up the acions parameters
*/ */
class qTabActions:public QWidget,private Ui::TabActionsObject{ class qTabActions:public QWidget{
Q_OBJECT Q_OBJECT
public: public:

2
slsDetectorGui/slsDetectorGui.pro
View File

@ -86,7 +86,7 @@ FORMS = \
forms/form_tab_measurement.ui\ forms/form_tab_measurement.ui\
forms/form_tab_dataoutput.ui\ forms/form_tab_dataoutput.ui\
forms/form_tab_plot.ui\ forms/form_tab_plot.ui\
forms/form_tab_actions.ui\ # forms/form_tab_actions.ui\
forms/form_tab_advanced.ui\ forms/form_tab_advanced.ui\
forms/form_tab_settings.ui\ forms/form_tab_settings.ui\
forms/form_tab_debugging.ui\ forms/form_tab_debugging.ui\

8
slsDetectorGui/src/qActionsWidget.cpp
View File

@ -185,9 +185,11 @@ void ActionsWidget::SetupWidgetWindow(int scanType){
void ActionsWidget::Initialization(){ void ActionsWidget::Initialization(){
connect(comboScript,SIGNAL(currentIndexChanged(int)),this,SLOT(SetScript(int))); connect(comboScript,SIGNAL(currentIndexChanged(int)),this,SLOT(SetScript(int)));
connect(radioConstant,SIGNAL(toggled(bool)),this,SLOT(EnableSizeWidgets())); if(comboScript->count()>2){
connect(radioSpecific,SIGNAL(toggled(bool)),this,SLOT(EnableSizeWidgets())); connect(radioConstant,SIGNAL(toggled(bool)),this,SLOT(EnableSizeWidgets()));
connect(radioValue,SIGNAL(toggled(bool)),this,SLOT(EnableSizeWidgets())); connect(radioSpecific,SIGNAL(toggled(bool)),this,SLOT(EnableSizeWidgets()));
connect(radioValue,SIGNAL(toggled(bool)),this,SLOT(EnableSizeWidgets()));
}
} }

10
slsDetectorGui/src/qTabActions.cpp
View File

@ -12,13 +12,7 @@
#include "slsDetector.h" #include "slsDetector.h"
#include "multiSlsDetector.h" #include "multiSlsDetector.h"
/** Qt Include Headers */ /** Qt Include Headers */
#include <QButtonGroup>
#include <QGridLayout>
#include <QPushButton>
#include <QLabel>
#include <QScrollArea>
#include <QLayoutItem>
#include <QPalette>
/** C++ Include Headers */ /** C++ Include Headers */
#include<iostream> #include<iostream>
using namespace std; using namespace std;
@ -29,7 +23,6 @@ using namespace std;
qTabActions::qTabActions(QWidget *parent,slsDetectorUtils*& detector):QWidget(parent),myDet(detector){ qTabActions::qTabActions(QWidget *parent,slsDetectorUtils*& detector):QWidget(parent),myDet(detector){
//setupUi(this);
if(myDet) if(myDet)
{ {
SetupWidgetWindow(); SetupWidgetWindow();
@ -48,7 +41,6 @@ qTabActions::~qTabActions(){
void qTabActions::SetupWidgetWindow(){ void qTabActions::SetupWidgetWindow(){
setupUi(this);
/** Window Settings*/ /** Window Settings*/
setFixedSize(705,350); setFixedSize(705,350);
setContentsMargins(0,0,0,0); setContentsMargins(0,0,0,0);