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

WIP

Browse Source
This commit is contained in:
maliakal_d 2019-07-02 13:50:20 +02:00
parent fc2cc7e00c
commit 975076043f
6 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorGui/include/qDrawPlot.h
View File

@ -145,7 +145,7 @@ class qDrawPlot : public QWidget {
unsigned int nHists{1};
double *datax1d{nullptr};
std::vector<double *> datay1d;
double *data2d;
double *data2d{nullptr};
//options
bool isPlot{true};

4
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -229,6 +229,8 @@ void qDetectorMain::SetUpWidgetWindow() {
heightCentralWidget = centralwidget->size().height();
// Default zoom Tool Tip
zoomToolTip = dockWidgetPlot->toolTip();
Initialization();
}
void qDetectorMain::SetUpDetector(const std::string fName, int multiID) {
@ -273,8 +275,6 @@ void qDetectorMain::SetUpDetector(const std::string fName, int multiID) {
//FIXME: not needed anymore due to client creating socket each time
//myDet->setOnline(slsDetectorDefs::ONLINE_FLAG);
//myDet->setReceiverOnline(slsDetectorDefs::ONLINE_FLAG);
Initialization();
}
void qDetectorMain::Initialization() {

4
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -111,8 +111,8 @@ void qDrawPlot::SetupWidgetWindow() {
fileSaveName = "Image";
}
SetupStatistics();
SetupPlots();
SetupStatistics();
SetDataCallBack(true);
myDet->registerAcquisitionFinishedCallback(&(GetAcquisitionFinishedCallBack), this);
myDet->registerProgressCallback(&(GetProgressCallBack), this);
@ -219,7 +219,7 @@ void qDrawPlot::SetupPlots() {
plot2d = new SlsQt2DPlotLayout(boxPlot);
// default display data
if (data2d)
delete[] data2d;
delete [] data2d;
data2d = new double[nPixelsY * nPixelsX];
for (unsigned int px = 0; px < nPixelsX; ++px)
for (unsigned int py = 0; py < nPixelsY; ++py)

10
slsDetectorGui/src/qTabDeveloper.cpp
View File

@ -178,11 +178,11 @@ void qTabDeveloper::CreateDACWidgets() {
dacLayout = new QGridLayout(boxDacs);
for (int i = 0; i < numDACWidgets; ++i) {
lblDacs[i] = new QLabel(QString(dacNames[i].c_str()), boxDacs);
spinDacs[i] = new MyDoubleSpinBox(i, boxDacs);
lblDacs.push_back(new QLabel(QString(dacNames[i].c_str()), boxDacs));
spinDacs.push_back(new MyDoubleSpinBox(i, boxDacs));
spinDacs[i]->setMinimum(-1);
spinDacs[i]->setMaximum(10000);
lblDacsmV[i] = new QLabel("", boxDacs);
lblDacsmV.push_back(new QLabel("", boxDacs));
dacLayout->addWidget(lblDacs[i], (int)(i / 2), ((i % 2) == 0) ? 1 : 5);
dacLayout->addWidget(spinDacs[i], (int)(i / 2), ((i % 2) == 0) ? 2 : 6);
@ -210,8 +210,8 @@ void qTabDeveloper::CreateADCWidgets() {
QGridLayout *adcLayout = new QGridLayout(boxAdcs);
for (int i = 0; i < numADCWidgets; ++i) {
lblAdcs[i] = new QLabel(QString(adcNames[i].c_str()), boxAdcs);
spinAdcs[i] = new QLineEdit(boxAdcs);
lblAdcs.push_back(new QLabel(QString(adcNames[i].c_str()), boxAdcs));
spinAdcs.push_back(new QLineEdit(boxAdcs));
spinAdcs[i]->setReadOnly(true);
adcLayout->addWidget(lblAdcs[i], (int)(i / 2), ((i % 2) == 0) ? 1 : 4);

4
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -224,7 +224,7 @@ void qTabMeasurement::SetTimingMode(int val) {
void qTabMeasurement::GetNumMeasurements() {
FILE_LOG(logDEBUG) << "Getting number of measurements";
disconnect(spinNumMeasurements, SIGNAL(valueChanged(int)), this, SLOT(SetNumMeasurements(int)));
spinNumFrames->setValue(myPlot->GetNumMeasurements());
spinNumMeasurements->setValue(myPlot->GetNumMeasurements());
connect(spinNumMeasurements, SIGNAL(valueChanged(int)), this, SLOT(SetNumMeasurements(int)));
}
@ -606,7 +606,7 @@ void qTabMeasurement::Refresh() {
GetExposureTime();
GetAcquisitionPeriod();
GetNumTriggers();
if (delayImplemented) {
if (delayImplemented) {cprintf(BLUE, "Delay implemented\n");
GetDelay();
}
if (sampleImplemented) {

9
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@ -4185,15 +4185,16 @@ int multiSlsDetector::acquire() {
multi_shm()->stoppedFlag = 1;
}
// let processing thread listen to these packets
sem_post(&sem_newRTAcquisition);
if (multi_shm()->stoppedFlag == 0)
sem_post(&sem_newRTAcquisition);
}
if (multi_shm()->stoppedFlag == 0)
startAndReadAll();
// stop receiver
std::lock_guard<std::mutex> lock(mg);
if (receiver) {
std::lock_guard<std::mutex> lock(mg);
if (stopReceiver() == FAIL) {
multi_shm()->stoppedFlag = 1;
} else {
@ -4203,10 +4204,8 @@ int multiSlsDetector::acquire() {
// external process to be
// done sending data to gui
}
incrementFileIndex();
}
incrementFileIndex();
// waiting for the data processing thread to finish!
setJoinThreadFlag(true);