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

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-07-03 18:21:44 +02:00
parent 659e19a856
commit 6a60f7d222
11 changed files with 5848 additions and 5666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -143,10 +143,6 @@ qDetectorMain::~qDetectorMain() {
void qDetectorMain::SetUpWidgetWindow() {
// Layout
QGridLayout *layoutTabs = new QGridLayout;
centralwidget->setLayout(layoutTabs);
// plot setup
myPlot = new qDrawPlot(dockWidgetPlot, myDet);
FILE_LOG(logDEBUG) << "DockPlot ready";

16
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -442,13 +442,20 @@ void qTabMeasurement::GetFileWrite() {
try {
dispFileName->setEnabled(true); // default, even when exception
lblIndex->setEnabled(true);
spinIndex->setEnabled(true);
int retval = myDet->getFileWrite();
if (retval == -1) {
qDefs::Message(qDefs::WARNING, "File write is inconsistent for all detectors.", "qTabMeasurement::GetFileWrite");
dispFileName->setEnabled(true);
lblIndex->setEnabled(true);
spinIndex->setEnabled(true);
} else {
chkFile->setChecked(retval == 0 ? false : true);
dispFileName->setEnabled(chkFile->isChecked());
bool enable = (retval == 0 ? false : true);
chkFile->setChecked(enable);
dispFileName->setEnabled(enable);
lblIndex->setEnabled(enable);
spinIndex->setEnabled(enable);
}
} CATCH_DISPLAY ("Could not get file over write enable.", "qTabMeasurement::GetFileWrite")
@ -460,7 +467,10 @@ void qTabMeasurement::SetFileWrite(bool val) {
try {
myDet->setFileWrite(val);
dispFileName->setEnabled(chkFile->isChecked());
bool enable = chkFile->isChecked();
dispFileName->setEnabled(enable);
lblIndex->setEnabled(enable);
spinIndex->setEnabled(enable);
} CATCH_HANDLE("Could not set file write enable.", "qTabMeasurement::SetFileWrite", this, &qTabMeasurement::GetFileWrite)
}

46
slsDetectorGui/src/qTabPlot.cpp
View File

@ -20,8 +20,7 @@ QString qTabPlot::defaultImageZAxisTitle("Intensity");
qTabPlot::qTabPlot(QWidget *parent, multiSlsDetector *detector, qDrawPlot *plot) :
QWidget(parent), myDet(detector), myPlot(plot), is1d(false),
btnGroupPlotType(0), stackedLayout(nullptr), spinNthFrame(nullptr), spinTimeGap(nullptr), comboTimeGapUnit(nullptr) {
QWidget(parent), myDet(detector), myPlot(plot), is1d(false) {
setupUi(this);
SetupWidgetWindow();
FILE_LOG(logDEBUG) << "Plot ready";
@ -30,14 +29,6 @@ qTabPlot::qTabPlot(QWidget *parent, multiSlsDetector *detector, qDrawPlot *plot)
qTabPlot::~qTabPlot() {
if (btnGroupPlotType)
delete btnGroupPlotType;
if (stackedLayout)
delete stackedLayout;
if (spinNthFrame)
delete spinNthFrame;
if (spinTimeGap)
delete spinTimeGap;
if (comboTimeGapUnit)
delete comboTimeGapUnit;
}
void qTabPlot::SetupWidgetWindow() {
@ -45,34 +36,7 @@ void qTabPlot::SetupWidgetWindow() {
btnGroupPlotType = new QButtonGroup(this);
btnGroupPlotType->addButton(radioNoPlot, 0);
btnGroupPlotType->addButton(radioDataGraph, 1);
// Plotting Frequency
stackedLayout = new QStackedLayout;
stackedLayout->setSpacing(0);
spinNthFrame = new QSpinBox;
spinNthFrame->setMinimum(1);
spinNthFrame->setMaximum(2000000000);
spinNthFrame->setValue(1);
spinTimeGap = new QDoubleSpinBox;
spinTimeGap->setMinimum(0);
spinTimeGap->setDecimals(3);
spinTimeGap->setMaximum(999999);
spinTimeGap->setValue(DEFAULT_STREAMING_TIMER_IN_MS);
comboTimeGapUnit = new QComboBox;
comboTimeGapUnit->addItem("hr");
comboTimeGapUnit->addItem("min");
comboTimeGapUnit->addItem("s");
comboTimeGapUnit->addItem("ms");
comboTimeGapUnit->setCurrentIndex(3);
QWidget *wTimeInterval = new QWidget;
QHBoxLayout *h1 = new QHBoxLayout;
wTimeInterval->setLayout(h1);
h1->setContentsMargins(0, 0, 0, 0);
h1->setSpacing(3);
h1->addWidget(spinTimeGap);
h1->addWidget(comboTimeGapUnit);
stackedLayout->addWidget(wTimeInterval);
stackedLayout->addWidget(spinNthFrame);
stackWidget->setLayout(stackedLayout);
// 1D and 2D options
stackedWidget1D->setCurrentIndex(0);
stackedWidget2D->setCurrentIndex(0);
@ -622,7 +586,7 @@ void qTabPlot::GetStreamingFrequency() {
// time interval
else if (freq == 0) {
comboFrequency->setCurrentIndex(0);
stackedLayout->setCurrentIndex(0);
stackedTimeInterval->setCurrentIndex(0);
try {
int timeMs = myDet->setReceiverStreamingTimer(-1);
if (freq < 0) {
@ -638,7 +602,7 @@ void qTabPlot::GetStreamingFrequency() {
// every nth frame
else {
comboFrequency->setCurrentIndex(1);
stackedLayout->setCurrentIndex(1);
stackedTimeInterval->setCurrentIndex(1);
spinNthFrame->setValue(freq);
}
} CATCH_DISPLAY ("Could not get streaming frequency.", "qTabPlot::GetStreamingFrequency")
@ -655,7 +619,7 @@ void qTabPlot::SetStreamingFrequency() {
auto freqVal = spinNthFrame->value();
auto timeVal = spinTimeGap->value();
auto timeUnit = static_cast<qDefs::timeUnit>(comboTimeGapUnit->currentIndex());
stackedTimeInterval->setCurrentIndex(comboFrequency->currentIndex());
try {
if (frequency) {
FILE_LOG(logINFO) << "Setting Streaming Frequency to " << freqVal;