Index: trunk/FACT++/gui/FactGui.h =================================================================== --- trunk/FACT++/gui/FactGui.h (revision 13823) +++ trunk/FACT++/gui/FactGui.h (revision 13824) @@ -46,119 +46,4 @@ // ######################################################################### -class DimSubscriptions -{ -public: - DimStampedInfo fDNS; - - DimStampedInfo fLoggerStats; - DimStampedInfo fLoggerFilenameNight; - DimStampedInfo fLoggerFilenameRun; - DimStampedInfo fLoggerNumSubs; - - DimStampedInfo fFtmPassport; - DimStampedInfo fFtmTriggerRates; - DimStampedInfo fFtmError; - DimStampedInfo fFtmFtuList; - DimStampedInfo fFtmStaticData; - DimStampedInfo fFtmDynamicData; - DimStampedInfo fFtmCounter; - - DimStampedInfo fFadWriteStats; - DimStampedInfo fFadStartRun; - DimStampedInfo fFadRuns; - DimStampedInfo fFadEvents; - DimStampedInfo fFadRawData; - DimStampedInfo fFadEventData; - DimStampedInfo fFadConnections; - DimStampedInfo fFadFwVersion; - DimStampedInfo fFadRunNumber; - DimStampedInfo fFadDNA; - DimStampedInfo fFadTemperature; - DimStampedInfo fFadPrescaler; - DimStampedInfo fFadRefClock; - DimStampedInfo fFadRoi; - DimStampedInfo fFadDac; - DimStampedInfo fFadDrsCalibration; - DimStampedInfo fFadStatus; - DimStampedInfo fFadStatistics1; - DimStampedInfo fFadStatistics2; - DimStampedInfo fFadFileFormat; - - DimStampedInfo fFscTemp; - DimStampedInfo fFscVolt; - DimStampedInfo fFscCurrent; - DimStampedInfo fFscHumidity; - - DimStampedInfo fFeedbackDeviation; - DimStampedInfo fFeedbackReference; - DimStampedInfo fFeedbackCalibration; - - DimStampedInfo fBiasNominal; - DimStampedInfo fBiasVolt; - DimStampedInfo fBiasDac; - DimStampedInfo fBiasCurrent; - - DimStampedInfo fRateScan; - - DimStampedInfo fMagicWeather; - - DimSubscriptions(DimInfoHandler *ptr) : - fDNS("DIS_DNS/VERSION_NUMBER", 1, int(0), ptr), - //- - fLoggerStats ("DATA_LOGGER/STATS", (void*)NULL, 0, ptr), - fLoggerFilenameNight("DATA_LOGGER/FILENAME_NIGHTLY", (void*)NULL, 0, ptr), - fLoggerFilenameRun ("DATA_LOGGER/FILENAME_RUN", (void*)NULL, 0, ptr), - fLoggerNumSubs ("DATA_LOGGER/NUM_SUBS", (void*)NULL, 0, ptr), - //- - fFtmPassport ("FTM_CONTROL/PASSPORT", (void*)NULL, 0, ptr), - fFtmTriggerRates ("FTM_CONTROL/TRIGGER_RATES", (void*)NULL, 0, ptr), - fFtmError ("FTM_CONTROL/ERROR", (void*)NULL, 0, ptr), - fFtmFtuList ("FTM_CONTROL/FTU_LIST", (void*)NULL, 0, ptr), - fFtmStaticData ("FTM_CONTROL/STATIC_DATA", (void*)NULL, 0, ptr), - fFtmDynamicData ("FTM_CONTROL/DYNAMIC_DATA", (void*)NULL, 0, ptr), - fFtmCounter ("FTM_CONTROL/COUNTER", (void*)NULL, 0, ptr), - //- - fFadWriteStats ("FAD_CONTROL/STATS", (void*)NULL, 0, ptr), - fFadStartRun ("FAD_CONTROL/START_RUN", (void*)NULL, 0, ptr), - fFadRuns ("FAD_CONTROL/RUNS", (void*)NULL, 0, ptr), - fFadEvents ("FAD_CONTROL/EVENTS", (void*)NULL, 0, ptr), - fFadRawData ("FAD_CONTROL/RAW_DATA", (void*)NULL, 0, ptr), - fFadEventData ("FAD_CONTROL/EVENT_DATA", (void*)NULL, 0, ptr), - fFadConnections ("FAD_CONTROL/CONNECTIONS", (void*)NULL, 0, ptr), - fFadFwVersion ("FAD_CONTROL/FIRMWARE_VERSION", (void*)NULL, 0, ptr), - fFadRunNumber ("FAD_CONTROL/RUN_NUMBER", (void*)NULL, 0, ptr), - fFadDNA ("FAD_CONTROL/DNA", (void*)NULL, 0, ptr), - fFadTemperature ("FAD_CONTROL/TEMPERATURE", (void*)NULL, 0, ptr), - fFadPrescaler ("FAD_CONTROL/PRESCALER", (void*)NULL, 0, ptr), - fFadRefClock ("FAD_CONTROL/REFERENCE_CLOCK", (void*)NULL, 0, ptr), - fFadRoi ("FAD_CONTROL/REGION_OF_INTEREST", (void*)NULL, 0, ptr), - fFadDac ("FAD_CONTROL/DAC", (void*)NULL, 0, ptr), - fFadDrsCalibration ("FAD_CONTROL/DRS_CALIBRATION", (void*)NULL, 0, ptr), - fFadStatus ("FAD_CONTROL/STATUS", (void*)NULL, 0, ptr), - fFadStatistics1 ("FAD_CONTROL/STATISTICS1", (void*)NULL, 0, ptr), - fFadStatistics2 ("FAD_CONTROL/STATISTICS2", (void*)NULL, 0, ptr), - fFadFileFormat ("FAD_CONTROL/FILE_FORMAT", (void*)NULL, 0, ptr), - //- - fFscTemp ("FSC_CONTROL/TEMPERATURE", (void*)NULL, 0, ptr), - fFscVolt ("FSC_CONTROL/VOLTAGE", (void*)NULL, 0, ptr), - fFscCurrent ("FSC_CONTROL/CURRENT", (void*)NULL, 0, ptr), - fFscHumidity ("FSC_CONTROL/HUMIDITY", (void*)NULL, 0, ptr), - //- - fFeedbackDeviation ("FEEDBACK/DEVIATION", (void*)NULL, 0, ptr), - fFeedbackReference ("FEEDBACK/REFERENCE", (void*)NULL, 0, ptr), - fFeedbackCalibration("FEEDBACK/CALIBRATION", (void*)NULL, 0, ptr), - //- - fBiasNominal ("BIAS_CONTROL/NOMINAL", (void*)NULL, 0, ptr), - fBiasVolt ("BIAS_CONTROL/VOLTAGE", (void*)NULL, 0, ptr), - fBiasDac ("BIAS_CONTROL/DAC", (void*)NULL, 0, ptr), - fBiasCurrent ("BIAS_CONTROL/CURRENT", (void*)NULL, 0, ptr), - //- - fRateScan ("RATE_SCAN/DATA", (void*)NULL, 0, ptr), - //- - fMagicWeather ("MAGIC_WEATHER/DATA", (void*)NULL, 0, ptr) - { - } -}; - class FactGui : public MainWindow, public DimNetwork { @@ -187,7 +72,59 @@ bool fInChooseBiasCam; // FIXME. Find a better solution + DimStampedInfo fDimDNS; + + DimStampedInfo fDimLoggerStats; + DimStampedInfo fDimLoggerFilenameNight; + DimStampedInfo fDimLoggerFilenameRun; + DimStampedInfo fDimLoggerNumSubs; + + DimStampedInfo fDimFtmPassport; + DimStampedInfo fDimFtmTriggerRates; + DimStampedInfo fDimFtmError; + DimStampedInfo fDimFtmFtuList; + DimStampedInfo fDimFtmStaticData; + DimStampedInfo fDimFtmDynamicData; + DimStampedInfo fDimFtmCounter; + + DimStampedInfo fDimFadWriteStats; + DimStampedInfo fDimFadStartRun; + DimStampedInfo fDimFadRuns; + DimStampedInfo fDimFadEvents; + DimStampedInfo fDimFadRawData; + DimStampedInfo fDimFadEventData; + DimStampedInfo fDimFadConnections; + DimStampedInfo fDimFadFwVersion; + DimStampedInfo fDimFadRunNumber; + DimStampedInfo fDimFadDNA; + DimStampedInfo fDimFadTemperature; + DimStampedInfo fDimFadPrescaler; + DimStampedInfo fDimFadRefClock; + DimStampedInfo fDimFadRoi; + DimStampedInfo fDimFadDac; + DimStampedInfo fDimFadDrsCalibration; + DimStampedInfo fDimFadStatus; + DimStampedInfo fDimFadStatistics1; + DimStampedInfo fDimFadStatistics2; + DimStampedInfo fDimFadFileFormat; + + DimStampedInfo fDimFscTemp; + DimStampedInfo fDimFscVolt; + DimStampedInfo fDimFscCurrent; + DimStampedInfo fDimFscHumidity; + + DimStampedInfo fDimFeedbackDeviation; + DimStampedInfo fDimFeedbackReference; + DimStampedInfo fDimFeedbackCalibration; + + DimStampedInfo fDimBiasNominal; + DimStampedInfo fDimBiasVolt; + DimStampedInfo fDimBiasDac; + DimStampedInfo fDimBiasCurrent; + + DimStampedInfo fDimRateScan; + + DimStampedInfo fDimMagicWeather; + map fServices; - - DimSubscriptions *fDim; // ========================== LED Colors ================================ @@ -3092,10 +3029,10 @@ getInfo()->getTimestamp(); - if (getInfo()==&fDim->fDNS) + if (getInfo()==&fDimDNS) return PostInfoHandler(&FactGui::handleDimDNS); #ifdef DEBUG_DIM cout << "HandleDimInfo " << getInfo()->getName() << endl; #endif - if (getInfo()==&fDim->fLoggerStats) + if (getInfo()==&fDimLoggerStats) return PostInfoHandler(&FactGui::handleLoggerStats); @@ -3103,62 +3040,62 @@ // return PostInfoHandler(&FactGui::handleFadFiles); - if (getInfo()==&fDim->fFadWriteStats) + if (getInfo()==&fDimFadWriteStats) return PostInfoHandler(&FactGui::handleFadWriteStats); - if (getInfo()==&fDim->fFadConnections) + if (getInfo()==&fDimFadConnections) return PostInfoHandler(&FactGui::handleFadConnections); - if (getInfo()==&fDim->fFadFwVersion) + if (getInfo()==&fDimFadFwVersion) return PostInfoHandler(&FactGui::handleFadFwVersion); - if (getInfo()==&fDim->fFadRunNumber) + if (getInfo()==&fDimFadRunNumber) return PostInfoHandler(&FactGui::handleFadRunNumber); - if (getInfo()==&fDim->fFadDNA) + if (getInfo()==&fDimFadDNA) return PostInfoHandler(&FactGui::handleFadDNA); - if (getInfo()==&fDim->fFadTemperature) + if (getInfo()==&fDimFadTemperature) return PostInfoHandler(&FactGui::handleFadTemperature); - if (getInfo()==&fDim->fFadRefClock) + if (getInfo()==&fDimFadRefClock) return PostInfoHandler(&FactGui::handleFadRefClock); - if (getInfo()==&fDim->fFadRoi) + if (getInfo()==&fDimFadRoi) return PostInfoHandler(&FactGui::handleFadRoi); - if (getInfo()==&fDim->fFadDac) + if (getInfo()==&fDimFadDac) return PostInfoHandler(&FactGui::handleFadDac); - if (getInfo()==&fDim->fFadDrsCalibration) + if (getInfo()==&fDimFadDrsCalibration) return PostInfoHandler(&FactGui::handleFadDrsCalibration); - if (getInfo()==&fDim->fFadPrescaler) + if (getInfo()==&fDimFadPrescaler) return PostInfoHandler(&FactGui::handleFadPrescaler); - if (getInfo()==&fDim->fFadStatus) + if (getInfo()==&fDimFadStatus) return PostInfoHandler(&FactGui::handleFadStatus); - if (getInfo()==&fDim->fFadStatistics1) + if (getInfo()==&fDimFadStatistics1) return PostInfoHandler(&FactGui::handleFadStatistics1); - if (getInfo()==&fDim->fFadStatistics2) + if (getInfo()==&fDimFadStatistics2) return PostInfoHandler(&FactGui::handleFadStatistics2); - if (getInfo()==&fDim->fFadFileFormat) + if (getInfo()==&fDimFadFileFormat) return PostInfoHandler(&FactGui::handleFadFileFormat); - if (getInfo()==&fDim->fFadEvents) + if (getInfo()==&fDimFadEvents) return PostInfoHandler(&FactGui::handleFadEvents); - if (getInfo()==&fDim->fFadRuns) + if (getInfo()==&fDimFadRuns) return PostInfoHandler(&FactGui::handleFadRuns); - if (getInfo()==&fDim->fFadStartRun) + if (getInfo()==&fDimFadStartRun) return PostInfoHandler(&FactGui::handleFadStartRun); - if (getInfo()==&fDim->fFadRawData) + if (getInfo()==&fDimFadRawData) return PostInfoHandler(&FactGui::handleFadRawData); - if (getInfo()==&fDim->fFadEventData) + if (getInfo()==&fDimFadEventData) return PostInfoHandler(&FactGui::handleFadEventData); @@ -3167,71 +3104,71 @@ return PostInfoHandler(&FactGui::handleFadSetup); */ - if (getInfo()==&fDim->fLoggerFilenameNight) + if (getInfo()==&fDimLoggerFilenameNight) return PostInfoHandler(&FactGui::handleLoggerFilenameNight); - if (getInfo()==&fDim->fLoggerNumSubs) + if (getInfo()==&fDimLoggerNumSubs) return PostInfoHandler(&FactGui::handleLoggerNumSubs); - if (getInfo()==&fDim->fLoggerFilenameRun) + if (getInfo()==&fDimLoggerFilenameRun) return PostInfoHandler(&FactGui::handleLoggerFilenameRun); - if (getInfo()==&fDim->fFtmTriggerRates) + if (getInfo()==&fDimFtmTriggerRates) return PostInfoHandler(&FactGui::handleFtmTriggerRates); - if (getInfo()==&fDim->fFtmCounter) + if (getInfo()==&fDimFtmCounter) return PostInfoHandler(&FactGui::handleFtmCounter); - if (getInfo()==&fDim->fFtmDynamicData) + if (getInfo()==&fDimFtmDynamicData) return PostInfoHandler(&FactGui::handleFtmDynamicData); - if (getInfo()==&fDim->fFtmPassport) + if (getInfo()==&fDimFtmPassport) return PostInfoHandler(&FactGui::handleFtmPassport); - if (getInfo()==&fDim->fFtmFtuList) + if (getInfo()==&fDimFtmFtuList) return PostInfoHandler(&FactGui::handleFtmFtuList); - if (getInfo()==&fDim->fFtmStaticData) + if (getInfo()==&fDimFtmStaticData) return PostInfoHandler(&FactGui::handleFtmStaticData); - if (getInfo()==&fDim->fFtmError) + if (getInfo()==&fDimFtmError) return PostInfoHandler(&FactGui::handleFtmError); - if (getInfo()==&fDim->fFscTemp) + if (getInfo()==&fDimFscTemp) return PostInfoHandler(&FactGui::handleFscTemp); - if (getInfo()==&fDim->fFscVolt) + if (getInfo()==&fDimFscVolt) return PostInfoHandler(&FactGui::handleFscVolt); - if (getInfo()==&fDim->fFscCurrent) + if (getInfo()==&fDimFscCurrent) return PostInfoHandler(&FactGui::handleFscCurrent); - if (getInfo()==&fDim->fFscHumidity) + if (getInfo()==&fDimFscHumidity) return PostInfoHandler(&FactGui::handleFscHumidity); - if (getInfo()==&fDim->fBiasNominal) + if (getInfo()==&fDimBiasNominal) return PostInfoHandler(&FactGui::handleBiasNominal); - if (getInfo()==&fDim->fBiasVolt) + if (getInfo()==&fDimBiasVolt) return PostInfoHandler(&FactGui::handleBiasVolt); - if (getInfo()==&fDim->fBiasDac) + if (getInfo()==&fDimBiasDac) return PostInfoHandler(&FactGui::handleBiasDac); - if (getInfo()==&fDim->fBiasCurrent) + if (getInfo()==&fDimBiasCurrent) return PostInfoHandler(&FactGui::handleBiasCurrent); - if (getInfo()==&fDim->fFeedbackReference) + if (getInfo()==&fDimFeedbackReference) return PostInfoHandler(&FactGui::handleFeedbackReference); - if (getInfo()==&fDim->fFeedbackDeviation) + if (getInfo()==&fDimFeedbackDeviation) return PostInfoHandler(&FactGui::handleFeedbackDeviation); - if (getInfo()==&fDim->fFeedbackCalibration) + if (getInfo()==&fDimFeedbackCalibration) return PostInfoHandler(&FactGui::handleFeedbackCalibration); - if (getInfo()==&fDim->fRateScan) + if (getInfo()==&fDimRateScan) return PostInfoHandler(&FactGui::handleRateScan); - if (getInfo()==&fDim->fMagicWeather) + if (getInfo()==&fDimMagicWeather) return PostInfoHandler(&FactGui::handleMagicWeather); @@ -3771,6 +3708,57 @@ fInChoosePatchTH(false), fInChooseBiasHv(false), fInChooseBiasCam(false), + fDimDNS("DIS_DNS/VERSION_NUMBER", 1, int(0), this), //- - fDim(0), + fDimLoggerStats ("DATA_LOGGER/STATS", (void*)NULL, 0, this), + fDimLoggerFilenameNight("DATA_LOGGER/FILENAME_NIGHTLY", (void*)NULL, 0, this), + fDimLoggerFilenameRun ("DATA_LOGGER/FILENAME_RUN", (void*)NULL, 0, this), + fDimLoggerNumSubs ("DATA_LOGGER/NUM_SUBS", (void*)NULL, 0, this), + //- + fDimFtmPassport ("FTM_CONTROL/PASSPORT", (void*)NULL, 0, this), + fDimFtmTriggerRates ("FTM_CONTROL/TRIGGER_RATES", (void*)NULL, 0, this), + fDimFtmError ("FTM_CONTROL/ERROR", (void*)NULL, 0, this), + fDimFtmFtuList ("FTM_CONTROL/FTU_LIST", (void*)NULL, 0, this), + fDimFtmStaticData ("FTM_CONTROL/STATIC_DATA", (void*)NULL, 0, this), + fDimFtmDynamicData ("FTM_CONTROL/DYNAMIC_DATA", (void*)NULL, 0, this), + fDimFtmCounter ("FTM_CONTROL/COUNTER", (void*)NULL, 0, this), + //- + fDimFadWriteStats ("FAD_CONTROL/STATS", (void*)NULL, 0, this), + fDimFadStartRun ("FAD_CONTROL/START_RUN", (void*)NULL, 0, this), + fDimFadRuns ("FAD_CONTROL/RUNS", (void*)NULL, 0, this), + fDimFadEvents ("FAD_CONTROL/EVENTS", (void*)NULL, 0, this), + fDimFadRawData ("FAD_CONTROL/RAW_DATA", (void*)NULL, 0, this), + fDimFadEventData ("FAD_CONTROL/EVENT_DATA", (void*)NULL, 0, this), + fDimFadConnections ("FAD_CONTROL/CONNECTIONS", (void*)NULL, 0, this), + fDimFadFwVersion ("FAD_CONTROL/FIRMWARE_VERSION", (void*)NULL, 0, this), + fDimFadRunNumber ("FAD_CONTROL/RUN_NUMBER", (void*)NULL, 0, this), + fDimFadDNA ("FAD_CONTROL/DNA", (void*)NULL, 0, this), + fDimFadTemperature ("FAD_CONTROL/TEMPERATURE", (void*)NULL, 0, this), + fDimFadPrescaler ("FAD_CONTROL/PRESCALER", (void*)NULL, 0, this), + fDimFadRefClock ("FAD_CONTROL/REFERENCE_CLOCK", (void*)NULL, 0, this), + fDimFadRoi ("FAD_CONTROL/REGION_OF_INTEREST", (void*)NULL, 0, this), + fDimFadDac ("FAD_CONTROL/DAC", (void*)NULL, 0, this), + fDimFadDrsCalibration ("FAD_CONTROL/XDRS_CALIBRATION", (void*)NULL, 0, this), + fDimFadStatus ("FAD_CONTROL/STATUS", (void*)NULL, 0, this), + fDimFadStatistics1 ("FAD_CONTROL/STATISTICS1", (void*)NULL, 0, this), + fDimFadStatistics2 ("FAD_CONTROL/STATISTICS2", (void*)NULL, 0, this), + fDimFadFileFormat ("FAD_CONTROL/FILE_FORMAT", (void*)NULL, 0, this), + //- + fDimFscTemp ("FSC_CONTROL/TEMPERATURE", (void*)NULL, 0, this), + fDimFscVolt ("FSC_CONTROL/VOLTAGE", (void*)NULL, 0, this), + fDimFscCurrent ("FSC_CONTROL/CURRENT", (void*)NULL, 0, this), + fDimFscHumidity ("FSC_CONTROL/HUMIDITY", (void*)NULL, 0, this), + //- + fDimFeedbackDeviation ("FEEDBACK/DEVIATION", (void*)NULL, 0, this), + fDimFeedbackReference ("FEEDBACK/REFERENCE", (void*)NULL, 0, this), + fDimFeedbackCalibration("FEEDBACK/CALIBRATION", (void*)NULL, 0, this), + //- + fDimBiasNominal ("BIAS_CONTROL/NOMINAL", (void*)NULL, 0, this), + fDimBiasVolt ("BIAS_CONTROL/VOLTAGE", (void*)NULL, 0, this), + fDimBiasDac ("BIAS_CONTROL/DAC", (void*)NULL, 0, this), + fDimBiasCurrent ("BIAS_CONTROL/CURRENT", (void*)NULL, 0, this), + //- + fDimRateScan ("RATE_SCAN/DATA", (void*)NULL, 0, this), + //- + fDimMagicWeather ("MAGIC_WEATHER/DATA", (void*)NULL, 0, this), //- fDimVersion(0), @@ -4246,14 +4234,8 @@ connect(fAdcDataCanv, SIGNAL( RootEventProcessed(TObject*, unsigned int, TCanvas*)), this, SLOT (slot_RootEventProcessed(TObject*, unsigned int, TCanvas*))); - - - fDim = new DimSubscriptions(this); } ~FactGui() { - - delete fDim; - // Unsubscribe all services for (map::iterator i=fServices.begin();