detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07:59 +02:00
Code Issues Actions Packages Releases Activity

small changes from the meeting

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@9 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-06-08 10:21:30 +00:00
parent ef41286bf0
commit 2b02f94fe3
11 changed files with 442 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
slsDetectorGui/include/qDefs.h
View File

@ -8,6 +8,9 @@
#ifndef QDEFS_H
#define QDEFS_H
#include <iostream>
using namespace std;
class qDefs
{
public:
@ -32,18 +35,18 @@ public:
* @param value time
* returns time value in ns
*/
static int64_t get64bTime(timeUnit unit, double value){
int64_t value64=value;
static float getNSTime(timeUnit unit, float value){
float valueNS=value;
switch(unit){
case HOURS: value64*=60;
case MINUTES: value64*=60;
case SECONDS: value64*=1000;
case MILLISECONDS: value64*=1000;
case MICROSECONDS: value64*=1000;
case HOURS: valueNS*=60;
case MINUTES: valueNS*=60;
case SECONDS: valueNS*=1000;
case MILLISECONDS: valueNS*=1000;
case MICROSECONDS: valueNS*=1000;
case NANOSECONDS:
default:;
}
return value64;
return valueNS;
};

24
slsDetectorGui/include/qDetectorMain.h
View File

@ -27,19 +27,12 @@ class slsDetectorUtils;
#include <QGridLayout>
#include <QResizeEvent>
class MyTabWidget:public QTabWidget
{
/** To Over-ride the QTabWidget class to get the tabBar */
class MyTabWidget:public QTabWidget{
public:
MyTabWidget(QWidget* parent = 0)
{
setParent(parent);
}
MyTabWidget(QWidget* parent = 0) {setParent(parent);}
//Overridden method from QTabWidget
QTabBar* tabBar()
{
return QTabWidget::tabBar();
}
QTabBar* tabBar(){return QTabWidget::tabBar();}
};
@ -81,7 +74,9 @@ private:
/** default height of central widgetwhen plot Window when docked */
int heightCentralWidget;
/** enumeration of the tabs */
enum {Measurement, DataOutput, Plot, Actions, Settings, Advanced, Debugging, Developer, NumberOfTabs };
enum {Measurement, Settings, DataOutput, Plot, Actions, Advanced, Debugging, Developer, NumberOfTabs };
QColor defaultTabColor;
/* Scroll Area for the tabs**/
QScrollArea *scroll[NumberOfTabs];
@ -178,11 +173,6 @@ void About();
*/
void ResizeMainWindow(bool b);
/** Sets the Size of the undocked/docked terminal window
* @param b bool TRUE if undocked(outside main window), FALSE docked
*/
void SetTerminalWindowSize(bool b);
/** Enables/disables tabs depending on if acquisition is currently in progress
*/
void EnableTabs();

1
slsDetectorGui/include/qTabMeasurement.h
View File

@ -47,6 +47,7 @@ private:
enum{None, Auto, Gated, Trigger_Exp_Series, Trigger_Frame, Trigger_Readout, Gated_Start, Trigger_Window, NumTimingModes};
/** methods */
/** Sets up the widget
*/