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

checking if probes or threshold ..shouldnt check if its the wrong detector unnecessary err printouts

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@225 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2013-08-12 12:21:49 +00:00
parent 440b244b66
commit eb48b1c492
5 changed files with 94 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -107,11 +107,11 @@ void qDetectorMain::SetUpWidgetWindow(){
tab_plot = new qTabPlot (this, myDet,myPlot); cout<<"Plot ready"<<endl;
tab_actions = new qTabActions (this, myDet); cout<<"Actions ready"<<endl;
tab_settings = new qTabSettings (this, myDet); cout<<"Settings ready"<<endl;
tab_advanced = new qTabAdvanced (this, myDet,myPlot);cout<<"Advanced ready"<<endl;
tab_advanced = new qTabAdvanced (this, myDet,myPlot); cout<<"Advanced ready"<<endl;
tab_debugging = new qTabDebugging (this, myDet); cout<<"Debugging ready"<<endl;
tab_developer = new qTabDeveloper (this, myDet); cout<<"Developer ready"<<endl;
myServer = new qServer(this);
myServer = new qServer(this); cout<<"Client Server ready"<<endl;
// creating the scroll area widgets for the tabs
for(int i=0;i<NumberOfTabs;i++){

10
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -73,6 +73,7 @@ void qDrawPlot::SetupWidgetWindow(){
}
//initialization
data_pause_over = true;//to get the first image
currentMeasurement = 0;
@ -91,7 +92,6 @@ void qDrawPlot::SetupWidgetWindow(){
pthread_mutex_init(&last_image_complete_mutex,NULL);
// Default titles- only for the initial picture
imageXAxisTitle="Pixel";
imageYAxisTitle="Pixel";
imageZAxisTitle="Intensity";
@ -104,7 +104,6 @@ void qDrawPlot::SetupWidgetWindow(){
//histTitle[i] = temp_title;
}
imageTitle="";
/*imageTitle.assign("Start Image");*/
plotTitle = "";
plotTitle_prefix = "";
plot_in_scope = 0;
@ -196,7 +195,8 @@ void qDrawPlot::SetupWidgetWindow(){
binaryFrom = 0;
binaryTo = 0;
//widget related initialization
//widget related initialization
// clone
for(int i=0;i<MAXCloneWindows;i++) winClone[i]=0;
@ -206,7 +206,7 @@ void qDrawPlot::SetupWidgetWindow(){
layout = new QGridLayout;
this->setLayout(layout);
histFrameIndexTitle= histFrameIndexTitle = new QLabel("");
histFrameIndexTitle= histFrameIndexTitle = new QLabel("");
boxPlot = new QGroupBox("");
layout->addWidget(boxPlot,1,0);
@ -264,7 +264,7 @@ void qDrawPlot::SetupWidgetWindow(){
plotLayout->addWidget(plot2D,0,0,1,1);
//callbacks
//callbacks
// Setting the callback function to get data from detector class
myDet->registerDataCallback(&(GetDataCallBack),this);

11
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -69,7 +69,8 @@ void qTabMeasurement::SetupWidgetWindow(){
//gates
spinNumGates->setValue((int)myDet->setTimer(slsDetectorDefs::GATES_NUMBER,-1));
//probes
spinNumProbes->setValue((int)myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1));
if(myDet->getDetectorsType() == slsDetectorDefs::MYTHEN)
spinNumProbes->setValue((int)myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1));
//File Name
dispFileName->setText(QString(myDet->getFileName().c_str()));
//File Index
@ -820,11 +821,12 @@ void qTabMeasurement::Refresh(){
#endif
//probes
spinNumProbes->setValue((int)myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1));
if(myDet->getDetectorsType() == slsDetectorDefs::MYTHEN){
spinNumProbes->setValue((int)myDet->setTimer(slsDetectorDefs::PROBES_NUMBER,-1));
#ifdef VERBOSE
cout << "Getting number of probes" << endl;
#endif
}
//File Name
dispFileName->setText(QString(myDet->getFileName().c_str()));
#ifdef VERBOSE
@ -889,7 +891,8 @@ void qTabMeasurement::EnableProbes(){
return;
}
cout << "Probes not enabled" << endl;
spinNumProbes->setValue(0);
if(myDet->getDetectorsType()==slsDetectorDefs::MYTHEN)
spinNumProbes->setValue(0);
lblNumProbes->setEnabled(false);
spinNumProbes->setEnabled(false);
}

3
slsDetectorGui/src/qTabSettings.cpp
View File

@ -46,7 +46,8 @@ void qTabSettings::SetupWidgetWindow(){
comboSettings->setCurrentIndex(sett);
//threshold
spinThreshold->setValue(myDet->getThresholdEnergy());
if((detType == slsDetectorDefs::MYTHEN) || (detType == slsDetectorDefs::EIGER))
spinThreshold->setValue(myDet->getThresholdEnergy());
//expert mode is not enabled initially
lblThreshold->setEnabled(false);