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

fixed merge

Browse Source
This commit is contained in:
Erik Frojdh 2019-07-02 12:16:05 +02:00
commit cbe979b4b9
7 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorGui/include/qDefs.h
View File

@ -26,9 +26,9 @@ class qDefs : public QWidget {
static void DisplayExceptions(std::string emsg, std::string src) {
try {
throw;
} catch (sls::SocketError) {
} catch (const sls::SocketError &e) {
throw;
} catch (sls::SharedMemoryError) {
} catch (const sls::SharedMemoryError &e) {
throw;
} catch (const std::exception &e) {
ExceptionMessage(emsg, e.what(), src);
@ -42,9 +42,9 @@ class qDefs : public QWidget {
typename NonDeduced<CT>::type... Args) {
try {
throw;
} catch (sls::SocketError) {
} catch (const sls::SocketError &e) {
throw;
} catch (sls::SharedMemoryError) {
} catch (const sls::SharedMemoryError &e) {
throw;
} catch (const std::exception &e) {
ExceptionMessage(emsg, e.what(), src);

1
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -252,6 +252,7 @@ void qDetectorMain::SetUpDetector(const std::string fName, int multiID) {
case slsDetectorDefs::JUNGFRAU:
actionLoadTrimbits->setText("Load Settings");
actionSaveTrimbits->setText("Save Settings");
break;
case slsDetectorDefs::MOENCH:
actionLoadTrimbits->setEnabled(false);
actionSaveTrimbits->setEnabled(false);

2
slsDetectorGui/src/qTabAdvanced.cpp
View File

@ -156,6 +156,7 @@ void qTabAdvanced::GetOnline() {
lblOnline->setToolTip(detOnlineTip);
dispOnline->setPalette(lblHostname->palette());
lblOnline->setPalette(lblHostname->palette());
break;
default:
dispOnline->setText("Offline");
lblOnline->setText("Detector Online Status:* ");
@ -291,6 +292,7 @@ void qTabAdvanced::GetReceiverOnline() {
lblRxrOnline->setToolTip(rxrOnlineTip);
dispRxrOnline->setPalette(lblHostname->palette());
lblRxrOnline->setPalette(lblHostname->palette());
break;
default:
dispRxrOnline->setText("Offline");
lblRxrOnline->setText("Receiver Online Status:* ");

1
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -7,6 +7,7 @@
#include <QStandardItemModel>
#include <QTimer>
#include <cmath>
#include <iostream>
qTabMeasurement::qTabMeasurement(QWidget *parent, multiSlsDetector *detector, qDrawPlot *plot) : QWidget(parent), myDet(detector), myPlot(plot),

BIN
slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_gui
View File

Binary file not shown.

1
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -121,7 +121,6 @@ const char* getTimerName(enum timerIndex ind) {
case ACTUAL_TIME: return "actual_time";
case MEASUREMENT_TIME: return "measurement_time";
case PROGRESS: return "progress";
case MEASUREMENTS_NUMBER: return "measurements_number";
case FRAMES_FROM_START: return "frames_from_start";
case FRAMES_FROM_START_PG: return "frames_from_start_pg";
case ANALOG_SAMPLES: return "analog_samples";

4
slsSupportLib/include/versionAPI.h
View File

@ -5,6 +5,6 @@
#define APIRECEIVER 0x190604
#define APIGUI 0x190405
#define APICTB 0x190604
#define APIEIGER 0x190604
#define APIJUNGFRAU 0x190604
#define APIGOTTHARD 0x190604
#define APIGOTTHARD 0x190604
#define APIEIGER 0x190702