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

some debugging at the beamline, still crashing sl6 64bit, angular conversion etc.

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@174 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
x04sa 2013-04-30 11:26:22 +00:00
parent 4719fff09a
commit 35f151775e
3 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorGui/slsDetectorGui.pro
View File

@ -8,8 +8,6 @@ QMAKE_INCDIR_QT = $(QTDIR)/include/
QMAKE_LIBS_QT = -L$(QTDIR)/lib QMAKE_LIBS_QT = -L$(QTDIR)/lib
QMAKE_LIBS = -L$(QTDIR)/lib QMAKE_LIBS = -L$(QTDIR)/lib
DESTDIR ?= bin DESTDIR ?= bin
MOC_DIR = mocs MOC_DIR = mocs
OBJECTS_DIR = objs OBJECTS_DIR = objs
@ -22,7 +20,7 @@ CONFIG += debug no_include_pwd
QMAKE_CXXFLAGS_WARN_ON = -w QMAKE_CXXFLAGS_WARN_ON = -w
QMAKE_CFLAGS_WARN_ON = -w QMAKE_CFLAGS_WARN_ON = -w
DEFINES += VERBOSE DACS_INT PRINT_LOG THIS_PATH=\\\"$$PWD\\\" #VERYVERBOSE DEFINES += EPICS VERBOSE DACS_INT PRINT_LOG THIS_PATH=\\\"$$PWD\\\" #VERYVERBOSE
target.path += $(DESTDIR) target.path += $(DESTDIR)
@ -36,7 +34,8 @@ QMAKE_CLEAN += docs/*/*
#LIBS += -Wl,-Bstatic -L../slsDetectorSoftware -lSlsDetector -Wl,-Bdynamic\ #LIBS += -Wl,-Bstatic -L../slsDetectorSoftware -lSlsDetector -Wl,-Bdynamic\
# -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib # -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib
LIBS = -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib LIBS = -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib -Wl,-R$(QWTDIR)/lib -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH)/ -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -lca -lCom
DEPENDPATH += \ DEPENDPATH += \
slsDetectorPlotting/include\ slsDetectorPlotting/include\
@ -51,8 +50,7 @@ INCLUDEPATH = \
slsDetectorPlotting/include\ slsDetectorPlotting/include\
include\ include\
forms/include\ forms/include\
$(INCLUDES) $(INCLUDES) /usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/
# $(shell echo "/lib/modules/`uname -r`/build/include") \ # $(shell echo "/lib/modules/`uname -r`/build/include") \
# ../slsDetectorSoftware/commonFiles\ # ../slsDetectorSoftware/commonFiles\
# ../slsDetectorSoftware/MySocketTCP\ # ../slsDetectorSoftware/MySocketTCP\

10
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -622,8 +622,16 @@ int qDrawPlot::GetDataCallBack(detectorData *data, int fIndex, void *this_pointe
int qDrawPlot::GetData(detectorData *data,int fIndex){ int qDrawPlot::GetData(detectorData *data,int fIndex){
#ifdef VERYVERBOSE #ifdef VERBOSE
cout << "******Entering GetDatafunction********" << endl; cout << "******Entering GetDatafunction********" << endl;
cout << "fname " << data->fileName << endl;
cout << "npoints " << data->npoints << endl;
cout << "npy " << data->npy << endl;
cout << "npy " << data->progressIndex << endl;
cout << "values " << data->values << endl;
cout << "errors " << data->errors << endl;
cout << "angle " << data->angles << endl;
#endif #endif
if(!stop_signal){ if(!stop_signal){

28
slsDetectorGui/src/qTabDataOutput.cpp
View File

@ -106,10 +106,22 @@ void qTabDataOutput::SetupWidgetWindow(){
//discard bad channels from server //discard bad channels from server
#ifdef VERBOSE #ifdef VERBOSE
cout << "Getting bad channel correction" << endl; cout << "Getting bad channel correction" << endl;
cout << "func " << myDet->getBadChannelCorrection() << endl;
#endif #endif
if(myDet->getBadChannelCorrection()) chkDiscardBad->setChecked(true);
int nb=myDet->getBadChannelCorrection();
disconnect(chkDiscardBad, SIGNAL(toggled(bool)));
if(nb) chkDiscardBad->setChecked(true);
connect(chkDiscardBad, SIGNAL(toggled(bool)), this, SLOT(DiscardBadChannels()));
#ifdef VERBOSE
cout << "done" << endl;
#endif
qDefs::checkErrorMessage(myDet); qDefs::checkErrorMessage(myDet);
} }
@ -486,19 +498,19 @@ void qTabDataOutput::SetAngularCorrection(){
void qTabDataOutput::DiscardBadChannels(){ void qTabDataOutput::DiscardBadChannels(){
#ifdef VERYVERBOSE //#ifdef VERYVERBOSE
cout << "Entering Discard bad channels function" << endl; cout << "Entering Discard bad channels function" << endl;
#endif //#endif
if(chkDiscardBad->isChecked()){ if(chkDiscardBad->isChecked()){
myDet->setBadChannelCorrection("default");
#ifdef VERBOSE #ifdef VERBOSE
cout << "Setting bad channel correction to default" << endl; cout << "Setting bad channel correction to default" << endl;
#endif #endif
myDet->setBadChannelCorrection("default");
}else{ }else{
myDet->setBadChannelCorrection("");
#ifdef VERBOSE #ifdef VERBOSE
cout << "Unsetting bad channel correction" << endl; cout << "Unsetting bad channel correction" << endl;
#endif #endif
myDet->setBadChannelCorrection("");
} }
qDefs::checkErrorMessage(myDet); qDefs::checkErrorMessage(myDet);
@ -556,10 +568,16 @@ void qTabDataOutput::Refresh(){
//discard bad channels from server //discard bad channels from server
#ifdef VERBOSE #ifdef VERBOSE
cout << "Getting bad channel correction" << endl; cout << "Getting bad channel correction" << endl;
// cout << "ff " << myDet->getBadChannelCorrection() << endl;
#endif #endif
// disconnect(chkDiscardBad, SIGNAL(toggled(bool)));
if(myDet->getBadChannelCorrection()) chkDiscardBad->setChecked(true); if(myDet->getBadChannelCorrection()) chkDiscardBad->setChecked(true);
// connect(chkDiscardBad, SIGNAL(toggled(bool)), this, SLOT(DiscardBadChannels()));
if(myDet->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG){ if(myDet->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG){
btnOutputBrowse->setEnabled(false); btnOutputBrowse->setEnabled(false);
btnOutputBrowse->setToolTip("<font color=\"red\">This button is disabled as receiver PC is different from " btnOutputBrowse->setToolTip("<font color=\"red\">This button is disabled as receiver PC is different from "