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

removed possible chances of a shared memory access during acquisition, start button to entable tabs, to refresh plot tab and startstoptoggle

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@61 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-09-19 15:10:28 +00:00
parent d01852892b
commit 4f1c03c879
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorGui/slsDetectorGui.pro
View File

@ -6,7 +6,7 @@ UI_HEADERS_DIR = forms/include
RESOURCES += icons.qrc RESOURCES += icons.qrc
DEFINES += VERBOSE #DACS_INT #VERYVERBOSE DEFINES += VERBOSE #VERYVERBOSE #DACS_INT #VERYVERBOSE
target.path += $(DESTDIR) target.path += $(DESTDIR)

8
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -230,7 +230,6 @@ void qDetectorMain::Initialization(){
connect(tabs, SIGNAL(currentChanged(int)), this, SLOT(Refresh(int)));//( QWidget*))); connect(tabs, SIGNAL(currentChanged(int)), this, SLOT(Refresh(int)));//( QWidget*)));
// Measurement tab // Measurement tab
connect(tab_measurement, SIGNAL(StartSignal()), this,SLOT(EnableTabs())); 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(StopSignal()), myPlot,SLOT(StopAcquisition()));
connect(tab_measurement, SIGNAL(CheckPlotIntervalSignal()), tab_plot,SLOT(SetFrequency())); connect(tab_measurement, SIGNAL(CheckPlotIntervalSignal()), tab_plot,SLOT(SetFrequency()));
connect(tab_measurement, SIGNAL(EnableNthFrameSignal(bool)), tab_plot,SLOT(EnableNthFrame(bool))); connect(tab_measurement, SIGNAL(EnableNthFrameSignal(bool)), tab_plot,SLOT(EnableNthFrame(bool)));
@ -637,6 +636,13 @@ void qDetectorMain::EnableTabs(){
actionLoadCalibration->setVisible(expertTab); actionLoadCalibration->setVisible(expertTab);
actionSaveCalibration->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();
}
} }

4
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -354,7 +354,7 @@ bool qDrawPlot::StartOrStopThread(bool start){
void qDrawPlot::SetScanArgument(int scanArg){ void qDrawPlot::SetScanArgument(int scanArg){
#ifdef VERBOSE #ifdef VERBOSE
cout << "SetScanArgument function" << endl; cout << "SetScanArgument function:" << running << endl;
#endif #endif
scanArgument = scanArg; scanArgument = scanArg;
@ -415,7 +415,7 @@ void qDrawPlot::SetScanArgument(int scanArg){
void qDrawPlot::SetupMeasurement(int currentIndex){ void qDrawPlot::SetupMeasurement(int currentIndex){
#ifdef VERBOSE #ifdef VERBOSE
cout << "SetupMeasurement function" << endl; cout << "SetupMeasurement function:" << running << endl;
#endif #endif
LockLastImageArray(); LockLastImageArray();

2
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -306,8 +306,6 @@ void qTabMeasurement::startStopAcquisition(){
progressTimer->start(100); progressTimer->start(100);
emit StartSignal(); emit StartSignal();
myPlot->StartStopDaqToggle();
}else{ }else{
#ifdef VERBOSE #ifdef VERBOSE
cout << "Stopping Acquisition" << endl<< endl; cout << "Stopping Acquisition" << endl<< endl;