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

bad channel not read on refresh or start up, makefile reverted to compile

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@175 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2013-04-30 15:05:21 +00:00
parent 35f151775e
commit 675ab8ceca
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
slsDetectorGui/slsDetectorGui.pro
View File

@ -20,7 +20,8 @@ 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 += EPICS VERBOSE DACS_INT PRINT_LOG THIS_PATH=\\\"$$PWD\\\" #VERYVERBOSE 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)
@ -31,10 +32,13 @@ INSTALLS += documentation
QMAKE_CLEAN += docs/*/* 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 -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
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 += \
@ -50,15 +54,9 @@ INCLUDEPATH = \
slsDetectorPlotting/include\ slsDetectorPlotting/include\
include\ include\
forms/include\ forms/include\
$(INCLUDES) /usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ $(INCLUDES)
# $(shell echo "/lib/modules/`uname -r`/build/include") \ # $(INCLUDES) /usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/
# ../slsDetectorSoftware/commonFiles\
# ../slsDetectorSoftware/MySocketTCP\
# ../slsDetectorSoftware/slsReceiverInterface\
# ../slsDetectorSoftware/slsDetector\
# ../slsDetectorSoftware/slsDetectorAnalysis\
# ../slsDetectorSoftware/multiSlsDetector\
# ../slsDetectorSoftware/usersFunctions
SOURCES = \ SOURCES = \
slsDetectorPlotting/src/SlsQt1DPlot.cxx\ slsDetectorPlotting/src/SlsQt1DPlot.cxx\

21
slsDetectorGui/src/qTabDataOutput.cpp
View File

@ -110,12 +110,12 @@ void qTabDataOutput::SetupWidgetWindow(){
#endif #endif
int nb=myDet->getBadChannelCorrection();
disconnect(chkDiscardBad, SIGNAL(toggled(bool))); disconnect(chkDiscardBad, SIGNAL(toggled(bool)));
if(myDet->getBadChannelCorrection())
if(nb) chkDiscardBad->setChecked(true); chkDiscardBad->setChecked(true);
else
chkDiscardBad->setChecked(false);
connect(chkDiscardBad, SIGNAL(toggled(bool)), this, SLOT(DiscardBadChannels())); connect(chkDiscardBad, SIGNAL(toggled(bool)), this, SLOT(DiscardBadChannels()));
#ifdef VERBOSE #ifdef VERBOSE
@ -571,12 +571,13 @@ void qTabDataOutput::Refresh(){
// cout << "ff " << myDet->getBadChannelCorrection() << endl; // cout << "ff " << myDet->getBadChannelCorrection() << endl;
#endif #endif
// disconnect(chkDiscardBad, SIGNAL(toggled(bool)));
if(myDet->getBadChannelCorrection()) chkDiscardBad->setChecked(true); disconnect(chkDiscardBad, SIGNAL(toggled(bool)));
if(myDet->getBadChannelCorrection())
chkDiscardBad->setChecked(true);
// connect(chkDiscardBad, SIGNAL(toggled(bool)), this, SLOT(DiscardBadChannels())); else
chkDiscardBad->setChecked(false);
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);