created messages tab-not working completely yet

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@15 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-06-28 08:35:21 +00:00
parent 824da9d4c4
commit ec0878d008
12 changed files with 549 additions and 79 deletions

View File

@@ -19,6 +19,7 @@ class qTabAdvanced;
class qTabSettings;
class qTabDebugging;
class qTabDeveloper;
class qTabMessages;
/** Project Class Headers */
class slsDetectorUtils;
#include "sls_detector_defs.h"
@@ -80,25 +81,27 @@ private:
/** The default tab heading color */
QColor defaultTabColor;
/** enumeration of the tabs */
enum {Measurement, Settings, DataOutput, Plot, Actions, Advanced, Debugging, Developer, NumberOfTabs };
enum {Measurement, Settings, DataOutput, Plot, Actions, Advanced, Debugging, Developer, Messages, NumberOfTabs };
/* Scroll Area for the tabs**/
QScrollArea *scroll[NumberOfTabs];
/**Measurement tab */
qTabMeasurement *tab_measurement;
qTabMeasurement *tab_measurement;
/**DataOutput tab */
qTabDataOutput *tab_dataoutput;
qTabDataOutput *tab_dataoutput;
/**Plot tab */
qTabPlot *tab_plot;
qTabPlot *tab_plot;
/**Actions tab */
qTabActions *tab_actions;
qTabActions *tab_actions;
/**Settings tab */
qTabSettings *tab_settings;
qTabSettings *tab_settings;
/**Advanced tab */
qTabAdvanced *tab_advanced;
qTabAdvanced *tab_advanced;
/**Debugging tab */
qTabDebugging *tab_debugging;
qTabDebugging *tab_debugging;
/**Developer tab */
qTabDeveloper *tab_developer;
qTabDeveloper *tab_developer;
/**Messages tab */
qTabMessages *tab_messages;
/**if the developer tab should be enabled,known from command line */
int isDeveloper;

View File

@@ -53,6 +53,10 @@ private:
*/
void SetupWidgetWindow();
/** Sets up the timing mode
*/
void SetupTimingMode();
/** Sets up all the slots and signals
* @param timingChange only some of the signals are disconnected when timing mode is changed
* This method is to reconnect them again.

View File

@@ -0,0 +1,68 @@
/*
* qTabMessages.h
*
* Created on: Jun 26, 2012
* Author: l_maliakal_d
*/
#ifndef QTABMESSAGES_H_
#define QTABMESSAGES_H_
/** Project Class Headers */
class slsDetectorUtils;
/** Qt Include Headers */
#include <QWidget>
#include <QTextEdit>
#include <QLineEdit>
/**
*@short sets up the Messages parameters
*/
class qTabMessages:public QWidget{
Q_OBJECT
public:
/** \short The constructor
* @param parent is the parent tab widget
* @param detector is the detector returned from the detector tab
*/
qTabMessages(QWidget *parent,slsDetectorUtils*& detector);
/** Destructor
*/
~qTabMessages();
private:
/** The sls detector object */
slsDetectorUtils *myDet;
/** Log of executed commands */
QTextEdit *dispLog;
/** Command display */
QLineEdit *dispCommand;
/** Path display */
QLineEdit *dispPath;
/** methods */
/** Sets up the widget */
void SetupWidgetWindow();
/** Sets up all the slots and signals */
void Initialization();
private slots:
void executeCommand();
};
#endif /* QTABMESSAGES_H_ */

View File

@@ -12,6 +12,9 @@
#include "ui_form_tab_settings.h"
/** Project Class Headers */
class slsDetectorUtils;
#include "sls_detector_defs.h"
/** Qt Include Headers */
#include <QStandardItemModel>
/**
*@short sets up the Settings parameters
@@ -35,15 +38,26 @@ public:
private:
/** The sls detector object */
slsDetectorUtils *myDet;
/** sls detector id */
/**etector id */
int detID;
/** detector type */
slsDetectorDefs::detectorType detType;
enum{Standard,Fast,HighGain,DynamicGain,LowGain,MediumGain,VeryHighGain,Undefined,Uninitialized,NumSettings};
/** To be able to index items on a combo box */
QStandardItemModel* model;
QModelIndex index[NumSettings];
QStandardItem* item[NumSettings];
/** Sets up the widget
*/
void SetupWidgetWindow();
/** Sets up the detector settings
*/
void SetupDetectorSettings();
/** Sets up all the slots and signals
*/
void Initialization();