Changeset 11151 for trunk

Timestamp:

06/23/11 19:26:13 (13 years ago)

Author:

tbretz

Message:

Removed an obsolete debug output; added missing instantiation of fDimFadFwVersions.

File:

• trunk/FACT++/gui/FactGui.h (modified) (3 diffs)

trunk/FACT++/gui/FactGui.h

@@ -960 +960 @@
             return;
 
-        fEvtsTriggerId->setValue(d.get<uint32_t>());
+        fEvtsEventId->setValue(d.get<uint32_t>());
     }
 
@@ -1118 +1118 @@
 
         const int64_t *stat = d.ptr<int64_t>();
-
-        cout << stat[0] << " " << stat[0]/1000000 << endl;
 
         fFadBufferMax->setValue(stat[0]/1000000);
@@ -2331 +2329 @@
         fDimDNS("DIS_DNS/VERSION_NUMBER", 1, int(0), this),
 
-        fDimLoggerStats        ("DATA_LOGGER/STATS", (void*)NULL, 0, this),
-        fDimLoggerFilenameNight("DATA_LOGGER/FILENAME_NIGHTLY", const_cast<char*>(""), 0, this),
-        fDimLoggerFilenameRun  ("DATA_LOGGER/FILENAME_RUN",     const_cast<char*>(""), 0, this),
-        fDimLoggerNumSubs      ("DATA_LOGGER/NUM_SUBS",         const_cast<char*>(""), 0, this),
-
-        fDimFtmPassport      ("FTM_CONTROL/PASSPORT",         (void*)NULL, 0, this),
-        fDimFtmTriggerCounter("FTM_CONTROL/TRIGGER_COUNTER",  (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),
-        fDimFadFiles         ("FAD_CONTROL/FILES",            (void*)NULL, 0, this),
-        fDimFadRuns          ("FAD_CONTROL/RUNS",             (void*)NULL, 0, this),
-        fDimFadEvents        ("FAD_CONTROL/EVENTS",           (void*)NULL, 0, this),
-        fDimFadCurrentEvent  ("FAD_CONTROL/CURRENT_EVENT",    (void*)NULL, 0, this),
-        fDimFadEventData     ("FAD_CONTROL/EVENT_DATA",       (void*)NULL, 0, this),
-        fDimFadConnections   ("FAD_CONTROL/CONNECTIONS",      (void*)NULL, 0, this),
-        fDimFadStatistics    ("FAD_CONTROL/STATISTICS",       (void*)NULL, 0, this)
+        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),
+        fDimFtmTriggerCounter  ("FTM_CONTROL/TRIGGER_COUNTER",  (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),
+        fDimFadFiles           ("FAD_CONTROL/FILES",            (void*)NULL, 0, this),
+        fDimFadRuns            ("FAD_CONTROL/RUNS",             (void*)NULL, 0, this),
+        fDimFadEvents          ("FAD_CONTROL/EVENTS",           (void*)NULL, 0, this),
+        fDimFadCurrentEvent    ("FAD_CONTROL/CURRENT_EVENT",    (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),
+        fDimFadStatistics      ("FAD_CONTROL/STATISTICS",       (void*)NULL, 0, this)
     {
         fClockCondFreq->addItem("--- Hz",  QVariant(-1));