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

semaphores , no usleep in receiver

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@234 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2013-09-04 13:10:18 +00:00
parent e6c94a1d62
commit 790966e3dd
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorGui/include/svnInfoGui.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "af1100a4-978c-4157-bff7-07162d2ba061" #define SVNREPUUID "af1100a4-978c-4157-bff7-07162d2ba061"
//#define SVNREV 0x230 //#define SVNREV 0x233
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x230 #define SVNREV 0x233
#define SVNDATE 0x20130827 #define SVNDATE 0x20130829
// //

4
slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h
View File

@ -136,7 +136,7 @@ class SlsQt1DPlot:public QwtPlot{
void SetZoom(double xmin,double ymin,double x_width,double y_width); void SetZoom(double xmin,double ymin,double x_width,double y_width);
void SetZoomBase(double xmin,double ymin,double x_width, double y_width){ zoomer->SetZoomBase(xmin,ymin,x_width,y_width);} void SetZoomBase(double xmin,double ymin,double x_width, double y_width){ zoomer->SetZoomBase(xmin,ymin,x_width,y_width);}
void alignScales();
private: private:
SlsQtH1DList* hist_list; SlsQtH1DList* hist_list;
@ -148,7 +148,7 @@ class SlsQt1DPlot:public QwtPlot{
void SetupZoom(); void SetupZoom();
void UnknownStuff(); void UnknownStuff();
void alignScales(); //void alignScales();
void CalculateNResetZoomBase(); void CalculateNResetZoomBase();
void NewHistogramAttached(SlsQtH1D* h); void NewHistogramAttached(SlsQtH1D* h);

3
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -1266,7 +1266,7 @@ void qDrawPlot::UpdatePlot(){
//h->setTitle(GetHistTitle(hist_num)); //h->setTitle(GetHistTitle(hist_num));
h->Attach(plot1D); h->Attach(plot1D);
//refixing all the zooming //refixing all the zooming
if(firstPlot){ if((firstPlot) || (anglePlot)){
plot1D->SetXMinMax(h->minXValue(),h->maxXValue()); plot1D->SetXMinMax(h->minXValue(),h->maxXValue());
plot1D->SetYMinMax(h->minYValue(),h->maxYValue()); plot1D->SetYMinMax(h->minYValue(),h->maxYValue());
plot1D->SetZoomBase(h->minXValue(),h->minYValue(), plot1D->SetZoomBase(h->minXValue(),h->minYValue(),
@ -1274,6 +1274,7 @@ void qDrawPlot::UpdatePlot(){
firstPlot = false; firstPlot = false;
} }
} }
} }
// update range if required // update range if required
if(XYRangeChanged){ if(XYRangeChanged){

15
slsDetectorGui/src/qTabDataOutput.cpp
View File

@ -405,6 +405,7 @@ void qTabDataOutput::UpdateRateCorrectionFromServer(){
void qTabDataOutput::SetAngularCorrection(){ void qTabDataOutput::SetAngularCorrection(){
disconnect(chkAngular, SIGNAL(toggled(bool)), this, SLOT(SetAngularCorrection()));
#ifdef VERYVERBOSE #ifdef VERYVERBOSE
cout << "Entering Set Angular Correction function" << endl; cout << "Entering Set Angular Correction function" << endl;
#endif #endif
@ -414,18 +415,28 @@ void qTabDataOutput::SetAngularCorrection(){
cout << "Setting angular conversion to default" << endl; cout << "Setting angular conversion to default" << endl;
#endif #endif
}else{ }else{
#ifdef VERBOSE
cout << "Could not set angular conversion to default" << endl;
#endif
qDefs::Message(qDefs::WARNING,"Angular Conversion could not be set. Please set the default file name using the command line, if you haven't already.","qTabDataOutput::SetAngularCorrection"); qDefs::Message(qDefs::WARNING,"Angular Conversion could not be set. Please set the default file name using the command line, if you haven't already.","qTabDataOutput::SetAngularCorrection");
chkAngular->setChecked(false); chkAngular->setChecked(false);
} }
}else{ }else{
myDet->setAngularConversionFile(""); if(myDet->setAngularConversionFile("")){
#ifdef VERBOSE
cout << "Could not reset angular correction" << endl;
#endif
qDefs::Message(qDefs::WARNING,"Angular Conversion could not be reset.","qTabDataOutput::SetAngularCorrection");
chkAngular->setChecked(true);
}else{;
#ifdef VERBOSE #ifdef VERBOSE
cout << "Unsetting angular correction" << endl; cout << "Unsetting angular correction" << endl;
#endif #endif
} }
}
emit AngularConversionSignal(chkAngular->isChecked()); emit AngularConversionSignal(chkAngular->isChecked());
connect(chkAngular, SIGNAL(toggled(bool)), this, SLOT(SetAngularCorrection()));
qDefs::checkErrorMessage(myDet,"qTabDataOutput::SetAngularCorrection"); qDefs::checkErrorMessage(myDet,"qTabDataOutput::SetAngularCorrection");
} }