diff --git a/slsDetectorGui/slsDetectorGui.pro b/slsDetectorGui/slsDetectorGui.pro index 16a456639..ccb73aaec 100644 --- a/slsDetectorGui/slsDetectorGui.pro +++ b/slsDetectorGui/slsDetectorGui.pro @@ -20,7 +20,8 @@ CONFIG += debug no_include_pwd QMAKE_CXXFLAGS_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) @@ -31,10 +32,13 @@ INSTALLS += documentation QMAKE_CLEAN += docs/*/* + #LIBS += -Wl,-Bstatic -L../slsDetectorSoftware -lSlsDetector -Wl,-Bdynamic\ # -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 += \ @@ -50,15 +54,9 @@ INCLUDEPATH = \ slsDetectorPlotting/include\ include\ forms/include\ - $(INCLUDES) /usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -# $(shell echo "/lib/modules/`uname -r`/build/include") \ -# ../slsDetectorSoftware/commonFiles\ -# ../slsDetectorSoftware/MySocketTCP\ -# ../slsDetectorSoftware/slsReceiverInterface\ -# ../slsDetectorSoftware/slsDetector\ -# ../slsDetectorSoftware/slsDetectorAnalysis\ -# ../slsDetectorSoftware/multiSlsDetector\ -# ../slsDetectorSoftware/usersFunctions + $(INCLUDES) +# $(INCLUDES) /usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ + SOURCES = \ slsDetectorPlotting/src/SlsQt1DPlot.cxx\ diff --git a/slsDetectorGui/src/qTabDataOutput.cpp b/slsDetectorGui/src/qTabDataOutput.cpp index c5821e1ea..d9b16e699 100644 --- a/slsDetectorGui/src/qTabDataOutput.cpp +++ b/slsDetectorGui/src/qTabDataOutput.cpp @@ -110,12 +110,12 @@ void qTabDataOutput::SetupWidgetWindow(){ #endif - int nb=myDet->getBadChannelCorrection(); + disconnect(chkDiscardBad, SIGNAL(toggled(bool))); - - if(nb) chkDiscardBad->setChecked(true); - - + if(myDet->getBadChannelCorrection()) + chkDiscardBad->setChecked(true); + else + chkDiscardBad->setChecked(false); connect(chkDiscardBad, SIGNAL(toggled(bool)), this, SLOT(DiscardBadChannels())); #ifdef VERBOSE @@ -571,12 +571,13 @@ void qTabDataOutput::Refresh(){ // cout << "ff " << myDet->getBadChannelCorrection() << endl; #endif - // disconnect(chkDiscardBad, SIGNAL(toggled(bool))); - if(myDet->getBadChannelCorrection()) chkDiscardBad->setChecked(true); - - - // connect(chkDiscardBad, SIGNAL(toggled(bool)), this, SLOT(DiscardBadChannels())); + disconnect(chkDiscardBad, SIGNAL(toggled(bool))); + if(myDet->getBadChannelCorrection()) + chkDiscardBad->setChecked(true); + else + chkDiscardBad->setChecked(false); + connect(chkDiscardBad, SIGNAL(toggled(bool)), this, SLOT(DiscardBadChannels())); if(myDet->setReceiverOnline()==slsDetectorDefs::ONLINE_FLAG){ btnOutputBrowse->setEnabled(false);