Changeset 16529

Timestamp:

05/31/13 14:26:52 (12 years ago)

Author:

tbretz

Message:

Adapted to changed in GUI_STATS

File:

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

trunk/FACT++/gui/FactGui.h

@@ -1560 +1560 @@
         const GUI_STAT &stat = d.ref<GUI_STAT>();
 
-        /*
-         uint32_t bufNew ;            //# incomplete events in buffer (evtCtrl)
-         uint32_t bufEvt ;            //# complete events in buffer  (primaryQueue)
-         uint32_t bufWrite ;          //# events in write queue (secondaryQueue)
-         uint32_t bufProc ;           //# events in processing queue (processingQueue1)
-         uint32_t bufTot ;            //# total events currently in buffer (this corresponds to totMem)
-
-         uint64_t totMem;             //# Bytes available in Buffer
-         uint64_t usdMem;             //# Bytes currently used
-         uint64_t maxMem;             //max # Bytes used during past cycle
-         */
-
-        fFadBufferMax->setValue(stat.maxMem/1000000);
-        fFadBuffer->setMaximum(stat.totMem/100);
-        fFadBuffer->setValue(stat.usdMem/100);  // Max mem used in last second
+        fFadBufferMax->setValue(stat.totMem/1000000);  // Memory::allocated
+        fFadBuffer->setMaximum(stat.maxMem/100);       // g_maxMem
+        fFadBuffer->setValue(stat.usdMem/100);         // Memory::inuse
 
         uint32_t sum = 0;
@@ -1590 +1578 @@
         fFadEvtConn->setValue(cnt);
 
-        fFadEvtBufNew->setValue(stat.bufNew);  // Incomplete in buffer
-        fFadEvtBufEvt->setValue(stat.bufEvt);  // Complete in buffer
-        fFadEvtBufMax->setValue(stat.bufTot);  // Complete in buffer
+        fFadEvtBufNew->setValue(stat.bufNew);  // Incomplete in buffer (evtCtrl)
+        fFadEvtBufEvt->setValue(stat.bufTot);  // Complete events in buffer (max_inuse)
+
+        fFadEvtCheck->setValue(stat.bufEvt);  // Complete in buffer
         fFadEvtWrite->setValue(stat.bufWrite);
-        fFadEvtSkip->setValue(stat.bufProc);
+        fFadEvtProc->setValue(stat.bufProc);
 
         if (stat.deltaT==0)