mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-12 12:57:13 +02:00
removed possible chances of a shared memory access during acquisition, start button to entable tabs, to refresh plot tab and startstoptoggle
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@61 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
@ -230,7 +230,6 @@ void qDetectorMain::Initialization(){
|
||||
connect(tabs, SIGNAL(currentChanged(int)), this, SLOT(Refresh(int)));//( QWidget*)));
|
||||
// Measurement tab
|
||||
connect(tab_measurement, SIGNAL(StartSignal()), this,SLOT(EnableTabs()));
|
||||
connect(tab_measurement, SIGNAL(StartSignal()), tab_plot,SLOT(Refresh()));
|
||||
connect(tab_measurement, SIGNAL(StopSignal()), myPlot,SLOT(StopAcquisition()));
|
||||
connect(tab_measurement, SIGNAL(CheckPlotIntervalSignal()), tab_plot,SLOT(SetFrequency()));
|
||||
connect(tab_measurement, SIGNAL(EnableNthFrameSignal(bool)), tab_plot,SLOT(EnableNthFrame(bool)));
|
||||
@ -637,6 +636,13 @@ void qDetectorMain::EnableTabs(){
|
||||
actionLoadCalibration->setVisible(expertTab);
|
||||
actionSaveCalibration->setVisible(expertTab);
|
||||
|
||||
//moved to here, so that its all in order, instead of signals and different threads
|
||||
if(!enable) {
|
||||
//set the plot type first(acccss shared memory)
|
||||
tab_plot->Refresh();
|
||||
//sets running to true
|
||||
myPlot->StartStopDaqToggle();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user